summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/vmx/pmu_intel.c
diff options
context:
space:
mode:
authorAaron Lewis <aaronlewis@google.com>2022-12-20 16:12:30 +0000
committerSean Christopherson <seanjc@google.com>2023-01-24 10:06:10 -0800
commit6a5cba7bed35580effda9fb1872b274da47e6b23 (patch)
treeacd176cf254c9a1a2fe9dff712f28ef0de78e6c9 /arch/x86/kvm/vmx/pmu_intel.c
parent7cb79f433e75b05d1635aefaa851cfcd1cb7dc4f (diff)
downloadlinux-stable-6a5cba7bed35580effda9fb1872b274da47e6b23.tar.gz
linux-stable-6a5cba7bed35580effda9fb1872b274da47e6b23.tar.bz2
linux-stable-6a5cba7bed35580effda9fb1872b274da47e6b23.zip
KVM: x86/pmu: Correct the mask used in a pmu event filter lookup
When checking if a pmu event the guest is attempting to program should be filtered, only consider the event select + unit mask in that decision. Use an architecture specific mask to mask out all other bits, including bits 35:32 on Intel. Those bits are not part of the event select and should not be considered in that decision. Fixes: 66bb8a065f5a ("KVM: x86: PMU Event Filter") Signed-off-by: Aaron Lewis <aaronlewis@google.com> Link: https://lore.kernel.org/r/20221220161236.555143-2-aaronlewis@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'arch/x86/kvm/vmx/pmu_intel.c')
-rw-r--r--arch/x86/kvm/vmx/pmu_intel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index efce9ad70e4e..7980fda3978d 100644
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -811,4 +811,5 @@ struct kvm_pmu_ops intel_pmu_ops __initdata = {
.reset = intel_pmu_reset,
.deliver_pmi = intel_pmu_deliver_pmi,
.cleanup = intel_pmu_cleanup,
+ .EVENTSEL_EVENT = ARCH_PERFMON_EVENTSEL_EVENT,
};