perf/x86/amd: Don't touch the Host-only bit inside the guest hypervisor
Subsystems (2)
PATCH v5 1/1 perf/x86/amd: Don't touch the Host-only bit inside the guest hypervisor
From: Dongli Si <[email protected]>
With nested virtualization on AMD Milan, if "perf record" is run in an L1 hypervisor with an L2 guest, the following warning is emitted in the L1 guest.
[] unchecked MSR access error: WRMSR to 0xc0010200 (tried to write 0x0000020000510076) at rIP: 0xffffffff81003a50 (x86_pmu_enable_all+0x60/0x100)
[] Call Trace:
[] <IRQ> [] ? x86_pmu_enable+0x146/0x300 [] __perf_install_in_context+0x150/0x170
The AMD64_EVENTSEL_HOSTONLY bit is defined and used on the host (L0), while the L1 hypervisor Performance Monitor Unit should avoid such use.
---
v5: Add a wee comment to clarifies things and improve code
v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
arch/x86/events/amd/core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/x86/events/amd/core.c +13 -0
@@ -8,6 +8,7 @@#include <linux/jiffies.h> #include <asm/apicdef.h> #include <asm/nmi.h> +#include <asm/hypervisor.h> #include "../perf_event.h"
@@ -1023,10 +1024,16 @@ __init int amd_pmu_init(void)return 0 ; } +/* +* Set the Host-only bit when virtualization is enabled on the Host Hypervisor +*/ void amd_pmu_enable_virt (void ) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); +if (!hypervisor_is_type (X86_HYPER_NATIVE )) +return ; + cpuc->perf_ctr_virt_mask =0 ;/* Reload all events */
@@ -1035,10 +1042,16 @@ void amd_pmu_enable_virt(void) }EXPORT_SYMBOL_GPL (amd_pmu_enable_virt); +/* +* Mask the Host-only bit when virtualization is disabled on the Host Hypervisor +*/ void amd_pmu_disable_virt (void ) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); +if (!hypervisor_is_type (X86_HYPER_NATIVE )) +return ; +/* * We only mask out the Host-only bit so that host-only counting works * when SVM is disabled. If someone sets up a guest-only counter when
Signature · 1 line
2.32.0