public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Kan Liang <kan.liang@linux.intel.com>,
	Dapeng Mi <dapeng1.mi@linux.intel.com>,
	 Jim Mattson <jmattson@google.com>,
	Jinrong Liang <cloudliang@tencent.com>,
	 Aaron Lewis <aaronlewis@google.com>,
	Like Xu <likexu@tencent.com>
Subject: [PATCH v8 08/26] KVM: x86/pmu: Disallow "fast" RDPMC for architectural Intel PMUs
Date: Thu,  9 Nov 2023 18:12:48 -0800	[thread overview]
Message-ID: <20231110021306.1269082-9-seanjc@google.com> (raw)
In-Reply-To: <20231110021306.1269082-1-seanjc@google.com>

Inject #GP on RDPMC if the "fast" flag is set for architectural Intel
PMUs, i.e. if the PMU version is non-zero.  Per Intel's SDM, and confirmed
on bare metal, the "fast" flag is supported only for non-architectural
PMUs, and is reserved for architectural PMUs.

  If the processor does not support architectural performance monitoring
  (CPUID.0AH:EAX[7:0]=0), ECX[30:0] specifies the index of the PMC to be
  read. Setting ECX[31] selects “fast” read mode if supported. In this mode,
  RDPMC returns bits 31:0 of the PMC in EAX while clearing EDX to zero.

  If the processor does support architectural performance monitoring
  (CPUID.0AH:EAX[7:0] ≠ 0), ECX[31:16] specifies type of PMC while ECX[15:0]
  specifies the index of the PMC to be read within that type. The following
  PMC types are currently defined:
  — General-purpose counters use type 0. The index x (to read IA32_PMCx)
    must be less than the value enumerated by CPUID.0AH.EAX[15:8] (thus
    ECX[15:8] must be zero).
  — Fixed-function counters use type 4000H. The index x (to read
    IA32_FIXED_CTRx) can be used if either CPUID.0AH.EDX[4:0] > x or
    CPUID.0AH.ECX[x] = 1 (thus ECX[15:5] must be 0).
  — Performance metrics use type 2000H. This type can be used only if
    IA32_PERF_CAPABILITIES.PERF_METRICS_AVAILABLE[bit 15]=1. For this type,
    the index in ECX[15:0] is implementation specific.

WARN if KVM ever actually tries to complete RDPMC for a non-architectural
PMU as KVM doesn't support such PMUs, i.e. kvm_pmu_rdpmc() should reject
the RDPMC before getting to the Intel code.

Fixes: f5132b01386b ("KVM: Expose a version 2 architectural PMU to a guests")
Fixes: 67f4d4288c35 ("KVM: x86: rdpmc emulation checks the counter incorrectly")
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 arch/x86/kvm/vmx/pmu_intel.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index c6ea128ea7c8..80255f86072e 100644
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -61,7 +61,19 @@ static struct kvm_pmc *intel_pmc_idx_to_pmc(struct kvm_pmu *pmu, int pmc_idx)
 
 static u32 intel_rdpmc_get_masked_idx(struct kvm_pmu *pmu, u32 idx)
 {
-	return idx & ~(INTEL_RDPMC_FIXED | INTEL_RDPMC_FAST);
+	/*
+	 * Fast RDPMC is only supported on non-architectural PMUs, which KVM
+	 * doesn't support.
+	 */
+	if (WARN_ON_ONCE(!pmu->version))
+		return idx & ~INTEL_RDPMC_FAST;
+
+	/*
+	 * Fixed PMCs are supported on all architectural PMUs.  Note, KVM only
+	 * emulates fixed PMCs for PMU v2+, but the flag itself is still valid,
+	 * i.e. let RDPMC fail due to accessing a non-existent counter.
+	 */
+	return idx & ~INTEL_RDPMC_FIXED;
 }
 
 static bool intel_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx)
-- 
2.42.0.869.gea05f2083d-goog


  parent reply	other threads:[~2023-11-10  2:13 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-10  2:12 [PATCH v8 00/26] KVM: x86/pmu: selftests: Fixes and new tests Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 01/26] KVM: x86/pmu: Always treat Fixed counters as available when supported Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 02/26] KVM: x86/pmu: Allow programming events that match unsupported arch events Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 03/26] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 04/26] KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 05/26] KVM: x86/pmu: Get eventsel for fixed counters from perf Sean Christopherson
2023-11-10 13:48   ` Liang, Kan
2023-11-10  2:12 ` [PATCH v8 06/26] KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 07/26] KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs Sean Christopherson
2023-11-10  3:22   ` Mi, Dapeng
2023-11-10 14:51     ` Sean Christopherson
2023-11-13  1:24       ` Mi, Dapeng
2023-11-10  2:12 ` Sean Christopherson [this message]
2023-11-10  6:07   ` [PATCH v8 08/26] KVM: x86/pmu: Disallow "fast" RDPMC for architectural " Mi, Dapeng
2023-11-10 23:32     ` Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 09/26] KVM: selftests: Add vcpu_set_cpuid_property() to set properties Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 10/26] KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 11/26] KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 12/26] KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 13/26] KVM: selftests: Test Intel PMU architectural events on gp counters Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 14/26] KVM: selftests: Test Intel PMU architectural events on fixed counters Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 15/26] KVM: selftests: Test consistency of CPUID with num of gp counters Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 16/26] KVM: selftests: Test consistency of CPUID with num of fixed counters Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 17/26] KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 18/26] KVM: selftests: Expand PMU counters test to verify LLC events Sean Christopherson
2023-11-10  2:12 ` [PATCH v8 19/26] KVM: selftests: Add a helper to query if the PMU module param is enabled Sean Christopherson
2023-11-10  2:13 ` [PATCH v8 20/26] KVM: selftests: Add helpers to read integer module params Sean Christopherson
2023-11-10  2:13 ` [PATCH v8 21/26] KVM: selftests: Query module param to detect FEP in MSR filtering test Sean Christopherson
2023-11-10  2:13 ` [PATCH v8 22/26] KVM: selftests: Move KVM_FEP macro into common library header Sean Christopherson
2023-11-10  2:13 ` [PATCH v8 23/26] KVM: selftests: Test PMC virtualization with forced emulation Sean Christopherson
2023-11-10  2:13 ` [PATCH v8 24/26] KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE() Sean Christopherson
2023-11-10  2:13 ` [PATCH v8 25/26] KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBV Sean Christopherson
2023-11-10  2:13 ` [PATCH v8 26/26] KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR Sean Christopherson
2023-11-13 11:41   ` Jinrong Liang
2023-11-13 13:40     ` Sean Christopherson
2023-11-14  3:07       ` Jinrong Liang
2023-11-10  2:52 ` [PATCH v8 00/26] KVM: x86/pmu: selftests: Fixes and new tests Jinrong Liang

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=20231110021306.1269082-9-seanjc@google.com \
    --to=seanjc@google.com \
    --cc=aaronlewis@google.com \
    --cc=cloudliang@tencent.com \
    --cc=dapeng1.mi@linux.intel.com \
    --cc=jmattson@google.com \
    --cc=kan.liang@linux.intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=likexu@tencent.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.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