]> git.baikalelectronics.ru Git - kernel.git/commit
KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln register
authorLike Xu <likexu@tencent.com>
Thu, 18 Nov 2021 13:03:20 +0000 (21:03 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 2 Dec 2021 09:11:50 +0000 (04:11 -0500)
commitcb1d220da0faa5ca0deb93449aff953f0c2cce6d
tree98a3d02918490581660702135f186a368a4212c5
parent7cfc5c653b07782e7059527df8dc1e3143a7591e
KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln register

If we run the following perf command in an AMD Milan guest:

  perf stat \
  -e cpu/event=0x1d0/ \
  -e cpu/event=0x1c7/ \
  -e cpu/umask=0x1f,event=0x18e/ \
  -e cpu/umask=0x7,event=0x18e/ \
  -e cpu/umask=0x18,event=0x18e/ \
  ./workload

dmesg will report a #GP warning from an unchecked MSR access
error on MSR_F15H_PERF_CTLx.

This is because according to APM (Revision: 4.03) Figure 13-7,
the bits [35:32] of AMD PerfEvtSeln register is a part of the
event select encoding, which extends the EVENT_SELECT field
from 8 bits to 12 bits.

Opportunistically update pmu->reserved_bits for reserved bit 19.

Reported-by: Jim Mattson <jmattson@google.com>
Fixes: ca724305a2b0 ("KVM: x86/vPMU: Implement AMD vPMU code for KVM")
Signed-off-by: Like Xu <likexu@tencent.com>
Message-Id: <20211118130320.95997-1-likexu@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/svm/pmu.c