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 v9 08/28] KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs
Date: Fri, 1 Dec 2023 16:03:57 -0800 [thread overview]
Message-ID: <20231202000417.922113-9-seanjc@google.com> (raw)
In-Reply-To: <20231202000417.922113-1-seanjc@google.com>
Move the handling of "fast" RDPMC instructions, which drop bits 63:32 of
the count, to Intel. The "fast" flag, and all flags for that matter, are
Intel-only and aren't supported by AMD.
Opportunistically replace open coded bit crud with proper #defines.
Fixes: ca724305a2b0 ("KVM: x86/vPMU: Implement AMD vPMU code for KVM")
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/pmu.c | 3 +--
arch/x86/kvm/vmx/pmu_intel.c | 11 +++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index 0b0d804ee239..09b0feb975c3 100644
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -576,10 +576,9 @@ static int kvm_pmu_rdpmc_vmware(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)
int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)
{
- bool fast_mode = idx & (1u << 31);
struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
struct kvm_pmc *pmc;
- u64 mask = fast_mode ? ~0u : ~0ull;
+ u64 mask = ~0ull;
if (!pmu->version)
return 1;
diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index 1b1f888ad32b..6903dd9b71ad 100644
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -20,6 +20,10 @@
#include "nested.h"
#include "pmu.h"
+/* Perf's "BASE" is wildly misleading, this is a single-bit flag, not a base. */
+#define INTEL_RDPMC_FIXED INTEL_PMC_FIXED_RDPMC_BASE
+#define INTEL_RDPMC_FAST BIT(31)
+
#define MSR_PMC_FULL_WIDTH_BIT (MSR_IA32_PMC0 - MSR_IA32_PERFCTR0)
static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)
@@ -59,11 +63,14 @@ static struct kvm_pmc *intel_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu,
unsigned int idx, u64 *mask)
{
struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
- bool fixed = idx & (1u << 30);
+ bool fixed = idx & INTEL_RDPMC_FIXED;
struct kvm_pmc *counters;
unsigned int num_counters;
- idx &= ~(3u << 30);
+ if (idx & INTEL_RDPMC_FAST)
+ *mask &= GENMASK_ULL(31, 0);
+
+ idx &= ~(INTEL_RDPMC_FIXED | INTEL_RDPMC_FAST);
if (fixed) {
counters = pmu->fixed_counters;
num_counters = pmu->nr_arch_fixed_counters;
--
2.43.0.rc2.451.g8631bc7472-goog
next prev parent reply other threads:[~2023-12-02 0:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-02 0:03 [PATCH v9 00/28] KVM: x86/pmu: selftests: Fixes and new tests Sean Christopherson
2023-12-02 0:03 ` [PATCH v9 01/28] KVM: x86/pmu: Always treat Fixed counters as available when supported Sean Christopherson
2023-12-02 0:03 ` [PATCH v9 02/28] KVM: x86/pmu: Allow programming events that match unsupported arch events Sean Christopherson
2023-12-02 0:03 ` [PATCH v9 03/28] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings Sean Christopherson
2023-12-02 0:03 ` [PATCH v9 04/28] KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization Sean Christopherson
2023-12-02 0:03 ` [PATCH v9 05/28] KVM: x86/pmu: Get eventsel for fixed counters from perf Sean Christopherson
2023-12-02 0:03 ` [PATCH v9 06/28] KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD Sean Christopherson
2023-12-02 0:03 ` [PATCH v9 07/28] KVM: x86/pmu: Prioritize VMX interception over #GP on RDPMC due to bad index Sean Christopherson
2023-12-02 0:03 ` Sean Christopherson [this message]
2023-12-02 0:03 ` [PATCH v9 09/28] KVM: x86/pmu: Disallow "fast" RDPMC for architectural Intel PMUs Sean Christopherson
2023-12-11 6:03 ` Mi, Dapeng
2023-12-02 0:03 ` [PATCH v9 10/28] KVM: x86/pmu: Explicitly check for RDPMC of unsupported Intel PMC types Sean Christopherson
2023-12-11 6:26 ` Mi, Dapeng
2023-12-11 21:33 ` Jim Mattson
2023-12-11 23:43 ` Sean Christopherson
2023-12-12 2:26 ` Jim Mattson
2023-12-13 2:25 ` Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 11/28] KVM: selftests: Add vcpu_set_cpuid_property() to set properties Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 12/28] KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 13/28] KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 14/28] KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 15/28] KVM: selftests: Test Intel PMU architectural events on gp counters Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 16/28] KVM: selftests: Test Intel PMU architectural events on fixed counters Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 17/28] KVM: selftests: Test consistency of CPUID with num of gp counters Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 18/28] KVM: selftests: Test consistency of CPUID with num of fixed counters Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 19/28] KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 20/28] KVM: selftests: Expand PMU counters test to verify LLC events Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 21/28] KVM: selftests: Add a helper to query if the PMU module param is enabled Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 22/28] KVM: selftests: Add helpers to read integer module params Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 23/28] KVM: selftests: Query module param to detect FEP in MSR filtering test Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 24/28] KVM: selftests: Move KVM_FEP macro into common library header Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 25/28] KVM: selftests: Test PMC virtualization with forced emulation Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 26/28] KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE() Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 27/28] KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBV Sean Christopherson
2023-12-02 0:04 ` [PATCH v9 28/28] KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR Sean Christopherson
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=20231202000417.922113-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