mirror of https://lore.kernel.org/lkml/
 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>,
	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 01/21] KVM: SVM: Drop counter MSR checks in amd_is_valid_msr()
Date: Mon, 16 Nov 2026 13:02:49 -0600	[thread overview]
Message-ID: <553050b3-bcda-48e0-af03-754f0b697943@intel.com> (raw)
In-Reply-To: <avis5Ose25IiYM2S@google.com>



On 11/14/2026 12:49 PM, Yosry Ahmed wrote:
> On Thu, Nov 12, 2026 at 01:32:07PM -0700, Zide Chen wrote:
>> amd_msr_idx_to_pmc() accurately validates individual counter MSRs by
>> checking whether the corresponding counter is supported for the vCPU.
>> Validating counter MSRs again in amd_is_valid_msr() is redundant.
>>
>> Furthermore, validating counter MSRs using broad checks like
>> "pmu->version > 0" or "PERFCTR_CORE" is inaccurate and misleading. It
>> falsely validates unexposed counters, which then fail in
>> amd_pmu_{get,set}_msr(), injecting an errant #GP instead of taking
>> KVM's fallback (read 0, write ignored) and breaking migration for
>> unadvertised counters.
>>
>> Finally, the range check in the default case is dead code because AMD
>> CPUs currently support at most 6 Core Perf counters. Even if future AMD
>> CPUs support more than 6, counter MSRs would still be sufficiently
>> validated by amd_msr_idx_to_pmc().
>>
>> Drop the counter cases and dead range check from amd_is_valid_msr(),
>> leaving counter validation solely to amd_msr_idx_to_pmc().
>>
>> Fixes: 4a2771895ca6 ("KVM: x86/svm/pmu: Add AMD PerfMonV2 support")
>> Reported-by: Jim Mattson <jmattson@google.com>
>> Signed-off-by: Zide Chen <zide.chen@intel.com>
> 
> Should we also drop the get_gp_pmc(.., MSR_IA32_PERFCTR0),
> get_gp_pmc(.., MSR_P6_EVNTSEL0), and get_fixed_pmc() calls from the
> default case in intel_is_valid_msr()?
> 
> They are also covered by intel_msr_idx_to_pmc() IIUC.
It's a shame that I didn't take one step further to check the Intel code.

I completely agree that intel_is_valid_msr() should be simplified:

diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index 4824e7eb98d3..77ce713101a4 100644
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -229,10 +229,7 @@ static bool intel_is_valid_msr(struct kvm_vcpu
*vcpu, u32 msr)
                        ((perf_capabilities & PERF_CAP_PEBS_FORMAT) > 3);
                break;
        default:
-               ret = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0) ||
-                       get_gp_pmc(pmu, msr, MSR_P6_EVNTSEL0) ||
-                       get_fixed_pmc(pmu, msr) || get_fw_gp_pmc(pmu,
msr) ||
-                       intel_pmu_is_valid_lbr_msr(vcpu, msr);
+               ret = intel_pmu_is_valid_lbr_msr(vcpu, msr);
                break;
        }

Additionally, intel_msr_idx_to_pmc() currently misses get_fw_gp_pmc(),
which leaves FW counter writes untracked in kvm_pmu_mark_pmc_in_use().
Moving get_fw_gp_pmc() into intel_msr_idx_to_pmc() fixes that bug and
allows dropping all counter checks from intel_is_valid_msr():

@@ -247,6 +244,7 @@ static struct kvm_pmc *intel_msr_idx_to_pmc(struct
kvm_vcpu *vcpu, u32 msr)
        pmc = get_fixed_pmc(pmu, msr);
        pmc = pmc ? pmc : get_gp_pmc(pmu, msr, MSR_P6_EVNTSEL0);
        pmc = pmc ? pmc : get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0);
+       pmc = pmc ? pmc : get_fw_gp_pmc(pmu, msr);

        return pmc;
 }

This seems a little bit too complicated in intel_msr_idx_to_pmc(),
especially once PMU v6 is introduced and more v6 specific MSRs are
available. We may do some cleanup (not in this series though)

- Fold get_fw_gp_pmc() into get_gp_pmc() and hide the base MSR from the
  API signature to keep the callers clean.
- Move these helpers from pmu.h to pmu_intel.c, since AMD already uses
  its own helpers.

@@ -245,10 +294,9 @@ static struct kvm_pmc *intel_msr_idx_to_pmc(struct
kvm_vcpu *vcpu, u32 msr)
        struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
        struct kvm_pmc *pmc;

-       pmc = get_fixed_pmc(pmu, msr);
-       pmc = pmc ? pmc : get_gp_pmc(pmu, msr, MSR_P6_EVNTSEL0);
-       pmc = pmc ? pmc : get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0);
-       pmc = pmc ? pmc : get_fw_gp_pmc(pmu, msr);
+       pmc = intel_get_fixed_pmc(pmu, msr);
+       pmc = pmc ? pmc : intel_get_gp_eventsel_pmc(pmu, msr);
+       pmc = pmc ? pmc : intel_get_gp_counter_pmc(pmu, msr);

        return pmc;
 }

@@ -419,18 +467,17 @@ static int intel_pmu_get_msr(struct kvm_vcpu
*vcpu, struct msr_data *msr_info)
                msr_info->data = pmu->pebs_data_cfg;
                break;
        default:
-               if ((pmc = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0)) ||
-                   (pmc = get_gp_pmc(pmu, msr, MSR_IA32_PMC0))) {
+               if ((pmc = intel_get_gp_counter_pmc(pmu, msr))) {
                        u64 val = pmc_read_counter(pmc);
                        msr_info->data =
                                val & pmu->counter_bitmask[KVM_PMC_GP];


  reply	other threads:[~2026-11-16 19:02 UTC|newest]

Thread overview: 27+ 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 [this message]
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-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=553050b3-bcda-48e0-af03-754f0b697943@intel.com \
    --to=zide.chen@intel.com \
    --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=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

all inboxes | Powered by JetHome®