linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Chen, Zide" <zide.chen@intel.com>
To: Yosry Ahmed <yosry@kernel.org>
Cc: Sean Christopherson <seanjc@google.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	kvm@vger.kernel.org, Jim Mattson <jmattson@google.com>,
	Andi Kleen <ak@linux.intel.com>,
	Stephane Eranian <eranian@google.com>,
	linux-kernel@vger.kernel.org, Mingwei Zhang <mizhang@google.com>,
	Shukla Manali <Manali.Shukla@amd.com>,
	Dapeng Mi <dapeng1.mi@linux.intel.com>,
	Xudong Hao <xudong.hao@intel.com>
Subject: Re: [PATCH v4 09/21] KVM: x86/pmu: Switch to bitmask-based KVM PMU capabilities
Date: Wed, 18 Nov 2026 11:45:01 -0600	[thread overview]
Message-ID: <704f5a24-2880-4593-9c29-63eaffdaee29@intel.com> (raw)
In-Reply-To: <av3MeWKmCRprVNWx@google.com>



On 11/18/2026 10:05 AM, Yosry Ahmed wrote:
> On Thu, Nov 12, 2026 at 01:32:15PM -0700, Zide Chen wrote:
>> From: Dapeng Mi <dapeng1.mi@linux.intel.com>
>>
>> Intel platforms support non-contiguous fixed counters via CPUID.0AH:ECX
>> starting with PerfMon v5, and support non-contiguous GP counters
>> through the Architectural PerfMon Extension (CPUID leaf 23H).
>>
>> struct x86_pmu_capability now exposes {,fixed_}cntr_mask64 bitmaps,
>> which may contain sparse bits representing non-contiguous counters.
>> Switch KVM's kvm_host_pmu and kvm_pmu_cap consumers over to the new
>> bitmask fields, including iterating kvm_host_pmu bitmasks directly in
>> VMX and SVM PMU MSR intercept setup.
>>
>> CPUID.0AH:EAX[15:8] and CPUID.0AH:EDX[4:0] enumerate only contiguous
>> counters. Derive these values from kvm_pmu_cap.{,fixed_}cntr_mask64 as
>> the number of consecutive counters starting at index 0.
>>
>> Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
>> Co-developed-by: Zide Chen <zide.chen@intel.com>
>> Signed-off-by: Zide Chen <zide.chen@intel.com>
>> ---
>> v4:
>> - Cleanly substitute kvm_pmu_cap.num_counters_{gp,fixed} with
>>   find_first_zero_bit() in intel_pmu_refresh() without throwaway
>>   code churn.
>> - Use find_first_zero_bit() instead of hweight64() for AMD CPUID
>>   0x80000022 EBX[3:0] (NumCorePmc) and svm_set_cpu_caps() to enumerate
>>   contiguous counters. (Yosry)
>> - Do not carry over Jim's Reviewed-by from v3 due to reworking counter
>>   clamping in intel_pmu_refresh().
>>
>> v3:
>> - Iterate kvm_host_pmu bitmasks directly in VMX and SVM intercept loops.
>> - Clamp nr_{gp,fixed}_counters to the number of contiguous counters
>>   supported by KVM in intel_pmu_refresh(). (Jim, Sashiko)
>> - Drop redundant !enable_mediated_pmu clamp on fixed_cntr_mask64.
>>   (Sashiko)
>> ---
>>  arch/x86/kvm/cpuid.c         | 17 ++++++++++++++---
>>  arch/x86/kvm/msrs.c          | 12 ++++++------
>>  arch/x86/kvm/pmu.c           | 17 ++++++++---------
>>  arch/x86/kvm/svm/pmu.c       |  2 +-
>>  arch/x86/kvm/svm/svm.c       |  8 ++++----
>>  arch/x86/kvm/vmx/pmu_intel.c | 18 +++++++++++++++---
>>  arch/x86/kvm/vmx/vmx.c       |  4 ++--
>>  7 files changed, 50 insertions(+), 28 deletions(-)
>>
>> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
>> index adafd6fa2c54..427871ec365f 100644
>> --- a/arch/x86/kvm/cpuid.c
>> +++ b/arch/x86/kvm/cpuid.c
>> @@ -1535,10 +1535,18 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
>>  		}
>>  
>>  		eax.split.version_id = kvm_pmu_cap.version;
>> -		eax.split.num_counters = kvm_pmu_cap.num_counters_gp;
>> +
>> +		/* Contiguous GP counters only. */
>> +		eax.split.num_counters =
>> +			find_first_zero_bit(kvm_pmu_cap.cntr_mask,
>> +					    KVM_MAX_NR_GP_COUNTERS);
> 
> Should we add helpers for the find_first_zero_bit() calls across?
> Perhaps kvm_pmu_nr_contig_gp_counters() and
> kvm_pmu_nr_contig_fixed_counters()?

Agreed, encapsulating find_first_zero_bit() makes it more readable.

static inline unsigned int kvm_pmu_nr_contig_gp_counters(void)
{
        return find_first_zero_bit(kvm_pmu_cap.cntr_mask,
                                   KVM_MAX_NR_GP_COUNTERS);
}

