From nobody Sat Apr 11 23:08:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1772648166; cv=none; d=zohomail.com; s=zohoarc; b=jnkU6a0QIHWdaYS7FlIk4s09WAi5uT/2+Uwm3jZ7OVKZWM1WcB+h9oNIp2TqZKkpwah2LqIPAhwTRQuvRNRh+eaGzxPXY2aPgYW5q+QaE7Tg5aqTIvKMNh8Ws24bw1qY82/nHXrHix/6bmSxNKQR93fiXKdkfSvVlJRVWHU5vqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772648166; 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=Z16ReYPUInL0AP4I3mZYxMweQPYa+ufUdUGI3TD1ipw=; b=lTvKTiyrbxOKuU4T27QREjYEqjFBayt7v6z5NC5FDIAE/WWp7kxFGigOXR7RWHFSozMZgsLvrLxYb/yzbAh+HrFSSc6twFGGzuY29BDUBhtkmCNxWN71KAli534gMROLcTLHd7uzg9fx5RSa1Jua0eQ2Dz6sGyLKuVqMbdKC8Wo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772648166394592.9097385705513; Wed, 4 Mar 2026 10:16:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxqkn-0005QY-OW; Wed, 04 Mar 2026 13:15:25 -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 1vxqkm-0005Q0-AA for qemu-devel@nongnu.org; Wed, 04 Mar 2026 13:15:24 -0500 Received: from mgamail.intel.com ([198.175.65.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxqkk-0004QO-IY for qemu-devel@nongnu.org; Wed, 04 Mar 2026 13:15:24 -0500 Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2026 10:15:22 -0800 Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.43]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2026 10:15:21 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1772648123; x=1804184123; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KbgY7aSfXZn9AVFQetDGs5LlZkWw6p0DhvLVbmUtSCc=; b=AA1iyBy++jzVP2fZPJhz6P5FR8u0iRDRg+5YIP+pfXV6Y2YRMh9e8Odv xEcD0hIqypiz/0H9UnsX6PU3izXA6mAQVu/MPCmg6TUC6RCG1p6yKeJDs aiSRz3VOaFCZfw4YaLnwlqklyksAmiLIEAB1XcPsgTC9oIe0v1K4iOY3X KEoh7HfuSFscq1TNPScyi4hscusPFSrfSeqGAYdyZ7G6AewI1dkco3MJk rUzNaur0Nx1EvF0vfUJkKECU5kuFgq5ka2zE7mEDJCFTv/1/ecXzN9cUj F6ptmsUQHRBqZFgnGMtLr5B3yhk1PubByYJNRlgdGtobQwJrf9ncAfxXS A==; X-CSE-ConnectionGUID: C/kt7BbYTxmBmkpMm4FujQ== X-CSE-MsgGUID: d+QFoizMSoeN4qjhX02JGg== X-IronPort-AV: E=McAfee;i="6800,10657,11719"; a="73909374" X-IronPort-AV: E=Sophos;i="6.21,324,1763452800"; d="scan'208";a="73909374" X-CSE-ConnectionGUID: RUNNrqBJSSeoDpsv2DkdAg== X-CSE-MsgGUID: XX4oF/bOSXKVEXGO7L2Mpg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,324,1763452800"; d="scan'208";a="214542840" From: Zide Chen To: qemu-devel@nongnu.org, kvm@vger.kernel.org, Paolo Bonzini , Zhao Liu , Peter Xu , Fabiano Rosas , Sandipan Das Cc: Xiaoyao Li , Dongli Zhang , Dapeng Mi , Zide Chen Subject: [PATCH V3 09/13] target/i386: Clean up LBR format handling Date: Wed, 4 Mar 2026 10:07:08 -0800 Message-ID: <20260304180713.360471-10-zide.chen@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260304180713.360471-1-zide.chen@intel.com> References: <20260304180713.360471-1-zide.chen@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=198.175.65.16; envelope-from=zide.chen@intel.com; helo=mgamail.intel.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, 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: qemu development 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 @intel.com) X-ZM-MESSAGEID: 1772648170895158500 Content-Type: text/plain; charset="utf-8" Since the lbr-fmt property is masked with PERF_CAP_LBR_FMT in DEFINE_PROP_UINT64_CHECKMASK(), there is no need to explicitly validate user-requested lbr-fmt values. The PMU feature is only supported when running under KVM, so initialize cpu->lbr_fmt in kvm_cpu_instance_init(). Use -1 as the default lbr-fmt, rather than initializing it with ~PERF_CAP_LBR_FMT, which is misleading as it suggests a semantic relationship that does not exist. Rename requested_lbr_fmt to a more generic guest_fmt. When lbr-fmt is not specified and cpu->migratable is false, the guest lbr_fmt value is not user-requested. Reviewed-by: Dapeng Mi Signed-off-by: Zide Chen --- V2: New patch. --- target/i386/cpu.c | 18 ++++++------------ target/i386/kvm/kvm-cpu.c | 2 ++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 89691fba45e1..da2e67ca1faf 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -9776,7 +9776,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error= **errp) X86CPUClass *xcc =3D X86_CPU_GET_CLASS(dev); CPUX86State *env =3D &cpu->env; Error *local_err =3D NULL; - unsigned requested_lbr_fmt; + unsigned guest_fmt; =20 if (!kvm_enabled()) cpu->enable_pmu =3D false; @@ -9816,11 +9816,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) * Override env->features[FEAT_PERF_CAPABILITIES].LBR_FMT * with user-provided setting. */ - if (cpu->lbr_fmt !=3D ~PERF_CAP_LBR_FMT) { - if ((cpu->lbr_fmt & PERF_CAP_LBR_FMT) !=3D cpu->lbr_fmt) { - error_setg(errp, "invalid lbr-fmt"); - return; - } + if (cpu->lbr_fmt !=3D -1) { env->features[FEAT_PERF_CAPABILITIES] &=3D ~PERF_CAP_LBR_FMT; env->features[FEAT_PERF_CAPABILITIES] |=3D cpu->lbr_fmt; } @@ -9829,9 +9825,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error= **errp) * vPMU LBR is supported when 1) KVM is enabled 2) Option pmu=3Don and * 3)vPMU LBR format matches that of host setting. */ - requested_lbr_fmt =3D - env->features[FEAT_PERF_CAPABILITIES] & PERF_CAP_LBR_FMT; - if (requested_lbr_fmt && kvm_enabled()) { + guest_fmt =3D env->features[FEAT_PERF_CAPABILITIES] & PERF_CAP_LBR_FMT; + if (guest_fmt) { uint64_t host_perf_cap =3D x86_cpu_get_supported_feature_word(NULL, FEAT_PERF_CAPABILITIE= S); unsigned host_lbr_fmt =3D host_perf_cap & PERF_CAP_LBR_FMT; @@ -9840,10 +9835,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Err= or **errp) error_setg(errp, "vPMU: LBR is unsupported without pmu=3Don"); return; } - if (requested_lbr_fmt !=3D host_lbr_fmt) { + if (guest_fmt !=3D host_lbr_fmt) { error_setg(errp, "vPMU: the lbr-fmt value (0x%x) does not matc= h " "the host value (0x%x).", - requested_lbr_fmt, host_lbr_fmt); + guest_fmt, host_lbr_fmt); return; } } @@ -10264,7 +10259,6 @@ static void x86_cpu_initfn(Object *obj) object_property_add_alias(obj, "sse4_2", obj, "sse4.2"); =20 object_property_add_alias(obj, "hv-apicv", obj, "hv-avic"); - cpu->lbr_fmt =3D ~PERF_CAP_LBR_FMT; object_property_add_alias(obj, "lbr_fmt", obj, "lbr-fmt"); =20 if (xcc->model) { diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index c34d9f15c7e8..1d0047d037c7 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -230,6 +230,8 @@ static void kvm_cpu_instance_init(CPUState *cs) kvm_cpu_max_instance_init(cpu); } =20 + cpu->lbr_fmt =3D -1; + kvm_cpu_xsave_init(); } =20 --=20 2.53.0