perf/x86/amd: Don't touch the Host-only bit inside the guest hypervisor
Subsystems (2)
PATCH 1/1 perf/x86/amd: Don't touch the Host-only bit inside the guest hypervisor
From: Dongli Si <[email protected]>
When using nested virtualization and if use "perf record" in an AMD Rome and Milan guest hypervisor (L1), dmesg report an error message like this:
[ ] unchecked MSR access error: WRMSR to 0xc0010200 (tried to write 0x0000020000510076) at rIP: 0xffffffff81003a50 (x86_pmu_enable_all+0x60/0x100)
The AMD64_EVENTSEL_HOSTONLY bit is defined and used on the host, while the guest hypervisor (L1) performance monitor unit should avoid such use.
Fixes 1018faa6cf23 ("perf/x86/kvm: Fix Host-Only/Guest-Only counting with SVM disabled")
Signed-off-by Dongli Si <[email protected]>
--- arch/x86/events/amd/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/events/amd/core.c +3 -1
@@ -8,6 +8,7 @@#include <linux/jiffies.h> #include <asm/apicdef.h> #include <asm/nmi.h> +#include <asm/hypervisor.h> #include "../perf_event.h"
@@ -1027,7 +1028,8 @@ void amd_pmu_enable_virt(void) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); - cpuc->perf_ctr_virt_mask =0 ; +if (hypervisor_is_type (X86_HYPER_NATIVE )) + cpuc->perf_ctr_virt_mask =0 ;/* Reload all events */ amd_pmu_disable_all ();
Signature · 1 line
2.32.0