Introduce amd_pmu_dormant_hg_event(), which determines whether an AMD PMC should be dormant (i.e. not count) based on the guest's Host-Only and Guest-Only event selector bits and the current vCPU state.
Update amd_pmu_set_eventsel_hw() to clear the event selector's enable bit when the event is dormant. Signed-off-by: Jim Mattson <[email protected]> --- arch/x86/include/asm/perf_event.h | 2 ++ arch/x86/kvm/svm/pmu.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 0d9af4135e0a..7649d79d91a6 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -58,6 +58,8 @@ #define AMD64_EVENTSEL_INT_CORE_ENABLE (1ULL << 36) #define AMD64_EVENTSEL_GUESTONLY (1ULL << 40) #define AMD64_EVENTSEL_HOSTONLY (1ULL << 41) +#define AMD64_EVENTSEL_HG_ONLY \ + (AMD64_EVENTSEL_HOSTONLY | AMD64_EVENTSEL_GUESTONLY) #define AMD64_EVENTSEL_INT_CORE_SEL_SHIFT 37 #define AMD64_EVENTSEL_INT_CORE_SEL_MASK \ diff --git a/arch/x86/kvm/svm/pmu.c b/arch/x86/kvm/svm/pmu.c index 33c139b23a9e..f619417557f9 100644 --- a/arch/x86/kvm/svm/pmu.c +++ b/arch/x86/kvm/svm/pmu.c @@ -147,10 +147,33 @@ static int amd_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) return 1; } +static bool amd_pmu_dormant_hg_event(struct kvm_pmc *pmc) +{ + u64 hg_only = pmc->eventsel & AMD64_EVENTSEL_HG_ONLY; + struct kvm_vcpu *vcpu = pmc->vcpu; + + if (hg_only == 0) + /* Not an HG_ONLY event */ + return false; + + if (!(vcpu->arch.efer & EFER_SVME)) + /* HG_ONLY bits are ignored when SVME is clear */ + return false; + + /* Always active if both HG_ONLY bits are set */ + if (hg_only == AMD64_EVENTSEL_HG_ONLY) + return false; + + return !!(hg_only & AMD64_EVENTSEL_HOSTONLY) == is_guest_mode(vcpu); +} + static void amd_pmu_set_eventsel_hw(struct kvm_pmc *pmc) { pmc->eventsel_hw = (pmc->eventsel & ~AMD64_EVENTSEL_HOSTONLY) | AMD64_EVENTSEL_GUESTONLY; + + if (amd_pmu_dormant_hg_event(pmc)) + pmc->eventsel_hw &= ~ARCH_PERFMON_EVENTSEL_ENABLE; } static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) -- 2.52.0.457.g6b5491de43-goog
