KVM: vmx/pmu: Add VMCS fields check before exposing LBR_FMT
PATCH 1/1 KVM: vmx/pmu: Add VMCS fields check before exposing LBR_FMT
Before KVM exposes guest LBR_FMT perf capabilities, it needs to check whether VMCS has GUEST_IA32_DEBUGCTL guest status field and vmx switch support on IA32_DEBUGCTL MSR (including VM_EXIT_SAVE_DEBUG_CONTROLS and VM_ENTRY_LOAD_DEBUG_CONTROLS). It helps nested LBR enablement.
--- arch/x86/kvm/vmx/capabilities.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/x86/kvm/vmx/capabilities.h +8 -1
@@ -378,6 +378,12 @@ static inline bool vmx_pt_mode_is_host_guest(void)return pt_mode ==PT_MODE_HOST_GUEST ; } +static inline bool cpu_has_vmx_lbr (void ) +{ +return (vmcs_config.vmexit_ctrl &VM_EXIT_SAVE_DEBUG_CONTROLS ) && + (vmcs_config.vmentry_ctrl &VM_ENTRY_LOAD_DEBUG_CONTROLS ); +} +static inline u64 vmx_get_perf_capabilities (void ) {u64 perf_cap =0 ;
@@ -385,7 +391,8 @@ static inline u64 vmx_get_perf_capabilities(void)if (boot_cpu_has (X86_FEATURE_PDCM ))rdmsrl (MSR_IA32_PERF_CAPABILITIES , perf_cap); - perf_cap &=PMU_CAP_LBR_FMT ; +if (cpu_has_vmx_lbr ()) + perf_cap &=PMU_CAP_LBR_FMT ;/* * Since counters are virtualized, KVM would support full
Signature · 1 line
2.29.2
Paolo Bonzini
maintainerQuoted 28 lines · Like Xu
Before KVM exposes guest
LBR_FMTperf capabilities, it needs to check whether VMCS hasGUEST_IA32_DEBUGCTLguest status field and vmx switch support onIA32_DEBUGCTLMSR (includingVM_EXIT_SAVE_DEBUG_CONTROLSandVM_ENTRY_LOAD_DEBUG_CONTROLS). It helps nested LBR enablement.Signed-off-by Like Xu <[email protected]>--- arch/x86/kvm/vmx/capabilities.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)arch/x86/kvm/vmx/capabilities.h +6
-0@@ -378,6 +378,12 @@ static inline bool vmx_pt_mode_is_host_guest(void)return pt_mode ==PT_MODE_HOST_GUEST ; } +static inline bool cpu_has_vmx_lbr (void ) +{ +return (vmcs_config.vmexit_ctrl &VM_EXIT_SAVE_DEBUG_CONTROLS ) && + (vmcs_config.vmentry_ctrl &VM_ENTRY_LOAD_DEBUG_CONTROLS ); +} +static inline u64 vmx_get_perf_capabilities (void ) {u64 perf_cap =0 ;
arch/x86/kvm/vmx/capabilities.h static inline u64 vmx_get_perf_capabilities(void) · line 395
Quoted 6 lines
arch/x86/kvm/vmx/capabilities.h +2
-1@@ -385,7 +391,8 @@ static inline u64 vmx_get_perf_capabilities(void)if (boot_cpu_has (X86_FEATURE_PDCM ))rdmsrl (MSR_IA32_PERF_CAPABILITIES , perf_cap); - perf_cap &=PMU_CAP_LBR_FMT ; +if (cpu_has_vmx_lbr ()) + perf_cap &=PMU_CAP_LBR_FMT ;
This is incorrect in the case where cpu_has_vmx_lbr() is false. You would need something like
u64 perf_cap = 0; u64 host_perf_cap = 0;
if (boot_cpu_has(X86_FEATURE_PDCM))
rdmsrl(MSR_IA32_PERF_CAPABILITIES, host_perf_cap); if (cpu_has_vmx_lbr()) perf_cap |= host_perf_cap & PMU_CAP_LBR_FMT;
However, KVM won't run without VM_ENTRY_LOAD_DEBUG_CONTROLS and VM_EXIT_SAVE_DEBUG_CONTROLS (see setup_vmcs_config), so this change is not needed either.
Paolo