From nobody Sat Nov 15 16:34:55 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1762842048; cv=none; d=zohomail.com; s=zohoarc; b=nfMLruOsGKZXqHaIrtrC+qXwTIPQoWDN3RsmqOhc3jonVOsizxOonFmSBCWGiWzUe/Oz6flkdiiE3FTgWWQRTSikuc/H4dWivrDZ57kAd525+con7+tSupVJQePH+POUPVUENbEVyU+4LvQQe1RHelINhOqas0wHFS32L3YsDA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762842048; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2deagevKAnTw8QdOvgqpHGJYSKDO5JNyiKn9kTS3xyE=; b=jYwDQ/3Rk2x8BNHURWJXEPV7eSQ4h4Yhgl6di9a8nYges820jBnGH/MVxIBOSnKbK/p4Eo7O5VDAfC9utphMj8qJkJ92M2yJxFq5svcXIbttdVPlkk44AE9NtpP4YlPp5j9Pws/kjP3fYTHC+R5dyaCzwRFosHyFXncQg02lgQw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762842048619189.49584736232305; Mon, 10 Nov 2025 22:20:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vIhjd-0001k8-Mx; Tue, 11 Nov 2025 01:20:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vIhjb-0001f4-S2 for qemu-devel@nongnu.org; Tue, 11 Nov 2025 01:20:07 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vIhja-0001WA-3K for qemu-devel@nongnu.org; Tue, 11 Nov 2025 01:20:07 -0500 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AB68EI6001041; Tue, 11 Nov 2025 06:19:56 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 4abxrt82py-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Nov 2025 06:19:56 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 5AB4v36q007397; Tue, 11 Nov 2025 06:19:55 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4a9va9mka6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Nov 2025 06:19:55 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 5AB6C6ql029277; Tue, 11 Nov 2025 06:19:54 GMT Received: from localhost.localdomain (ca-dev80.us.oracle.com [10.211.9.80]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 4a9va9mk84-3; Tue, 11 Nov 2025 06:19:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2025-04-25; bh=2deag evKAnTw8QdOvgqpHGJYSKDO5JNyiKn9kTS3xyE=; b=d9UUXkplqeDCvlKDY4/UE RVyAnRie8vvrJOcVSWLuApZ7sq1btvxRBmxPe7jDxTjfWZIMdcXBPdvuc/c7a2FX 6iyLVPxRqX7LXKRbjyv/+o+F3hKOLOhYHEWFDcbmSvj2KhmpFoiYTHJX4ZyvCCx/ sPucK7v5KRwm4152+BJJ3BBEYqYV/01gZUCn0+tDXxvZdhgXl2UcOlzUy3qXsCpQ gWO2eAzFIeGLxAEIEqU9SqnDEmUmOeAtZYMpKteGGOLQqUws1Nws01BR5+coMXPu XNtiojo43JZv3Ja8lTTKz/fR+mKIvkN90aI32QHXAEkqWzqCKgXZlRUiVUGrplxW g== From: Dongli Zhang To: qemu-devel@nongnu.org, kvm@vger.kernel.org Cc: pbonzini@redhat.com, zhao1.liu@intel.com, mtosatti@redhat.com, sandipan.das@amd.com, babu.moger@amd.com, likexu@tencent.com, like.xu.linux@gmail.com, groug@kaod.org, khorenko@virtuozzo.com, alexander.ivanov@virtuozzo.com, den@virtuozzo.com, davydov-max@yandex-team.ru, xiaoyao.li@intel.com, dapeng1.mi@linux.intel.com, joe.jin@oracle.com, ewanhai-oc@zhaoxin.com, ewanhai@zhaoxin.com Subject: [PATCH v7 2/9] target/i386: disable PERFCORE when "-pmu" is configured Date: Mon, 10 Nov 2025 22:14:51 -0800 Message-ID: <20251111061532.36702-3-dongli.zhang@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20251111061532.36702-1-dongli.zhang@oracle.com> References: <20251111061532.36702-1-dongli.zhang@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-11_01,2025-11-10_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 spamscore=0 mlxscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2510240000 definitions=main-2511110047 X-Authority-Analysis: v=2.4 cv=c7+mgB9l c=1 sm=1 tr=0 ts=6912d58c cx=c_pps a=XiAAW1AwiKB2Y8Wsi+sD2Q==:117 a=XiAAW1AwiKB2Y8Wsi+sD2Q==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=QyXUC8HyAAAA:8 a=yPCof4ZbAAAA:8 a=zd2uoN0lAAAA:8 a=ljiX_LIxqC18hRgHw8cA:9 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-GUID: Hu8qkhj9Ngxw7NZWFoKWcddzrzaKQjNn X-Proofpoint-ORIG-GUID: Hu8qkhj9Ngxw7NZWFoKWcddzrzaKQjNn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTExMDAzNyBTYWx0ZWRfX/zPWvxYIoJlt i1RhC6BMyA2fGssWMOs7OcYGNn73YPxiWWswDjs5mf7QyP8/Onj4ytsGNMPsaJElLALawBXQZyP LDudB3hzM7IAc4+p/MiDh8wOJ5WWXvqt2qIbJX0AlT4qtUzLmJtBVnYew1e9Ah+dvQ5S267rxMr ojIZjgTs7l8eXpWNnCta61K0LDYzhvifRSvQ9CetYSuzmoRNp0wM4l3nBeF6GdIzLagaF7wJpRt he/7IEnKu7FZCfxiTWj5GlMXR09HrEYgzSM224dkskWmtIuX7IoWgWD7lZV5UcjrE/ZsE4Oo8Ux N796rZQkSrMay0W1R0pB2e9tEj/mGd8uoiC0seCey0oVPhmCKinzQyJ9yMz+Td+CXZGIHchA6M7 CHbYACWn6TxXgfTAWSfAcQUmB93P1g== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.177.32; envelope-from=dongli.zhang@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @oracle.com) X-ZM-MESSAGEID: 1762842049699158500 Content-Type: text/plain; charset="utf-8" Currently, AMD PMU support isn't determined based on CPUID, that is, the "-pmu" option does not fully disable KVM AMD PMU virtualization. To minimize AMD PMU features, remove PERFCORE when "-pmu" is configured. To completely disable AMD PMU virtualization will be implemented via KVM_CAP_PMU_CAPABILITY in upcoming patches. As a reminder, neither CPUID_EXT3_PERFCORE nor CPUID_8000_0022_EAX_PERFMON_V2 is removed from env->features[] when "-pmu" is configured. Developers should query whether they are supported via cpu_x86_cpuid() rather than relying on env->features[] in future patches. Suggested-by: Zhao Liu Signed-off-by: Dongli Zhang Reviewed-by: Zhao Liu Reviewed-by: Sandipan Das --- Changed since v2: - No need to check "kvm_enabled() && IS_AMD_CPU(env)". Changed since v4: - Add Reviewed-by from Sandipan. target/i386/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3653f8953e..4fcade89bc 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8360,6 +8360,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index,= uint32_t count, !(env->hflags & HF_LMA_MASK)) { *edx &=3D ~CPUID_EXT2_SYSCALL; } + + if (!cpu->enable_pmu) { + *ecx &=3D ~CPUID_EXT3_PERFCORE; + } break; case 0x80000002: case 0x80000003: --=20 2.39.3