Re: [PATCH v4 06/21] KVM: x86/pmu: Drop nr_arch_{gp,fixed}_counters from kvm_pmu
From: Yosry Ahmed
Date: Tue Nov 17 2026 - 19:58:19 EST
On Thu, Nov 12, 2026 at 01:32:12PM -0700, Zide Chen wrote:
> From: Dapeng Mi <dapeng1.mi@xxxxxxxxxxxxxxx>
>
> Populate and use pmc_exists directly when walking guest-visible PMCs,
> instead of relying on pmu->nr_arch_{gp,fixed}_counters as intermediate
> state, in preparation for switching KVM's host PMU capabilities from
> counter counts to counter bitmaps.
>
> Extend pmu->pmc_exists to a union so that the u64 alias (pmc_exists64)
> is available for mask arithmetic operations. Introduce
> kvm_{gp,fixed}_pmc_mask() to extract the respective counter bitmasks,
> and provide the kvm_for_each_{gp,fixed}_counter() iterator macros to
> replace open-coded counter index loops.
>
> Consolidate PMU MSR intercept setup in VMX and SVM into single loops.
> In SVM, this also fixes legacy counter interception by re-enabling
> intercepts if a vCPU's counter count is narrowed.
>
> Signed-off-by: Dapeng Mi <dapeng1.mi@xxxxxxxxxxxxxxx>
> Co-developed-by: Zide Chen <zide.chen@xxxxxxxxx>
> Signed-off-by: Zide Chen <zide.chen@xxxxxxxxx>
[..]
> diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h
> index fbab4f5c9181..b312f80f5cda 100644
> --- a/arch/x86/kvm/pmu.h
> +++ b/arch/x86/kvm/pmu.h
> @@ -88,6 +88,18 @@ static inline bool kvm_vcpu_has_mediated_pmu(struct kvm_vcpu *vcpu)
> return enable_mediated_pmu && vcpu_to_pmu(vcpu)->version;
> }
>
> +static inline u64 kvm_gp_pmc_mask(struct kvm_pmu *pmu)
> +{
> + return pmu->pmc_exists64 &
> + GENMASK_ULL(KVM_MAX_NR_GP_COUNTERS - 1, 0);
> +}
> +
> +static inline u64 kvm_fixed_pmc_mask(struct kvm_pmu *pmu)
> +{
> + return (pmu->pmc_exists64 >> KVM_FIXED_PMC_BASE_IDX) &
> + GENMASK_ULL(KVM_MAX_NR_FIXED_COUNTERS - 1, 0);
Why do we need to & with the
KVM_MAX_NR_GP_COUNTERS/KVM_MAX_NR_FIXED_COUNTERS mask here? Isn't
pmc_exists64 already clamped?
> +}
> +
> static inline bool kvm_is_gp_pmc_supported(struct kvm_pmu *pmu, unsigned int idx)
> {
> return idx < KVM_MAX_NR_GP_COUNTERS &&
[..]
> diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
> index fadc466cd600..68d23c7877a2 100644
> --- a/arch/x86/kvm/vmx/pmu_intel.c
> +++ b/arch/x86/kvm/vmx/pmu_intel.c
> @@ -71,14 +71,14 @@ static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)
>
> pmu->fixed_ctr_ctrl = data;
> pmu->fixed_ctr_ctrl_hw = data;
> - for (i = 0; i < pmu->nr_arch_fixed_counters; i++) {
> + kvm_for_each_fixed_counter(i, pmu) {
> u8 new_ctrl = fixed_ctrl_field(data, i);
> u8 old_ctrl = fixed_ctrl_field(old_fixed_ctr_ctrl, i);
>
> if (old_ctrl == new_ctrl)
> continue;
>
> - pmc = get_fixed_pmc(pmu, MSR_CORE_PERF_FIXED_CTR0 + i);
> + pmc = &pmu->fixed_counters[i];
By bypassing the helper we lose the array_index_nospec(), right? Same
applies if we directly access the array elsewhere.
>
> __set_bit(KVM_FIXED_PMC_BASE_IDX + i, pmu->pmc_in_use);
> kvm_pmu_request_counter_reprogram(pmc);
[..]
> @@ -497,7 +501,7 @@ static void intel_pmu_enable_fixed_counter_bits(struct kvm_pmu *pmu, u64 bits)
> {
> int i;
>
> - for (i = 0; i < pmu->nr_arch_fixed_counters; i++)
> + kvm_for_each_fixed_counter(i, pmu)
> pmu->fixed_ctr_ctrl_rsvd &= ~intel_fixed_bits_by_idx(i, bits);
> }
>
> @@ -505,11 +509,13 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
> {
> struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
> struct lbr_desc *lbr_desc = vcpu_to_lbr_desc(vcpu);
> + int nr_gp_counters, nr_fixed_counters;
> struct kvm_cpuid_entry2 *entry;
> union cpuid10_eax eax;
> union cpuid10_edx edx;
> u64 perf_capabilities;
> u64 counter_rsvd;
> + u64 fixed_mask;
>
> if (!lbr_desc)
> return;
> @@ -535,8 +541,6 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
> if (!pmu->version)
> return;
>
> - pmu->nr_arch_gp_counters = min_t(int, eax.split.num_counters,
> - kvm_pmu_cap.num_counters_gp);
> eax.split.bit_width = min_t(int, eax.split.bit_width,
> kvm_pmu_cap.bit_width_gp);
> pmu->counter_bitmask[KVM_PMC_GP] = BIT_ULL(eax.split.bit_width) - 1;
> @@ -544,6 +548,14 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
> kvm_pmu_cap.events_mask_len);
> pmu->available_event_types = ~entry->ebx & (BIT_ULL(eax.split.mask_length) - 1);
>
> + nr_fixed_counters = min_t(int, edx.split.num_counters_fixed,
> + kvm_pmu_cap.num_counters_fixed);
> + fixed_mask = BIT_ULL(nr_fixed_counters) - 1;
Probably clearer to move these right above where fixed_mask is used.
> +
> + nr_gp_counters = min_t(int, eax.split.num_counters,
> + kvm_pmu_cap.num_counters_gp);
> + pmu->pmc_exists64 = BIT_ULL(nr_gp_counters) - 1;
> +
> entry = kvm_find_cpuid_entry_index(vcpu, 7, 0);
> if (entry &&
> (boot_cpu_has(X86_FEATURE_HLE) || boot_cpu_has(X86_FEATURE_RTM)) &&
> @@ -565,8 +577,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
> if (pmu->version == 1)
> return;
>
> - pmu->nr_arch_fixed_counters = min_t(int, edx.split.num_counters_fixed,
> - kvm_pmu_cap.num_counters_fixed);
> + pmu->pmc_exists64 |= fixed_mask << KVM_FIXED_PMC_BASE_IDX;
> edx.split.bit_width_fixed = min_t(int, edx.split.bit_width_fixed,
> kvm_pmu_cap.bit_width_fixed);
> pmu->counter_bitmask[KVM_PMC_FIXED] = BIT_ULL(edx.split.bit_width_fixed) - 1;
> @@ -575,8 +586,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
> INTEL_FIXED_0_USER |
> INTEL_FIXED_0_ENABLE_PMI);
>
> - counter_rsvd = ~((BIT_ULL(pmu->nr_arch_gp_counters) - 1) |
> - ((BIT_ULL(pmu->nr_arch_fixed_counters) - 1) << KVM_FIXED_PMC_BASE_IDX));
> + counter_rsvd = ~(kvm_gp_pmc_mask(pmu) |
> + (kvm_fixed_pmc_mask(pmu) << KVM_FIXED_PMC_BASE_IDX));
Can we use pmc_exists64 here like the AMD code?
> pmu->global_ctrl_rsvd = counter_rsvd;
>
> pmu->global_status_rsvd = pmu->global_ctrl_rsvd
> @@ -591,7 +602,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
> pmu->pebs_data_cfg_rsvd = ~0xff00000full;
> intel_pmu_enable_fixed_counter_bits(pmu, ICL_FIXED_0_ADAPTIVE);
> } else {
> - pmu->pebs_enable_rsvd = ~(BIT_ULL(pmu->nr_arch_gp_counters) - 1);
> + pmu->pebs_enable_rsvd = ~kvm_gp_pmc_mask(pmu);
> }
> }
> }