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 - 12:23:34 EST
> static void amd_pmu_init(struct kvm_vcpu *vcpu)
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index 136069dfcd44..e21abcedea70 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -761,24 +761,21 @@ static void svm_recalc_pmu_msr_intercepts(struct kvm_vcpu *vcpu)
> {
> bool intercept = !kvm_vcpu_has_mediated_pmu(vcpu);
> struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
> + unsigned long gp_mask = kvm_gp_pmc_mask(pmu);
> int i;
>
> if (!enable_mediated_pmu)
> return;
>
> /* Legacy counters are always available for AMD CPUs with a PMU. */
> - for (i = 0; i < min(pmu->nr_arch_gp_counters, AMD64_NUM_COUNTERS); i++)
> + for (i = 0; i < AMD64_NUM_COUNTERS; i++)
> svm_set_intercept_for_msr(vcpu, MSR_K7_PERFCTR0 + i,
> - MSR_TYPE_RW, intercept);
> + MSR_TYPE_RW, intercept || !test_bit(i, &gp_mask));
This fixes a pre-existing bug that was reported internally, that can
happen if a malicious VMM reduces the number of counters after
initiating KVM_RUN but before VM-entry. The current code would fail to
re-enable the intercept on the counters that become unsupported.
Might be worth splitting this out into a standalone fix.