static inline unsigned int kvm_pmu_nr_contig_fixed_counters(void)
{
        return find_first_zero_bit(kvm_pmu_cap.fixed_cntr_mask,
                                   KVM_MAX_NR_FIXED_COUNTERS);
}

  reply	other threads:[~2026-11-18 17:45 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-12 20:32 [PATCH v4 00/21] KVM: x86/pmu: Add mediated vPMU PerfMon v5 support Zide Chen
2026-11-12 20:32 ` [PATCH v4 01/21] KVM: SVM: Drop counter MSR checks in amd_is_valid_msr() Zide Chen
2026-11-14 18:49   ` Yosry Ahmed
2026-11-16 19:02     ` Chen, Zide
2026-11-18  0:28       ` Yosry Ahmed
2026-11-12 20:32 ` [PATCH v4 02/21] KVM: x86/pmu: Remove redundant Perf Global Status MSR bit definitions Zide Chen
2026-11-12 20:32 ` [PATCH v4 03/21] KVM: x86/pmu: Rename all_valid_pmc_idx to pmc_exists Zide Chen
2026-11-12 20:32 ` [PATCH v4 04/21] KVM: x86/pmu: Rename reserved_bits to eventsel_rsvd in kvm_pmu Zide Chen
2026-11-12 20:32 ` [PATCH v4 05/21] KVM: x86/pmu: Use pmc_exists in PMC lookup helpers Zide Chen
2026-11-14 18:53   ` Yosry Ahmed
2026-11-12 20:32 ` [PATCH v4 06/21] KVM: x86/pmu: Drop nr_arch_{gp,fixed}_counters from kvm_pmu Zide Chen
2026-11-17 17:23   ` Yosry Ahmed
2026-11-17 20:02     ` Chen, Zide
2026-11-18  0:59       ` Yosry Ahmed
2026-11-18 15:46         ` Yosry Ahmed
2026-11-18 15:58           ` Chen, Zide
2026-11-18  0:58   ` Yosry Ahmed
2026-11-18 17:25     ` Chen, Zide
2026-11-18 17:31       ` Yosry Ahmed
2026-11-12 20:32 ` [PATCH v4 07/21] KVM: x86/pmu: Expose kvm_host_pmu to vendor modules Zide Chen
2026-11-12 20:32 ` [PATCH v4 08/21] perf/x86: Plumb counter bitmap from x86_pmu to x86_pmu_cap Zide Chen
2026-11-12 20:32 ` [PATCH v4 09/21] KVM: x86/pmu: Switch to bitmask-based KVM PMU capabilities Zide Chen
2026-11-13  6:40   ` Mi, Dapeng
2026-11-13 18:22     ` Chen, Zide
2026-11-18 16:05   ` Yosry Ahmed
2026-11-18 17:45     ` Chen, Zide [this message]
2026-11-12 20:32 ` [PATCH v4 10/21] perf/x86: Remove num_counters_{gp,fixed} from x86_pmu_capability Zide Chen
2026-11-12 20:32 ` [PATCH v4 11/21] KVM: x86/pmu: Document GLOBAL_STATUS_RESET passthrough erratum Zide Chen
2026-11-12 20:32 ` [PATCH v4 12/21] KVM: x86/pmu: Mark CondChgd reserved in global_status_rsvd Zide Chen
2026-11-12 20:32 ` [PATCH v4 13/21] KVM: x86/pmu: Emulate IA32_PERF_GLOBAL_STATUS_SET MSR Zide Chen
2026-11-18 16:12   ` Yosry Ahmed
2026-11-18 17:59     ` Chen, Zide
2026-11-12 20:32 ` [PATCH v4 14/21] KVM: x86/pmu: Emulate IA32_PERF_GLOBAL_INUSE MSR Zide Chen
2026-11-12 20:32 ` [PATCH v4 15/21] KVM: x86/pmu: Clamp pmu->version to kvm_pmu_cap.version Zide Chen
2026-11-18 16:17   ` Yosry Ahmed
2026-11-18 19:19     ` Chen, Zide
2026-11-18 19:30       ` Yosry Ahmed
2026-11-12 20:32 ` [PATCH v4 16/21] KVM: x86/pmu: Populate CPUID.0AH:ECX fixed-counter bitmap Zide Chen
2026-11-12 20:32 ` [PATCH v4 17/21] KVM: x86/pmu: Factor out fixed counter control bit calculation Zide Chen
2026-11-18 16:20   ` Yosry Ahmed
2026-11-12 20:32 ` [PATCH v4 18/21] KVM: x86/pmu: Mask only OS/USR bits when filtering fixed counters Zide Chen
2026-11-12 20:32 ` [PATCH v4 19/21] KVM: x86/pmu: Ignore AnyThread bit if CPUID.0AH:EDX[15] is set Zide Chen
2026-11-12 20:32 ` [PATCH v4 20/21] KVM: x86/pmu: Advertise PerfMon version 5 on Intel hosts Zide Chen
2026-11-12 20:32 ` [PATCH v4 21/21] KVM: selftests: Support fixed counters bitmap in pmu_counters_test Zide Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=704f5a24-2880-4593-9c29-63eaffdaee29@intel.com \
    --to=zide.chen@intel.com \
    --cc=Manali.Shukla@amd.com \
    --cc=ak@linux.intel.com \
    --cc=dapeng1.mi@linux.intel.com \
    --cc=eranian@google.com \
    --cc=jmattson@google.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mizhang@google.com \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=seanjc@google.com \
    --cc=xudong.hao@intel.com \
    --cc=yosry@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).