diff options
| author |  Sean Christopherson <seanjc@google.com>
| 2024-01-09 15:02:28 -0800 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com>
| 2024-01-30 15:28:02 -0800 |
| commit | d652981db08fe2db185e00ad9cd41871f49807b0 (patch) | |
| tree | 055c188bbfbf6d7e9096f9ddc855365853b92bfa /arch/x86/kvm/pmu.c | |
| parent | KVM: x86/pmu: Prioritize VMX interception over #GP on RDPMC due to bad index (diff) | |
| download | linux-d652981db08fe2db185e00ad9cd41871f49807b0.tar.gz linux-d652981db08fe2db185e00ad9cd41871f49807b0.tar.bz2 linux-d652981db08fe2db185e00ad9cd41871f49807b0.zip | |
KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs
Move the handling of "fast" RDPMC instructions, which drop bits 63:32 of
the count, to Intel. The "fast" flag, and all modifiers for that matter,
are Intel-only and aren't supported by AMD.
Opportunistically replace open coded bit crud with proper #defines, and
add comments to try and disentangle the flags vs. values mess for
non-architectural vs. architectural PMUs.
Fixes: ca724305a2b0 ("KVM: x86/vPMU: Implement AMD vPMU code for KVM")
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Tested-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://lore.kernel.org/r/20240109230250.424295-9-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'arch/x86/kvm/pmu.c')
| -rw-r--r-- | arch/x86/kvm/pmu.c | 3 |
1 files changed, 1 insertions, 2 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; |