linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yosry Ahmed <yosry@kernel.org>
To: "Chen, Zide" <zide.chen@intel.com>
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>,
	 Das Sandipan <Sandipan.Das@amd.com>,
	Shukla Manali <Manali.Shukla@amd.com>,
	 Dapeng Mi <dapeng1.mi@linux.intel.com>,
	Xudong Hao <xudong.hao@intel.com>
Subject: Re: [PATCH v4 06/21] KVM: x86/pmu: Drop nr_arch_{gp,fixed}_counters from kvm_pmu
Date: Wed, 18 Nov 2026 00:59:07 +0000	[thread overview]
Message-ID: <avz4LTEOcubVykim@google.com> (raw)
In-Reply-To: <e090723f-cc02-40c2-af57-ab5dfda91dcc@intel.com>

On Tue, Nov 17, 2026 at 02:02:08PM -0600, Chen, Zide wrote:
> 
> 
> On 11/17/2026 11:23 AM, Yosry Ahmed wrote:
> >>  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.
> 
> My hesitation on a separate patch was to avoid throwaway code churn.
> A standalone patch would add:
> 
>         for ( ; i < AMD64_NUM_COUNTERS; i++)
>                 svm_enable_intercept_for_msr(vcpu, MSR_K7_PERFCTR0 + i,
>                                              MSR_TYPE_RW);
> 
> and then it will be immediately overwritten and collapsed into a single
> loop in this patch.
> 
> So basically cleaner logic vs. avoiding immediate churn. I'm happy to
> split it out if you prefer.

I think it's fine. You can also fix it by using the same loop struct we
end up with instead of adding another loop? i.e. loop until
AMD64_NUM_COUNTERS and intercept based on i < nr_arch_gp_counters
instead of testing the GP mask?

  reply	other threads:[~2026-11-18  0:59 UTC|newest]

Thread overview: 32+ 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 [this message]
2026-11-18  0:58   ` 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-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-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-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-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=avz4LTEOcubVykim@google.com \
    --to=yosry@kernel.org \
    --cc=Manali.Shukla@amd.com \
    --cc=Sandipan.Das@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=zide.chen@intel.com \
    /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).