Commit 3deabc3f authored Feb 02, 2022 by Jim Mattson Committed by Greg Kroah-Hartman Feb 23, 2022

KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW



[ Upstream commit 710c476514313c74045c41c0571bb5178fd16e3d ]

AMD's event select is 3 nybbles, with the high nybble in bits 35:32 of
a PerfEvtSeln MSR. Don't mask off the high nybble when configuring a
RAW perf event.

Fixes: ca724305 ("KVM: x86/vPMU: Implement AMD vPMU code for KVM")
Signed-off-by: Jim Mattson <jmattson@google.com>
Message-Id: <20220203014813.2130559-2-jmattson@google.com>
Reviewed-by: David Dunn <daviddunn@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent fe595759

arch/x86/kvm/pmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel)
		}

		if (type == PERF_TYPE_RAW)
		config = eventsel & X86_RAW_EVENT_MASK;
		config = eventsel & AMD64_RAW_EVENT_MASK;

		pmc_reprogram_counter(pmc, type, config,
		!(eventsel & ARCH_PERFMON_EVENTSEL_USR),