KVM: nVMX: Adjust VMPTRLD/VMPTRST behavior with active eVMCS
Sean Christopherson
maintainerv3 cover KVM: nVMX: Adjust VMPTRLD/VMPTRST behavior with active eVMCS
Vitaly's series to adjust KVM's emulation of VMPTRLD/VMPTRST when the vCPU has an active eVMCS to match Hyper-V, and more importantly to not put the vCPU into an infinite loop.
The patches from Vitaly remain the same from v2. The churn I piled on top came from wanting to use KVM_ASM_SAFE() for more VMX instructions to verify the RFLAGS bug+fix Sashiko pointed out, and I lack impulse control when it comes to cleanups.
v3:
- See above.
v2:
- https://lore.kernel.org/all/[email protected]
- Fix build when !CONFIG_KVM_HYPERV [Sashiko]
- Drop now-unneeded evmcs_vmptrst() [Sashiko]
- Avoid hardcoding VMPTRLD insn length in hyperv_evmcs [Sashiko], use KVM_ASM_SAFE framework instead [Sean]
v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (9):
KVM: selftests: Don't clobber RFLAGS in happy path of __KVM_ASM_SAFE()
KVM: selftests: Assert success in vmptrst(), kill off vmptrstz()
KVM: selftests: Always assert that vmxon() and
prepare_for_vmx_operation() succeed
KVM: selftests: Always assert that vmclear() succeeds
KVM: selftests: Always assert that vmptrld() succeeds
KVM: selftests: Drop useless return code from load_vmcs()
KVM: selftests: Add macros to handle simple VMX instructions
KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
KVM: selftests: Add and use double-underscore versions of vmlaunch()
and vmresume()
Vitaly Kuznetsov (4):
KVM: nVMX: Make VMPTRLD result in #UD when eVMCS is used
KVM: nVMX: Make VMPTRST return eVMCS GPA when it is used
KVM: selftests: Adapt to the updated VMPTRST behavior when eVMCS is
used
KVM: selftests: Check VMPTRLD with active eVMCS
arch/x86/kvm/vmx/nested.c | 24 ++- .../testing/selftests/kvm/include/x86/evmcs.h | 8 - .../selftests/kvm/include/x86/processor.h | 2 +- tools/testing/selftests/kvm/include/x86/vmx.h | 173 +++++++----------- .../testing/selftests/kvm/lib/x86/memstress.c | 6 +- tools/testing/selftests/kvm/lib/x86/vmx.c | 20 +- .../selftests/kvm/x86/aperfmperf_test.c | 6 +- .../kvm/x86/evmcs_smm_controls_test.c | 4 +- .../testing/selftests/kvm/x86/hyperv_evmcs.c | 57 +++--- .../selftests/kvm/x86/kvm_buslock_test.c | 6 +- .../selftests/kvm/x86/nested_close_kvm_test.c | 6 +- .../selftests/kvm/x86/nested_dirty_log_test.c | 6 +- .../selftests/kvm/x86/nested_emulation_test.c | 6 +- .../kvm/x86/nested_exceptions_test.c | 6 +- .../kvm/x86/nested_invalid_cr3_test.c | 8 +- .../selftests/kvm/x86/nested_tdp_fault_test.c | 6 +- .../kvm/x86/nested_tsc_adjust_test.c | 6 +- .../kvm/x86/nested_tsc_scaling_test.c | 6 +- .../kvm/x86/save_restore_pf_stress_test.c | 8 +- tools/testing/selftests/kvm/x86/smm_test.c | 4 +- tools/testing/selftests/kvm/x86/state_test.c | 42 ++--- .../kvm/x86/triple_fault_event_test.c | 6 +- .../selftests/kvm/x86/vmx_apic_access_test.c | 8 +- .../kvm/x86/vmx_apicv_updates_test.c | 8 +- .../kvm/x86/vmx_invalid_nested_guest_state.c | 6 +- .../kvm/x86/vmx_nested_la57_state_test.c | 6 +- .../kvm/x86/vmx_preemption_timer_test.c | 10 +- 27 files changed, 214 insertions(+), 240 deletions(-)
base-commit: 76671054f9a1ff6abb976583cd8da37650acdc97
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 1/13 KVM: nVMX: Make VMPTRLD result in #UD when eVMCS is used
From: Vitaly Kuznetsov <[email protected]>
VMPTRLD with active eVMCS is already forbidden, however, returning 1 without skipping the instruction or queuing an exception will likely result in L1 getting stuck. Genuine Hyper-V seems to inject #UD under similar circumstances, mimic the behavior in KVM.
--- arch/x86/kvm/vmx/nested.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx/nested.c +6 -4
@@ -5897,6 +5897,12 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; +/* Forbid normal VMPTRLD if Enlightened version was used */ +if (nested_vmx_is_evmptr12_valid (vmx)) { +kvm_queue_exception (vcpu,UD_VECTOR ); +return 1 ; + } +if (nested_vmx_get_vmptr (vcpu, &vmptr, &r))return r;
@@ -5906,10 +5912,6 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)if (vmptr == vmx->nested.vmxon_ptr)return nested_vmx_fail (vcpu,VMXERR_VMPTRLD_VMXON_POINTER ); -/* Forbid normal VMPTRLD if Enlightened version was used */ -if (nested_vmx_is_evmptr12_valid (vmx)) -return 1 ; -if (vmx->nested.current_vmptr != vmptr) {struct gfn_to_hva_cache *ghc = &vmx->nested.vmcs12_cache;struct vmcs_hdr hdr;
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 2/13 KVM: nVMX: Make VMPTRST return eVMCS GPA when it is used
In reply to Sean ChristophersonFrom: Vitaly Kuznetsov <[email protected]>
VMPTRST with active eVMCS is currently forbidden, however, returning 1 without skipping the instruction will likely result in L1 getting stuck. While TLFS does not specify the expected behavior, genuine Hyper-V seems to be returning eVMCS GPA. Implement the same behavior in KVM.
--- arch/x86/kvm/vmx/nested.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/nested.c +11 -3
@@ -5964,7 +5964,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu) {unsigned long exit_qual =vmx_get_exit_qual (vcpu);u32 instr_info =vmcs_read32 (VMX_INSTRUCTION_INFO ); -gpa_t current_vmptr =to_vmx (vcpu)->nested.current_vmptr; +gpa_t current_vmptr;struct x86_exception e;gva_t gva;int r;
@@ -5972,8 +5972,16 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)if (!nested_vmx_check_permission (vcpu))return 1 ; -if (unlikely (nested_vmx_is_evmptr12_valid (to_vmx (vcpu)))) -return 1 ; +/* +* Hyper-V TLFS does not specify the behavior of VMPTRST when eVMCS is used +* but genuine Hyper-V seems to be returning eVMCS GPA. +*/ +#ifdef CONFIG_KVM_HYPERV +if (nested_vmx_is_evmptr12_valid (to_vmx (vcpu))) + current_vmptr =to_vmx (vcpu)->nested.hv_evmcs_vmptr; + else +#endif + current_vmptr =to_vmx (vcpu)->nested.current_vmptr;if (get_vmx_mem_address (vcpu, exit_qual, instr_info, true,sizeof (gpa_t), &gva))
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 3/13 KVM: selftests: Don't clobber RFLAGS in happy path of __KVM_ASM_SAFE()
In reply to Sean ChristophersonUse a straight MOV instead of an XOR to zero R9 in the non-faulting path of __KVM_ASM_SAFE() so as not to clobber RFLAGS. XOR generates smaller code, but optimizing performance by minimizing the code footprint is just about the last thing that KVM selftests care about.
The bug is relatively benign in the current code base, e.g. it marginally degrades the coverage in the fastops test, but otherwise does no harm. But the bug will become actively problematic if/when the "safe assembly" macros are used for instructions that communicate results via RFLAGS, e.g. for VMX instructions, which signal failure via RFLAGS.CF and RFLAGS.ZF.
Opportunistically use R9D instead of the full R9, as bits 63:32 of GPRs are zeroed on writes to bit 31:0.
--- tools/testing/selftests/kvm/include/x86/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/include/x86/processor.h +1 -1
@@ -1318,7 +1318,7 @@ gva_t vm_alloc_stack(struct kvm_vm *vm, int nr_pages);"lea 1f(%%rip), %%r10\n\t" \"lea 2f(%%rip), %%r11\n\t" \ fep"1: " insn"\n\t" \ -"xor %%r9, %%r9\n\t" \ +"mov $0, %%r9d\n\t" \"2:\n\t" \"mov %%r9b, %[vector]\n\t" \"mov %%r10, %[error_code]\n\t"
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 4/13 KVM: selftests: Adapt to the updated VMPTRST behavior when eVMCS is used
In reply to Sean ChristophersonFrom: Vitaly Kuznetsov <[email protected]>
Previously, VMPTRST was forbidden with eVMCS and selftests were mocking the correct behavior in vmptrst() by returning enlightened vmptr directly. Since KVM's behavior has changed to match genuine Hyper-V, adjust evmcs test accordingly.
--- tools/testing/selftests/kvm/include/x86/evmcs.h | 8 -------- tools/testing/selftests/kvm/include/x86/vmx.h | 3 --- tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 5 ++--- 3 files changed, 2 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/include/x86/evmcs.h +0 -8
@@ -265,14 +265,6 @@ static inline bool load_evmcs(struct hyperv_test_pages *hv)return true; } -static inline int evmcs_vmptrst (u64 *value) -{ - *value = current_vp_assist->current_nested_vmcs & - ~HV_X64_MSR_VP_ASSIST_PAGE_ENABLE ; - -return 0 ; -} -static inline int evmcs_vmread (u64 encoding,u64 *value) {switch (encoding) {
tools/testing/selftests/kvm/include/x86/vmx.h +0 -3
@@ -358,9 +358,6 @@ static inline int vmptrst(u64 *value)u64 tmp;u8 ret; -if (enable_evmcs) -return evmcs_vmptrst (value); - __asm__ __volatile__("vmptrst %[value]; setna %[ret]" : [value]"=m" (tmp), [ret]"=rm" (ret) : :"cc" ,"memory" );
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +2 -3
@@ -92,15 +92,14 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_SYNC (3 );GUEST_ASSERT (load_evmcs (hv_pages)); -GUEST_ASSERT (vmptrstz () == hv_pages->enlightened_vmcs_gpa); +/* VMPTRST returns -1 until VMLAUNCH with eVMCS ptr set */ +GUEST_ASSERT (vmptrstz () ==-1 );GUEST_SYNC (4 ); -GUEST_ASSERT (vmptrstz () == hv_pages->enlightened_vmcs_gpa);prepare_vmcs (vmx_pages, l2_guest_code);GUEST_SYNC (5 ); -GUEST_ASSERT (vmptrstz () == hv_pages->enlightened_vmcs_gpa); current_evmcs->revision_id =-1u ;GUEST_ASSERT (vmlaunch ()); current_evmcs->revision_id =EVMCS_VERSION ;
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 5/13 KVM: selftests: Check VMPTRLD with active eVMCS
In reply to Sean ChristophersonFrom: Vitaly Kuznetsov <[email protected]>
Check that VMPTRLD when eVMCS is active results in #UD. This matches genuine Hyper-V's behavior.
Use KVM_ASM_SAFE framework to handle #UD from VMPTRLD. Unfortunately, the same trick cannot be applied to the existing #UD check on VMLAUNCH as VMLAUNCH clobbers all registers which KVM_ASM_SAFE depends on. Keep VMLAUNCH handling separately. Deliberately use a double-underscores prefix instead of a "safe" postfix for the helper, to communicate that the inner/outer helpers handle more than just exceptions, they also handle VM-Fail conditions.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 19 +++++++++++--- .../testing/selftests/kvm/x86/hyperv_evmcs.c | 26 +++++++++++++++---- 2 files changed, 37 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +16 -3
@@ -342,9 +342,6 @@ static inline int vmptrld(u64 vmcs_pa) {u8 ret; -if (enable_evmcs) -return -1 ; - __asm__ __volatile__ ("vmptrld %[pa]; setna %[ret]" : [ret]"=rm" (ret) : [pa]"m"(vmcs_pa)
@@ -353,6 +350,22 @@ static inline int vmptrld(u64 vmcs_pa)return ret; } +static inline int __vmptrld (u64 vmcs_pa) +{ +u64 error_code; +u8 vector; +u8 failed; + + asm volatile(KVM_ASM_SAFE("vmptrld %[pa]") + "\n\tsetna %[failed]" + : KVM_ASM_SAFE_OUTPUTS(vector, error_code), + [failed]"=qm"(failed) + : [pa]"m"(vmcs_pa) + : "cc", "memory", KVM_ASM_SAFE_CLOBBERS); + +return vector ? vector : failed ? -EINVAL :0 ; +} +static inline int vmptrst (u64 *value) {u64 tmp;
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +21 -5
@@ -23,7 +23,11 @@ static int ud_count;static void guest_ud_handler (struct ex_regs *regs) { ud_count++; - regs->rip +=3 ;/* VMLAUNCH */ +/* +* VMLAUNCH insn can't be easily covered by KVM_ASM_SAFE framework but +* luckily the instruction is always three bytes. +*/ + regs->rip +=3 ; }static void guest_nmi_handler (struct ex_regs *regs)
@@ -178,7 +182,15 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_SYNC (11 ); -/* Try enlightened vmptrld with an incorrect GPA */ +/* VMPTRLD instruction causes #UD after enlightened VMLAUNCH */ +GUEST_ASSERT (__vmptrld (hv_pages->enlightened_vmcs_gpa) ==UD_VECTOR ); + +/* +* Try enlightened vmptrld with an incorrect GPA. GUEST_SYNC(12) signals +* the host to enable guest_ud_handler() which cannot be enabled beforehand +* to not override the default fixup handler from KVM_ASM_SAFE(). +*/ +GUEST_SYNC (12 );evmcs_vmptrld (0xdeadbeef , hv_pages->enlightened_vmcs);GUEST_ASSERT (vmlaunch ());GUEST_ASSERT (ud_count ==1 );
@@ -252,7 +264,6 @@ int main(int argc, char *argv[])vcpu_args_set (vcpu,3 , vmx_pages_gva, hv_pages_gva,addr_gva2gpa (vm, hcall_page));vcpu_set_msr (vcpu,HV_X64_MSR_VP_INDEX , vcpu->id); -vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler);vm_install_exception_handler (vm,NMI_VECTOR , guest_nmi_handler);pr_info ("Running L1 which uses EVMCS to run L2\n" );
@@ -282,7 +293,7 @@ int main(int argc, char *argv[])/* Force immediate L2->L1 exit before resuming */ if (stage ==8 ) { -pr_info ("Injecting NMI into L1 before L2 had a chance to run after restore\n" ); +pr_debug ("Injecting NMI into L1 before L2 had a chance to run after restore\n" );inject_nmi (vcpu); }
@@ -292,9 +303,14 @@ int main(int argc, char *argv[])* KVM_STATE_NESTED_EVMCS is not lost. */ if (stage ==9 ) { -pr_info ("Trying extra KVM_GET_NESTED_STATE/KVM_SET_NESTED_STATE cycle\n" ); +pr_debug ("Trying extra KVM_GET_NESTED_STATE/KVM_SET_NESTED_STATE cycle\n" ); vcpu =save_restore_vm (vm, vcpu); } + +if (stage ==12 ) { +pr_debug ("Trying enlightened VMLAUNCH with an invalid PTR\n" ); +vm_install_exception_handler (vm,UD_VECTOR , guest_ud_handler); + } } done:
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 6/13 KVM: selftests: Assert success in vmptrst(), kill off vmptrstz()
In reply to Sean ChristophersonAssert success in vmptrst() instead of punting to the caller, as literally every user expects VMPTRST to succeed (and because '0' is a valid physical address).
--- tools/testing/selftests/kvm/include/x86/vmx.h | 19 ++++--------------- .../testing/selftests/kvm/x86/hyperv_evmcs.c | 4 ++-- tools/testing/selftests/kvm/x86/state_test.c | 8 ++++---- .../kvm/x86/vmx_preemption_timer_test.c | 2 +- 4 files changed, 11 insertions(+), 22 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +4 -15
@@ -366,27 +366,16 @@ static inline int __vmptrld(u64 vmcs_pa)return vector ? vector : failed ? -EINVAL :0 ; } -static inline int vmptrst (u64 *value) +static inline u64 vmptrst (void ) { -u64 tmp; +u64 value =0 ;u8 ret; __asm__ __volatile__("vmptrst %[value]; setna %[ret]" - : [value]"=m" (tmp), [ret]"=rm" (ret) + : [value]"=m" (value), [ret]"=rm" (ret) : :"cc" ,"memory" ); - *value = tmp; -return ret; -} - -/* -* A wrapper around vmptrst that ignores errors and returns zero if the -* vmptrst instruction fails. -*/ -static inline u64 vmptrstz (void ) -{ -u64 value =0 ; -vmptrst (&value); +__GUEST_ASSERT (!ret,"vmptrst failed" );return value; }
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +2 -2
@@ -97,7 +97,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,GUEST_SYNC (3 );GUEST_ASSERT (load_evmcs (hv_pages));/* VMPTRST returns -1 until VMLAUNCH with eVMCS ptr set */ -GUEST_ASSERT (vmptrstz () ==-1 ); +GUEST_ASSERT (vmptrst () ==-1 );GUEST_SYNC (4 );
@@ -123,7 +123,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,GUEST_ASSERT (!vmlaunch ());GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_EXCEPTION_NMI );GUEST_ASSERT_EQ ((vmreadz (VM_EXIT_INTR_INFO ) &0xff ),NMI_VECTOR ); -GUEST_ASSERT (vmptrstz () == hv_pages->enlightened_vmcs_gpa); +GUEST_ASSERT (vmptrst () == hv_pages->enlightened_vmcs_gpa);/* * NMI forces L2->L1 exit, resuming L2 and hope that EVMCS is
tools/testing/selftests/kvm/x86/state_test.c +4 -4
@@ -78,17 +78,17 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_SYNC (3 );GUEST_ASSERT (load_vmcs (vmx_pages)); -GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa); +GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);GUEST_SYNC (4 ); -GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa); +GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);prepare_vmcs (vmx_pages, vmx_l2_guest_code);GUEST_SYNC (5 ); -GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa); +GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);GUEST_ASSERT (!vmlaunch ()); -GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa); +GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );/* Check that the launched state is preserved. */
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c +1 -1
@@ -73,7 +73,7 @@ void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (vmx_pages->vmcs_gpa);GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages));GUEST_ASSERT (load_vmcs (vmx_pages)); -GUEST_ASSERT (vmptrstz () == vmx_pages->vmcs_gpa); +GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);prepare_vmcs (vmx_pages, l2_guest_code);
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 7/13 KVM: selftests: Always assert that vmxon() and prepare_for_vmx_operation() succeed
In reply to Sean ChristophersonAssert that vmxon() succeeds, and by extension prepare_for_vmx_operation(). Forcing every caller to assert that a core preparation helper succeeds is absurd and generates hard-to-read code.
For all intents and purposes, no functional change intended.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 6 +++--- tools/testing/selftests/kvm/lib/x86/memstress.c | 2 +- tools/testing/selftests/kvm/lib/x86/vmx.c | 7 ++----- tools/testing/selftests/kvm/x86/aperfmperf_test.c | 2 +- tools/testing/selftests/kvm/x86/evmcs_smm_controls_test.c | 2 +- tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 2 +- tools/testing/selftests/kvm/x86/kvm_buslock_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_close_kvm_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_dirty_log_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_emulation_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_exceptions_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_tdp_fault_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c | 2 +- .../selftests/kvm/x86/save_restore_pf_stress_test.c | 2 +- tools/testing/selftests/kvm/x86/smm_test.c | 2 +- tools/testing/selftests/kvm/x86/state_test.c | 2 +- tools/testing/selftests/kvm/x86/triple_fault_event_test.c | 2 +- tools/testing/selftests/kvm/x86/vmx_apic_access_test.c | 2 +- tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c | 2 +- .../selftests/kvm/x86/vmx_invalid_nested_guest_state.c | 2 +- .../testing/selftests/kvm/x86/vmx_nested_la57_state_test.c | 2 +- .../testing/selftests/kvm/x86/vmx_preemption_timer_test.c | 2 +- 24 files changed, 27 insertions(+), 30 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +3 -3
@@ -309,7 +309,7 @@ struct vmx_msr_entry {#include "evmcs.h" -static inline int vmxon (u64 phys) +static inline void vmxon (u64 phys) {u8 ret;
@@ -318,7 +318,7 @@ static inline int vmxon(u64 phys) : [pa]"m"(phys) : "cc", "memory"); - return ret; + __GUEST_ASSERT(!ret,"vmxon [0x%lx] failed" , phys); }static inline void vmxoff (void )
@@ -549,7 +549,7 @@ union vmx_ctrl_msr { };struct vmx_pages *vcpu_alloc_vmx (struct kvm_vm *vm,gva_t *p_vmx_gva); -bool prepare_for_vmx_operation (struct vmx_pages *vmx); +void prepare_for_vmx_operation (struct vmx_pages *vmx);void prepare_vmcs (struct vmx_pages *vmx,void *guest_rip);bool load_vmcs (struct vmx_pages *vmx);
tools/testing/selftests/kvm/lib/x86/memstress.c +1 -1
@@ -33,7 +33,7 @@ __asm__(static void l1_vmx_code (struct vmx_pages *vmx,u64 vcpu_id) {GUEST_ASSERT (vmx->vmcs_gpa); -GUEST_ASSERT (prepare_for_vmx_operation (vmx)); +prepare_for_vmx_operation (vmx);GUEST_ASSERT (load_vmcs (vmx));GUEST_ASSERT (ept_1g_pages_supported ());
tools/testing/selftests/kvm/lib/x86/vmx.c +2 -5
@@ -125,7 +125,7 @@ vcpu_alloc_vmx(struct kvm_vm *vm, gva_t *p_vmx_gva)return vmx; } -bool prepare_for_vmx_operation (struct vmx_pages *vmx) +void prepare_for_vmx_operation (struct vmx_pages *vmx) {u64 feature_control;u64 required;
@@ -163,10 +163,7 @@ bool prepare_for_vmx_operation(struct vmx_pages *vmx)/* Enter VMX root operation. */ *(u32 *)(vmx->vmxon) =vmcs_revision (); -if (vmxon (vmx->vmxon_gpa)) -return false; - -return true; +vmxon (vmx->vmxon_gpa); }bool load_vmcs (struct vmx_pages *vmx)
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1 -1
@@ -70,7 +70,7 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx) { -GUEST_ASSERT_EQ (prepare_for_vmx_operation (vmx), true); +prepare_for_vmx_operation (vmx);GUEST_ASSERT_EQ (load_vmcs (vmx), true);prepare_vmcs (vmx,NULL );
tools/testing/selftests/kvm/x86/evmcs_smm_controls_test.c +1 -1
@@ -55,7 +55,7 @@ static void guest_code(struct vmx_pages *vmx_pages,enable_vp_assist (hv_pages->vp_assist_gpa, hv_pages->vp_assist);evmcs_enable (); -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_evmcs (hv_pages));prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +1 -1
@@ -93,7 +93,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,enable_vp_assist (hv_pages->vp_assist_gpa, hv_pages->vp_assist);evmcs_enable (); -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_SYNC (3 );GUEST_ASSERT (load_evmcs (hv_pages));/* VMPTRST returns -1 until VMLAUNCH with eVMCS ptr set */
tools/testing/selftests/kvm/x86/kvm_buslock_test.c +1 -1
@@ -42,7 +42,7 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx) { -GUEST_ASSERT_EQ (prepare_for_vmx_operation (vmx), true); +prepare_for_vmx_operation (vmx);GUEST_ASSERT_EQ (load_vmcs (vmx), true);prepare_vmcs (vmx,NULL );
tools/testing/selftests/kvm/x86/nested_close_kvm_test.c +1 -1
@@ -30,7 +30,7 @@ static void l2_guest_code(void)static void l1_vmx_code (struct vmx_pages *vmx_pages) { -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */
tools/testing/selftests/kvm/x86/nested_dirty_log_test.c +1 -1
@@ -93,7 +93,7 @@ void l1_vmx_code(struct vmx_pages *vmx)void *l2_rip;GUEST_ASSERT (vmx->vmcs_gpa); -GUEST_ASSERT (prepare_for_vmx_operation (vmx)); +prepare_for_vmx_operation (vmx);GUEST_ASSERT (load_vmcs (vmx));if (vmx->eptp_gpa)
tools/testing/selftests/kvm/x86/nested_emulation_test.c +1 -1
@@ -66,7 +66,7 @@ static void guest_code(void *test_data)BIT_ULL (INTERCEPT_HLT ); vmcb->control.intercept_exceptions =0 ; }else { -GUEST_ASSERT (prepare_for_vmx_operation (test_data)); +prepare_for_vmx_operation (test_data);GUEST_ASSERT (load_vmcs (test_data));prepare_vmcs (test_data,NULL );
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +1 -1
@@ -125,7 +125,7 @@ static void vmx_run_l2(void *l2_code, int vector, u32 error_code)static void l1_vmx_code (struct vmx_pages *vmx) { -GUEST_ASSERT_EQ (prepare_for_vmx_operation (vmx), true); +prepare_for_vmx_operation (vmx);GUEST_ASSERT_EQ (load_vmcs (vmx), true);
tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c +1 -1
@@ -40,7 +40,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages) {uintptr_t save_cr3; -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/nested_tdp_fault_test.c +1 -1
@@ -55,7 +55,7 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 expected_fault_gpa,u64 exit_qual;GUEST_ASSERT (vmx->vmcs_gpa); -GUEST_ASSERT (prepare_for_vmx_operation (vmx)); +prepare_for_vmx_operation (vmx);GUEST_ASSERT (load_vmcs (vmx));prepare_vmcs (vmx, l2_entry);
tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c +1 -1
@@ -86,7 +86,7 @@ static void l1_guest_code(void *data)struct vmx_pages *vmx_pages = data;u32 control; -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c +1 -1
@@ -105,7 +105,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)/* check that L1's frequency looks alright before launching L2 */ check_tsc_freq (UCHECK_L1 ); -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));/* prepare the VMCS for L2 execution */
tools/testing/selftests/kvm/x86/save_restore_pf_stress_test.c +1 -1
@@ -98,7 +98,7 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx) { -GUEST_ASSERT (prepare_for_vmx_operation (vmx)); +prepare_for_vmx_operation (vmx);GUEST_ASSERT (load_vmcs (vmx));prepare_vmcs (vmx, guest_access_memory);
tools/testing/selftests/kvm/x86/smm_test.c +1 -1
@@ -78,7 +78,7 @@ static void guest_code(void *arg)if (this_cpu_has (X86_FEATURE_SVM )) {generic_svm_setup (svm, l2_guest_code); }else { -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));prepare_vmcs (vmx_pages, l2_guest_code); }
tools/testing/selftests/kvm/x86/state_test.c +1 -1
@@ -75,7 +75,7 @@ void vmx_l2_guest_code(void)static void vmx_l1_guest_code (struct vmx_pages *vmx_pages) {GUEST_ASSERT (vmx_pages->vmcs_gpa); -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_SYNC (3 );GUEST_ASSERT (load_vmcs (vmx_pages));GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);
tools/testing/selftests/kvm/x86/triple_fault_event_test.c +1 -1
@@ -25,7 +25,7 @@ void l1_guest_code_vmx(struct vmx_pages *vmx) {GUEST_ASSERT (vmx->vmcs_gpa); -GUEST_ASSERT (prepare_for_vmx_operation (vmx)); +prepare_for_vmx_operation (vmx);GUEST_ASSERT (load_vmcs (vmx));prepare_vmcs (vmx, l2_guest_code);
tools/testing/selftests/kvm/x86/vmx_apic_access_test.c +1 -1
@@ -38,7 +38,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages, unsigned long high_gpa) {u32 control; -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */
tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c +1 -1
@@ -33,7 +33,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages) {u32 control; -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */
tools/testing/selftests/kvm/x86/vmx_invalid_nested_guest_state.c +1 -1
@@ -41,7 +41,7 @@ static void l2_guest_code(void)static void l1_guest_code (struct vmx_pages *vmx_pages) { -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));/* Prepare the VMCS for L2 execution. */
tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c +1 -1
@@ -37,7 +37,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (rdmsr (MSR_GS_BASE ) ==LA57_GS_BASE );GUEST_ASSERT (vmx_pages->vmcs_gpa); -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c +1 -1
@@ -71,7 +71,7 @@ void l1_guest_code(struct vmx_pages *vmx_pages)u64 l1_tsc_deadline, l2_tsc_deadline;GUEST_ASSERT (vmx_pages->vmcs_gpa); -GUEST_ASSERT (prepare_for_vmx_operation (vmx_pages)); +prepare_for_vmx_operation (vmx_pages);GUEST_ASSERT (load_vmcs (vmx_pages));GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 8/13 KVM: selftests: Always assert that vmclear() succeeds
In reply to Sean ChristophersonContinue removing dead error "handling", and assert that VMCLEAR succeeds instead of forcing callers of load_vmcs() to assert success.
For all intents and purposes, no functional change intended.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 4 ++-- tools/testing/selftests/kvm/lib/x86/vmx.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +2 -2
@@ -326,7 +326,7 @@ static inline void vmxoff(void) __asm__ __volatile__("vmxoff" ); } -static inline int vmclear (u64 vmcs_pa) +static inline void vmclear (u64 vmcs_pa) {u8 ret;
@@ -335,7 +335,7 @@ static inline int vmclear(u64 vmcs_pa) : [pa]"m"(vmcs_pa) : "cc", "memory"); - return ret; + __GUEST_ASSERT(!ret,"vmclear [0x%lx] failed\n" , vmcs_pa); }static inline int vmptrld (u64 vmcs_pa)
tools/testing/selftests/kvm/lib/x86/vmx.c +2 -4
@@ -170,16 +170,14 @@ bool load_vmcs(struct vmx_pages *vmx) {/* Load a VMCS. */ *(u32 *)(vmx->vmcs) =vmcs_revision (); -if (vmclear (vmx->vmcs_gpa)) -return false; +vmclear (vmx->vmcs_gpa);if (vmptrld (vmx->vmcs_gpa))return false;/* Setup shadow VMCS, do not load it yet. */ *(u32 *)(vmx->shadow_vmcs) =vmcs_revision () |0x80000000ul ; -if (vmclear (vmx->shadow_vmcs_gpa)) -return false; +vmclear (vmx->shadow_vmcs_gpa);return true; }
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 9/13 KVM: selftests: Always assert that vmptrld() succeeds
In reply to Sean ChristophersonAssert that vmptrld() succeeds instead of forcing all callers to do the same, and opportunistically provide a macro to print (hopefully) useful information on VMX instruction failures.
Leave load_vmcs() as-is for the moment to minimize the amount of churn since the vmptrld() changes aren't completely trivial.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 23 +++++++++---------- tools/testing/selftests/kvm/lib/x86/vmx.c | 3 +-- tools/testing/selftests/kvm/x86/state_test.c | 6 ++--- 3 files changed, 15 insertions(+), 17 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +11 -12
@@ -309,6 +309,10 @@ struct vmx_msr_entry {#include "evmcs.h" +#define GUEST_ASSERT_VMX_INSN_SUCCEEDED (insn, __r, __pa) \ + __GUEST_ASSERT(!__r, __stringify(insn) "[0x%lx] hit %s", \ + __pa, __r < 0 ? "VM-Fail" : ex_str(__r)) +static inline void vmxon (u64 phys) {u8 ret;
@@ -338,18 +342,6 @@ static inline void vmclear(u64 vmcs_pa)__GUEST_ASSERT (!ret,"vmclear [0x%lx] failed\n" , vmcs_pa); } -static inline int vmptrld (u64 vmcs_pa) -{ -u8 ret; - - __asm__ __volatile__ ("vmptrld %[pa]; setna %[ret]" - : [ret]"=rm" (ret) - : [pa]"m" (vmcs_pa) - :"cc" ,"memory" ); - -return ret; -} -static inline int __vmptrld (u64 vmcs_pa) {u64 error_code;
@@ -366,6 +358,13 @@ static inline int __vmptrld(u64 vmcs_pa)return vector ? vector : failed ? -EINVAL :0 ; } +static inline void vmptrld (u64 vmcs_pa) +{ +int ret =__vmptrld (vmcs_pa); + +GUEST_ASSERT_VMX_INSN_SUCCEEDED (vmptrld, ret, vmcs_pa); +} +static inline u64 vmptrst (void ) {u64 value =0 ;
tools/testing/selftests/kvm/lib/x86/vmx.c +1 -2
@@ -172,8 +172,7 @@ bool load_vmcs(struct vmx_pages *vmx) *(u32 *)(vmx->vmcs) =vmcs_revision ();vmclear (vmx->vmcs_gpa); -if (vmptrld (vmx->vmcs_gpa)) -return false; +vmptrld (vmx->vmcs_gpa);/* Setup shadow VMCS, do not load it yet. */ *(u32 *)(vmx->shadow_vmcs) =vmcs_revision () |0x80000000ul ;
tools/testing/selftests/kvm/x86/state_test.c +3 -3
@@ -108,7 +108,7 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)vmwrite (SECONDARY_VM_EXEC_CONTROL ,SECONDARY_EXEC_SHADOW_VMCS );vmwrite (VMCS_LINK_POINTER , vmx_pages->shadow_vmcs_gpa); -GUEST_ASSERT (!vmptrld (vmx_pages->shadow_vmcs_gpa)); +vmptrld (vmx_pages->shadow_vmcs_gpa);GUEST_ASSERT (vmlaunch ());GUEST_SYNC (8 );GUEST_ASSERT (vmlaunch ());
@@ -118,11 +118,11 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)GUEST_SYNC (9 );GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffee ); -GUEST_ASSERT (!vmptrld (vmx_pages->vmcs_gpa)); +vmptrld (vmx_pages->vmcs_gpa);GUEST_ASSERT (!vmresume ());GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); -GUEST_ASSERT (!vmptrld (vmx_pages->shadow_vmcs_gpa)); +vmptrld (vmx_pages->shadow_vmcs_gpa);GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffffee );GUEST_ASSERT (vmlaunch ());GUEST_ASSERT (vmresume ());
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 10/13 KVM: selftests: Drop useless return code from load_vmcs()
In reply to Sean ChristophersonNow that load_vmcs() either asserts or returns success, drop the return code and the many asserts in its callers.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 2 +- tools/testing/selftests/kvm/lib/x86/memstress.c | 2 +- tools/testing/selftests/kvm/lib/x86/vmx.c | 4 +--- tools/testing/selftests/kvm/x86/aperfmperf_test.c | 2 +- tools/testing/selftests/kvm/x86/kvm_buslock_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_close_kvm_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_dirty_log_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_emulation_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_exceptions_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_tdp_fault_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c | 2 +- tools/testing/selftests/kvm/x86/save_restore_pf_stress_test.c | 2 +- tools/testing/selftests/kvm/x86/smm_test.c | 2 +- tools/testing/selftests/kvm/x86/state_test.c | 2 +- tools/testing/selftests/kvm/x86/triple_fault_event_test.c | 2 +- tools/testing/selftests/kvm/x86/vmx_apic_access_test.c | 2 +- tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c | 2 +- .../selftests/kvm/x86/vmx_invalid_nested_guest_state.c | 2 +- tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c | 2 +- tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c | 2 +- 22 files changed, 22 insertions(+), 24 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +1 -1
@@ -550,7 +550,7 @@ union vmx_ctrl_msr {struct vmx_pages *vcpu_alloc_vmx (struct kvm_vm *vm,gva_t *p_vmx_gva);void prepare_for_vmx_operation (struct vmx_pages *vmx);void prepare_vmcs (struct vmx_pages *vmx,void *guest_rip); -bool load_vmcs (struct vmx_pages *vmx); +void load_vmcs (struct vmx_pages *vmx);bool ept_1g_pages_supported (void );
tools/testing/selftests/kvm/lib/x86/memstress.c +1 -1
@@ -34,7 +34,7 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 vcpu_id) {GUEST_ASSERT (vmx->vmcs_gpa);prepare_for_vmx_operation (vmx); -GUEST_ASSERT (load_vmcs (vmx)); +load_vmcs (vmx);GUEST_ASSERT (ept_1g_pages_supported ()); *(u64 *)vmx->stack = vcpu_id;
tools/testing/selftests/kvm/lib/x86/vmx.c +1 -3
@@ -166,7 +166,7 @@ void prepare_for_vmx_operation(struct vmx_pages *vmx)vmxon (vmx->vmxon_gpa); } -bool load_vmcs (struct vmx_pages *vmx) +void load_vmcs (struct vmx_pages *vmx) {/* Load a VMCS. */ *(u32 *)(vmx->vmcs) =vmcs_revision ();
@@ -177,8 +177,6 @@ bool load_vmcs(struct vmx_pages *vmx)/* Setup shadow VMCS, do not load it yet. */ *(u32 *)(vmx->shadow_vmcs) =vmcs_revision () |0x80000000ul ;vmclear (vmx->shadow_vmcs_gpa); - -return true; }static bool ept_vpid_cap_supported (u64 mask)
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1 -1
@@ -71,7 +71,7 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx) {prepare_for_vmx_operation (vmx); -GUEST_ASSERT_EQ (load_vmcs (vmx), true); +load_vmcs (vmx);prepare_vmcs (vmx,NULL );
tools/testing/selftests/kvm/x86/kvm_buslock_test.c +1 -1
@@ -43,7 +43,7 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx) {prepare_for_vmx_operation (vmx); -GUEST_ASSERT_EQ (load_vmcs (vmx), true); +load_vmcs (vmx);prepare_vmcs (vmx,NULL );
tools/testing/selftests/kvm/x86/nested_close_kvm_test.c +1 -1
@@ -31,7 +31,7 @@ static void l2_guest_code(void)static void l1_vmx_code (struct vmx_pages *vmx_pages) {prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);/* Prepare the VMCS for L2 execution. */ prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/nested_dirty_log_test.c +1 -1
@@ -94,7 +94,7 @@ void l1_vmx_code(struct vmx_pages *vmx)GUEST_ASSERT (vmx->vmcs_gpa);prepare_for_vmx_operation (vmx); -GUEST_ASSERT (load_vmcs (vmx)); +load_vmcs (vmx);if (vmx->eptp_gpa) l2_rip = l2_guest_code_tdp_enabled;
tools/testing/selftests/kvm/x86/nested_emulation_test.c +1 -1
@@ -67,7 +67,7 @@ static void guest_code(void *test_data) vmcb->control.intercept_exceptions =0 ; }else {prepare_for_vmx_operation (test_data); -GUEST_ASSERT (load_vmcs (test_data)); +load_vmcs (test_data);prepare_vmcs (test_data,NULL );GUEST_ASSERT (!vmwrite (GUEST_IDTR_LIMIT ,0 ));
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +1 -1
@@ -127,7 +127,7 @@ static void l1_vmx_code(struct vmx_pages *vmx) {prepare_for_vmx_operation (vmx); -GUEST_ASSERT_EQ (load_vmcs (vmx), true); +load_vmcs (vmx);prepare_vmcs (vmx,NULL );GUEST_ASSERT_EQ (vmwrite (GUEST_IDTR_LIMIT ,0 ),0 );
tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c +1 -1
@@ -41,7 +41,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)uintptr_t save_cr3;prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/nested_tdp_fault_test.c +1 -1
@@ -56,7 +56,7 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 expected_fault_gpa,GUEST_ASSERT (vmx->vmcs_gpa);prepare_for_vmx_operation (vmx); -GUEST_ASSERT (load_vmcs (vmx)); +load_vmcs (vmx);prepare_vmcs (vmx, l2_entry);
tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c +1 -1
@@ -87,7 +87,7 @@ static void l1_guest_code(void *data)u32 control;prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);prepare_vmcs (vmx_pages, l2_guest_code); control =vmreadz (CPU_BASED_VM_EXEC_CONTROL );
tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c +1 -1
@@ -106,7 +106,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)check_tsc_freq (UCHECK_L1 );prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);/* prepare the VMCS for L2 execution */ prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/save_restore_pf_stress_test.c +1 -1
@@ -99,7 +99,7 @@ static void l1_svm_code(struct svm_test_data *svm)static void l1_vmx_code (struct vmx_pages *vmx) {prepare_for_vmx_operation (vmx); -GUEST_ASSERT (load_vmcs (vmx)); +load_vmcs (vmx);prepare_vmcs (vmx, guest_access_memory);GUEST_ASSERT (!vmwrite (EXCEPTION_BITMAP ,BIT (UD_VECTOR )));
tools/testing/selftests/kvm/x86/smm_test.c +1 -1
@@ -79,7 +79,7 @@ static void guest_code(void *arg)generic_svm_setup (svm, l2_guest_code); }else {prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);prepare_vmcs (vmx_pages, l2_guest_code); }
tools/testing/selftests/kvm/x86/state_test.c +1 -1
@@ -77,7 +77,7 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (vmx_pages->vmcs_gpa);prepare_for_vmx_operation (vmx_pages);GUEST_SYNC (3 ); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);GUEST_SYNC (4 );
tools/testing/selftests/kvm/x86/triple_fault_event_test.c +1 -1
@@ -26,7 +26,7 @@ void l1_guest_code_vmx(struct vmx_pages *vmx)GUEST_ASSERT (vmx->vmcs_gpa);prepare_for_vmx_operation (vmx); -GUEST_ASSERT (load_vmcs (vmx)); +load_vmcs (vmx);prepare_vmcs (vmx, l2_guest_code);
tools/testing/selftests/kvm/x86/vmx_apic_access_test.c +1 -1
@@ -39,7 +39,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages, unsigned long high_gpa)u32 control;prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);/* Prepare the VMCS for L2 execution. */ prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c +1 -1
@@ -34,7 +34,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)u32 control;prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);/* Prepare the VMCS for L2 execution. */ prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/vmx_invalid_nested_guest_state.c +1 -1
@@ -42,7 +42,7 @@ static void l2_guest_code(void)static void l1_guest_code (struct vmx_pages *vmx_pages) {prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);/* Prepare the VMCS for L2 execution. */ prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c +1 -1
@@ -38,7 +38,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (vmx_pages->vmcs_gpa);prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);prepare_vmcs (vmx_pages, l2_guest_code);
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c +1 -1
@@ -72,7 +72,7 @@ void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (vmx_pages->vmcs_gpa);prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_vmcs (vmx_pages)); +load_vmcs (vmx_pages);GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);prepare_vmcs (vmx_pages, l2_guest_code);
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 11/13 KVM: selftests: Add macros to handle simple VMX instructions
In reply to Sean ChristophersonAdd macros to build helpers for VMXON, VMPTRLD, and VMCLEAR, i.e. the VMX instructions that take a VMCS address as input, and don't have outputs. Getting the params right is annoying, especially when using KVM_ASM_SAFE().
As a bonus, this adds non-asserting double-underscores versions of VMXON and VMCLEAR for "free".
--- tools/testing/selftests/kvm/include/x86/vmx.h | 71 +++++++------------ 1 file changed, 26 insertions(+), 45 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +26 -45
@@ -313,58 +313,39 @@ struct vmx_msr_entry { __GUEST_ASSERT(!__r, __stringify(insn) "[0x%lx] hit %s", \ __pa, __r < 0 ? "VM-Fail" : ex_str(__r)) -static inline void vmxon (u64 phys) -{ -u8 ret; - - __asm__ __volatile__ ("vmxon %[pa]; setna %[ret]" - : [ret]"=rm" (ret) - : [pa]"m" (phys) - :"cc" ,"memory" ); - -__GUEST_ASSERT (!ret,"vmxon [0x%lx] failed" , phys); +#define BUILD_VMCS_ASM_HELPERS (insn) \ +static inline int __##insn(u64 vmcs_pa) \ +{ \ + u64 error_code; \ + u8 vector; \ + u8 failed; \ + \ + asm volatile(KVM_ASM_SAFE(__stringify(insn) " %[pa]") \ + "\n\tsetna %[failed]" \ + : KVM_ASM_SAFE_OUTPUTS(vector, error_code), \ + [failed]"=qm"(failed) \ + : [pa]"m"(vmcs_pa) \ + : "cc", "memory", KVM_ASM_SAFE_CLOBBERS); \ + \ + return vector ? vector : failed ? -EINVAL : 0; \ +} \ + \ +static inline void insn(u64 vmcs_pa) \ +{ \ + int ret = __##insn(vmcs_pa); \ + \ + GUEST_ASSERT_VMX_INSN_SUCCEEDED(insn, ret, vmcs_pa); \ } +BUILD_VMCS_ASM_HELPERS (vmxon) +BUILD_VMCS_ASM_HELPERS (vmptrld ) +BUILD_VMCS_ASM_HELPERS (vmclear) + static inline voidvmxoff (void) { __asm__ __volatile__("vmxoff" ); } -static inline void vmclear (u64 vmcs_pa) -{ -u8 ret; - - __asm__ __volatile__ ("vmclear %[pa]; setna %[ret]" - : [ret]"=rm" (ret) - : [pa]"m" (vmcs_pa) - :"cc" ,"memory" ); - -__GUEST_ASSERT (!ret,"vmclear [0x%lx] failed\n" , vmcs_pa); -} - -static inline int __vmptrld (u64 vmcs_pa) -{ -u64 error_code; -u8 vector; -u8 failed; - - asm volatile(KVM_ASM_SAFE("vmptrld %[pa]") - "\n\tsetna %[failed]" - : KVM_ASM_SAFE_OUTPUTS(vector, error_code), - [failed]"=qm"(failed) - : [pa]"m"(vmcs_pa) - : "cc", "memory", KVM_ASM_SAFE_CLOBBERS); - -return vector ? vector : failed ? -EINVAL :0 ; -} - -static inline void vmptrld (u64 vmcs_pa) -{ -int ret =__vmptrld (vmcs_pa); - -GUEST_ASSERT_VMX_INSN_SUCCEEDED (vmptrld, ret, vmcs_pa); -} -static inline u64 vmptrst (void ) {u64 value =0 ;
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v3 12/13 KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
In reply to Sean ChristophersonDedup the assembly code from VMLAUNCH vs. VMRESUME, the difference is literally only the actual VM-Enter instruction.
No functional change intended.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 74 +++++++------------ 1 file changed, 26 insertions(+), 48 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +26 -48
@@ -359,55 +359,33 @@ static inline u64 vmptrst(void)return value; } -static inline int vmlaunch (void ) -{ -int ret; - -if (enable_evmcs) -return evmcs_vmlaunch (); - - __asm__ __volatile__("push $0;" -"vmwrite %%rsp, %[host_rsp];" -"lea 1f(%%rip), %%rax;" -"vmwrite %%rax, %[host_rip];" -VMX_SWITCH_GPRS_ASM -"vmlaunch;" -"incq (%%rsp);" -"1: ;" -VMX_SWITCH_GPRS_ASM -"pop %%rax;" - : [ret]"=&a" (ret) - : [host_rsp]"r" ((u64 )HOST_RSP ), - [host_rip]"r"((u64)HOST_RIP), - GUEST_REGS_OFFSETS - :"memory" ,"cc" ); -return ret; -} - -static inline int vmresume (void ) -{ -int ret; - -if (enable_evmcs) -return evmcs_vmresume (); - - __asm__ __volatile__("push $0;" -"vmwrite %%rsp, %[host_rsp];" -"lea 1f(%%rip), %%rax;" -"vmwrite %%rax, %[host_rip];" -VMX_SWITCH_GPRS_ASM -"vmresume;" -"incq (%%rsp);" -"1: ;" -VMX_SWITCH_GPRS_ASM -"pop %%rax;" - : [ret]"=&a" (ret) - : [host_rsp]"r" ((u64 )HOST_RSP ), - [host_rip]"r"((u64)HOST_RIP), - GUEST_REGS_OFFSETS - :"memory" ,"cc" ); -return ret; +#define BUILD_VMX_VM_ENTRY_HELPERS (insn) \ +static inline int insn(void) \ +{ \ + int ret; \ + \ + if (enable_evmcs) \ + return evmcs_##insn(); \ + \ + __asm__ __volatile__("push $0;" \ + "vmwrite %%rsp, %[host_rsp];" \ + "lea 1f(%%rip), %%rax;" \ + "vmwrite %%rax, %[host_rip];" \ + VMX_SWITCH_GPRS_ASM \ + __stringify(insn)";" \ + "incq (%%rsp);" \ + "1: ;" \ + VMX_SWITCH_GPRS_ASM \ + "pop %%rax;" \ + : [ret]"=&a"(ret) \ + : [host_rsp]"r"((u64)HOST_RSP), \ + [host_rip]"r"((u64)HOST_RIP), \ + GUEST_REGS_OFFSETS \ + : "memory", "cc"); \ + return ret; \ } +BUILD_VMX_VM_ENTRY_HELPERS (vmlaunch) +BUILD_VMX_VM_ENTRY_HELPERS (vmresume ) static inline voidvmcall (void) {
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 3 lines · Sean Christopherson
Dedup the assembly code from VMLAUNCH vs. VMRESUME, the difference is literally only the actual VM-Enter instruction.
You couldn't resist macrofiying this too.
Quoted 56 lines
No functional change intended.
Cc Yosry Ahmed <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/include/x86/vmx.h | 74 +++++++------------ 1 file changed, 26 insertions(+), 48 deletions(-)tools/testing/selftests/kvm/include/x86/vmx.h +0
-39@@ -359,55 +359,33 @@ static inline u64 vmptrst(void)return value; } -static inline int vmlaunch (void ) -{ -int ret; - -if (enable_evmcs) -return evmcs_vmlaunch (); - - __asm__ __volatile__("push $0;" -"vmwrite %%rsp, %[host_rsp];" -"lea 1f(%%rip), %%rax;" -"vmwrite %%rax, %[host_rip];" -VMX_SWITCH_GPRS_ASM -"vmlaunch;" -"incq (%%rsp);" -"1: ;" -VMX_SWITCH_GPRS_ASM -"pop %%rax;" - : [ret]"=&a" (ret) - : [host_rsp]"r" ((u64 )HOST_RSP ), - [host_rip]"r"((u64)HOST_RIP), - GUEST_REGS_OFFSETS - :"memory" ,"cc" ); -return ret; -} - -static inline int vmresume (void ) -{ -int ret; - -if (enable_evmcs) -return evmcs_vmresume (); - - __asm__ __volatile__("push $0;" -"vmwrite %%rsp, %[host_rsp];" -"lea 1f(%%rip), %%rax;" -"vmwrite %%rax, %[host_rip];" -VMX_SWITCH_GPRS_ASM -"vmresume;" - "incq (%%rsp);"
tools/testing/selftests/kvm/include/x86/vmx.h static inline u64 vmptrst(void) · line 362
Quoted 10 lines
tools/testing/selftests/kvm/include/x86/vmx.h +1
-9-"1: ;" -VMX_SWITCH_GPRS_ASM -"pop %%rax;" - : [ret]"=&a"(ret) - : [host_rsp]"r"((u64)HOST_RSP), - [host_rip]"r"((u64)HOST_RIP), - GUEST_REGS_OFFSETS - : "memory", "cc"); - return ret; +#define BUILD_VMX_VM_ENTRY_HELPERS (insn) \
s/HELPERS/HELPER?
or maybe better: DEFINE_VMX_VM_ENTRY_HELPER()?
With the rename:
(Who's [email protected]?)
Quoted 32 lines
tools/testing/selftests/kvm/include/x86/vmx.h +25
-1+static inline int insn (void ) \ +{ \ +int ret; \ + \ + if (enable_evmcs) \ + return evmcs_##insn(); \ + \ + __asm__ __volatile__("push $0;" \ + "vmwrite %%rsp, %[host_rsp];" \ + "lea 1f(%%rip), %%rax;" \ + "vmwrite %%rax, %[host_rip];" \ + VMX_SWITCH_GPRS_ASM \ + __stringify(insn)";" \ + "incq (%%rsp);" \ + "1: ;" \ + VMX_SWITCH_GPRS_ASM \ + "pop %%rax;" \ + : [ret]"=&a"(ret) \ + : [host_rsp]"r"((u64)HOST_RSP), \ + [host_rip]"r"((u64)HOST_RIP), \ + GUEST_REGS_OFFSETS \ + : "memory", "cc"); \ + return ret; \ } +BUILD_VMX_VM_ENTRY_HELPERS (vmlaunch) +BUILD_VMX_VM_ENTRY_HELPERS (vmresume ) static inline voidvmcall (void) { --2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerRe: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 6 lines · Yosry Ahmed
Quoted 3 lines · Sean Christopherson
Dedup the assembly code from VMLAUNCH vs. VMRESUME, the difference is literally only the actual VM-Enter instruction.
You couldn't resist macrofiying this too.
It's either that or throw a branch in the asm blob, which is surprisingly difficult because VMX_SWITCH_GPRS_ASM subtly clobbers RFLAGS and obviously clobbers GPRs. Which basically leaves pushing the value on the stack, which is totally doable, but still annoying, and needs to be done immediately, before vmcs.HOST_RSP is loaded. Branching at runtime also makes the generated code harder to read, e.g. when debugging, as it's not immediately obvious which instruction was actually attempted.
That said, looking at this again made me realize evmcs_{vmlaunch,vmresume}() have the same core copy+paste mess. Blech. Macrofying the standard flows but not the eVMCS flows is rather silly.
Inlining these blobs *twice* (VMCS vs. eVMCS) at every VM-Enter is also ridiculous. E.g. at a glance, it's responsible for something ~100k bytes of code in the compiled state_test. While the code footprint of selftests isn't a priority, that's still absurd.
So instead of macrofying everything, how about this? Depending on how one feels about macro shenanigans, it's either horrific or amazing. Or both. But IMO it's worth eliminating all of the copy+paste, and it makes the control flow much easier to read, which in practice is likely what most people care about? At least until the entry/exit sequence fails and they have to debug macro hell :-)
vmx.c:
#define __BUILD_VMX_VM_ENTRY_HELPER(insn, prefix, vmwrite_insn, vmwrite_operand, \
__host_rsp, __host_rip) \
static int __##prefix##_##insn(void) \
{ \
int ret; \
\
__asm__ __volatile__("push $0;" \
__stringify(vmwrite_insn) " %%rsp, %[host_rsp];" \
"lea 1f(%%rip), %%rax;" \
__stringify(vmwrite_insn) " %%rax, %[host_rip];" \
VMX_SWITCH_GPRS_ASM \
__stringify(insn)";" \
"incq (%%rsp);" \
"1: ;" \
VMX_SWITCH_GPRS_ASM \
"pop %%rax;" \
: [ret]"=&a"(ret) \
: [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \
[host_rip]__stringify(vmwrite_operand)(__host_rip), \
GUEST_REGS_OFFSETS \
: "memory", "cc"); \
return ret; \
}
#define BUILD_VMX_VM_ENTRY_HELPER(insn) \
__BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, r, (u64)HOST_RSP, (u64)HOST_RIP) \
__BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, mov, m, \
current_evmcs->host_rsp, current_evmcs->host_rip) BUILD_VMX_VM_ENTRY_HELPER(vmlaunch)
BUILD_VMX_VM_ENTRY_HELPER(vmresume)
int __vmlaunch(void)
{
if (enable_evmcs) {
current_evmcs->hv_clean_fields = 0;
return ____evmcs_vmlaunch();
}
return ____vmlaunch();
}
int __vmresume(void)
{
if (enable_evmcs) {
/* HOST_RIP */
current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1;
/* HOST_RSP */
current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER;
return ____evmcs_vmresume();
}
return ____vmresume();
}vmx.h:
int __vmlaunch(void);
int __vmresume(void);
static inline int vmlaunch(void)
{
return __vmlaunch();
}
static inline int vmresume(void)
{
return __vmresume();
}And then the next patch becomes:
KVM: selftests: Assert success in vmlaunch() and vmresume()
Assert success in the "outer" APIs for VMLAUNCH and VMRESUME to dedup a pile of code, and switch to the double-underscores versions as necessary, to make it more obvious which paths expect VM-Enter *failure*.
testing/selftests/kvm/include/x86/vmx.h +4 -4
@@ -362,14 +362,14 @@ static inline u64 vmptrst(void)int __vmlaunch (void );int __vmresume (void ); -static inline int vmlaunch (void ) +static inline void vmlaunch (void ) { -return __vmlaunch (); +__GUEST_ASSERT (!__vmlaunch (),"vmlaunch hit VM-Fail" ); } -static inline int vmresume (void ) +static inline void vmresume (void ) { -return __vmresume (); +__GUEST_ASSERT (!__vmresume (),"vmresume hit VM-Fail" ); }static inline void vmcall (void )
Quoted 5 lines
Quoted 1 line
+#define
BUILD_VMX_VM_ENTRY_HELPERS(insn)\s/HELPERS/HELPER?
or maybe better:
DEFINE_VMX_VM_ENTRY_HELPER()?
Because after the next patch, there are two helpers for each instruction, vmresume() and __vmresume(), and churning the macros to add the 'S' felt silly. But, with the above, this is a moot point.
Quoted 5 lines
With the rename:
Reviewed-by Yosry Ahmed <[email protected]>(Who's [email protected]?)
An anonymous bug reporter: https://bugzilla.kernel.org/show_bug.cgi?id=221841
Re: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 32 lines · Sean Christopherson
Quoted 6 lines · Yosry Ahmed
Quoted 3 lines · Sean Christopherson
Dedup the assembly code from VMLAUNCH vs. VMRESUME, the difference is literally only the actual VM-Enter instruction.
You couldn't resist macrofiying this too.
It's either that or throw a branch in the asm blob, which is surprisingly difficult because
VMX_SWITCH_GPRS_ASMsubtly clobbers RFLAGS and obviously clobbers GPRs. Which basically leaves pushing the value on the stack, which is totally doable, but still annoying, and needs to be done immediately, before vmcs.HOST_RSP is loaded. Branching at runtime also makes the generated code harder to read, e.g. when debugging, as it's not immediately obvious which instruction was actually attempted.That said, looking at this again made me realize evmcs_{vmlaunch,vmresume}() have the same core copy+paste mess. Blech. Macrofying the standard flows but not the eVMCS flows is rather silly.
Inlining these blobs *twice* (VMCS vs. eVMCS) at every VM-Enter is also ridiculous. E.g. at a glance, it's responsible for something ~100k bytes of code in the compiled
state_test. While the code footprint of selftests isn't a priority, that's still absurd.So instead of macrofying everything, how about this? Depending on how one feels about macro shenanigans, it's either horrific or amazing. Or both. But IMO it's worth eliminating all of the copy+paste, and it makes the control flow much easier to read, which in practice is likely what most people care about? At least until the entry/exit sequence fails and they have to debug macro hell :-)
Quoted 5 lines
vmx.c:#define __BUILD_VMX_VM_ENTRY_HELPER(insn, prefix, vmwrite_insn, vmwrite_operand, \ __host_rsp, __host_rip) \
The only part I really hate is vmwrite_operand. Why do we need it? Seems like all the current helpers use "r", I feel like I am missing something.
Quoted 67 lines
static int __##prefix##_##insn(void) \ { \ int ret; \ \ __asm__ __volatile__("push $0;" \ __stringify(vmwrite_insn) " %%rsp, %[host_rsp];" \ "lea 1f(%%rip), %%rax;" \ __stringify(vmwrite_insn) " %%rax, %[host_rip];" \ VMX_SWITCH_GPRS_ASM \ __stringify(insn)";" \ "incq (%%rsp);" \ "1: ;" \ VMX_SWITCH_GPRS_ASM \ "pop %%rax;" \ : [ret]"=&a"(ret) \ : [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ [host_rip]__stringify(vmwrite_operand)(__host_rip), \ GUEST_REGS_OFFSETS \ : "memory", "cc"); \ return ret; \}
#define BUILD_VMX_VM_ENTRY_HELPER(insn) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, r, (u64)HOST_RSP, (u64)HOST_RIP) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, mov, m, \ current_evmcs->host_rsp, current_evmcs->host_rip)
BUILD_VMX_VM_ENTRY_HELPER(vmlaunch)
BUILD_VMX_VM_ENTRY_HELPER(vmresume)int __vmlaunch(void) { if (enable_evmcs) { current_evmcs->hv_clean_fields = 0; return ____evmcs_vmlaunch(); }return ____vmlaunch();}
int __vmresume(void) { if (enable_evmcs) { /* HOST_RIP */ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1; /* HOST_RSP */ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_POINTER; return ____evmcs_vmresume(); }return ____vmresume();}
vmx.h:int __vmlaunch(void); int __vmresume(void); static inline int vmlaunch(void) { return __vmlaunch(); } static inline int vmresume(void) { return __vmresume(); }
Sean Christopherson
maintainerRe: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 6 lines · Yosry Ahmed
Quoted 2 lines · Sean Christopherson
#define __BUILD_VMX_VM_ENTRY_HELPER(insn, prefix, vmwrite_insn, vmwrite_operand, \ __host_rsp, __host_rip) \The only part I really hate is
vmwrite_operand. Why do we need it? Seems like all the current helpers use "r", I feel like I am missing something.
...
Quoted 22 lines
Quoted 22 lines
static int __##prefix##_##insn(void) \ { \ int ret; \ \ __asm__ __volatile__("push $0;" \ __stringify(vmwrite_insn) " %%rsp, %[host_rsp];" \ "lea 1f(%%rip), %%rax;" \ __stringify(vmwrite_insn) " %%rax, %[host_rip];" \ VMX_SWITCH_GPRS_ASM \ __stringify(insn)";" \ "incq (%%rsp);" \ "1: ;" \ VMX_SWITCH_GPRS_ASM \ "pop %%rax;" \ : [ret]"=&a"(ret) \ : [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ [host_rip]__stringify(vmwrite_operand)(__host_rip), \ GUEST_REGS_OFFSETS \ : "memory", "cc"); \ return ret; \}
Quoted 4 lines
Quoted 4 lines
#define BUILD_VMX_VM_ENTRY_HELPER(insn) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, r, (u64)HOST_RSP, (u64)HOST_RIP) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, mov, m, \ current_evmcs->host_rsp, current_evmcs->host_rip)
eVMCS is a memory operand, i.e. it's MOV RSP, [evmcs->host_rip]. The existing evmcs_{vmresume,vmlaunch}() code is rather stupid and loads the address into a register, and then manually encodes MOV RSP, [<reg>].
P.S. just in case you didn't already think this code is evil, the '&' in the
above "[ret]"=&a"(ret)" is an earlyclobber that tells the compiler that RAX may be clobbered before all inputs and processed, i.e. prevents the compiler from using RAX for VMWRITE's register operand, or from using RAX to compute the memory operand for eVMCS's MOV.
P.P.S. even though the prototype for VMWRITE is "VMWRITE r64, r/m64", Intel is
ass-backwards when it comes to syntax, i.e r/m64 is the source, not the dest, and so the field encoding *must* be a register operand. I.e. we can't do something like this:
testing/selftests/kvm/lib/x86/vmx.c +9 -5
@@ -179,7 +179,10 @@ void load_vmcs(struct vmx_pages *vmx)vmclear (vmx->shadow_vmcs_gpa); } -#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, vmwrite_operand, \ +const u64 HOST_RSP_ENCODING =HOST_RSP ; +const u64 HOST_RIP_ENCODING =HOST_RIP ; + +#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, \ __host_rsp, __host_rip) \ static int __##prefix##_##insn(void) \ { \
@@ -196,16 +199,17 @@ static int __##prefix##_##insn(void) \VMX_SWITCH_GPRS_ASM \"pop %%rax;" \ : [ret]"=&a"(ret) \ -: [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ -[host_rip]__stringify(vmwrite_operand)(__host_rip), \ +: [host_rsp]" m"(__host_rsp), \ +[host_rip]" m"(__host_rip), \ GUEST_REGS_OFFSETS \ : "memory", "cc"); \ return ret; \ } #define BUILD_VMX_VM_ENTRY_HELPER(insn) \ - __BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, r, (u64)HOST_RSP, (u64)HOST_RIP) \ -__BUILD_VMX_VM_ENTRY_HELPER (insn, __evmcs, mov, m, \ + __BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, \ + HOST_RSP_ENCODING, HOST_RIP_ENCODING) \ +__BUILD_VMX_VM_ENTRY_HELPER (insn, __evmcs, mov, \ current_evmcs->host_rsp, current_evmcs->host_rip)BUILD_VMX_VM_ENTRY_HELPER (vmlaunch)
Re: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 33 lines · Sean Christopherson
Quoted 6 lines · Yosry Ahmed
Quoted 2 lines · Sean Christopherson
#define __BUILD_VMX_VM_ENTRY_HELPER(insn, prefix, vmwrite_insn, vmwrite_operand, \ __host_rsp, __host_rip) \The only part I really hate is
vmwrite_operand. Why do we need it? Seems like all the current helpers use "r", I feel like I am missing something....
Quoted 22 lines
Quoted 22 lines
static int __##prefix##_##insn(void) \ { \ int ret; \ \ __asm__ __volatile__("push $0;" \ __stringify(vmwrite_insn) " %%rsp, %[host_rsp];" \ "lea 1f(%%rip), %%rax;" \ __stringify(vmwrite_insn) " %%rax, %[host_rip];" \ VMX_SWITCH_GPRS_ASM \ __stringify(insn)";" \ "incq (%%rsp);" \ "1: ;" \ VMX_SWITCH_GPRS_ASM \ "pop %%rax;" \ : [ret]"=&a"(ret) \ : [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ [host_rip]__stringify(vmwrite_operand)(__host_rip), \ GUEST_REGS_OFFSETS \ : "memory", "cc"); \ return ret; \}
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
#define BUILD_VMX_VM_ENTRY_HELPER(insn) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, r, (u64)HOST_RSP, (u64)HOST_RIP) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, mov, m, \ current_evmcs->host_rsp, current_evmcs->host_rip)eVMCS is a memory operand, i.e. it's MOV RSP, [
evmcs->host_rip]. The existing evmcs_{vmresume,vmlaunch}() code is rather stupid and loads the address into a register, and then manually encodes MOV RSP, [<reg>].
Can't we keep it as a register operand just to avoid vmwrite_operand? Does it actually hurt in any way?
Quoted 6 lines
P.S. just in case you didn't already think this code is evil, the '&' in the
above "[ret]"=&a"(ret)" is an earlyclobber that tells the compiler that RAX may be clobbered before all inputs and processed, i.e. prevents the compiler from using RAX for VMWRITE's register operand, or from using RAX to compute the memory operand for eVMCS's MOV.
TIL.
Quoted 5 lines
P.P.S. even though the prototype for VMWRITE is "VMWRITE r64, r/m64", Intel is
ass-backwards when it comes to syntax, i.e r/m64 is the source, not the dest, and so the field encoding *must* be a register operand. I.e. we can't do something like this:
Right, I was suggested using register operands for everything.
Quoted 18 lines
testing/selftests/kvm/lib/x86/vmx.c +4
-1@@ -179,7 +179,10 @@ void load_vmcs(struct vmx_pages *vmx)vmclear (vmx->shadow_vmcs_gpa); } -#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, vmwrite_operand, \ +const u64 HOST_RSP_ENCODING =HOST_RSP ; +const u64 HOST_RIP_ENCODING =HOST_RIP ; + +#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, \ __host_rsp, __host_rip) \ static int __##prefix##_##insn(void) \ { \
testing/selftests/kvm/lib/x86/vmx.c static int __##prefix##_##insn(void) \ · line 203
Quoted 7 lines
testing/selftests/kvm/lib/x86/vmx.c +2
-2@@ -196,16 +199,17 @@ static int __##prefix##_##insn(void) \VMX_SWITCH_GPRS_ASM \"pop %%rax;" \ : [ret]"=&a"(ret) \ -: [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ -[host_rip]__stringify(vmwrite_operand)(__host_rip), \ +: [host_rsp]" m"(__host_rsp), \ +[host_rip]" m"(__host_rip), \
I suppose we can use "r" here though?
Quoted 15 lines
testing/selftests/kvm/lib/x86/vmx.c +3
-2GUEST_REGS_OFFSETS \ : "memory", "cc"); \return ret; \ }#define BUILD_VMX_VM_ENTRY_HELPER (insn) \ - __BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, r, (u64)HOST_RSP, (u64)HOST_RIP) \ - __BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, mov, m, \ + __BUILD_VMX_VM_ENTRY_HELPER(insn, _, vmwrite, \ + HOST_RSP_ENCODING, HOST_RIP_ENCODING) \ + __BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, mov, \ current_evmcs->host_rsp, current_evmcs->host_rip)BUILD_VMX_VM_ENTRY_HELPER (vmlaunch)
Sean Christopherson
maintainerRe: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 7 lines · Yosry Ahmed
Quoted 3 lines · Sean Christopherson
eVMCS is a memory operand, i.e. it's MOV RSP, [
evmcs->host_rip]. The existing evmcs_{vmresume,vmlaunch}() code is rather stupid and loads the address into a register, and then manually encodes MOV RSP, [<reg>].Can't we keep it as a register operand just to avoid
vmwrite_operand? Does it actually hurt in any way?
...
Quoted 18 lines
Quoted 18 lines
testing/selftests/kvm/lib/x86/vmx.c +4
-1@@ -179,7 +179,10 @@ void load_vmcs(struct vmx_pages *vmx)vmclear (vmx->shadow_vmcs_gpa); } -#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, vmwrite_operand, \ +const u64 HOST_RSP_ENCODING =HOST_RSP ; +const u64 HOST_RIP_ENCODING =HOST_RIP ; + +#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, \ __host_rsp, __host_rip) \ static int __##prefix##_##insn(void) \ { \@@ -196,16 +199,17 @@ static int __##prefix##_##insn(void) \VMX_SWITCH_GPRS_ASM \
Quoted 8 lines
testing/selftests/kvm/lib/x86/vmx.c static int __##prefix##_##insn(void) \ · line 203
Quoted 6 lines
testing/selftests/kvm/lib/x86/vmx.c +2
-2"pop %%rax;" \ : [ret]"=&a"(ret) \ -: [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ -[host_rip]__stringify(vmwrite_operand)(__host_rip), \ +: [host_rsp]" m"(__host_rsp), \ +[host_rip]" m"(__host_rip), \ I suppose we can use "r" here though?
No, because then the encoding for VMWRITE needs to be:
vmwrite %%rsp, %[host_rsp]
but for MOV/eVMCS needs to be:
mov %%rsp, (%[host_rsp])
Have fun feeding the '(' and ')' into the asm blob :-)
Re: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 41 lines · Sean Christopherson
Quoted 7 lines · Yosry Ahmed
Quoted 3 lines · Sean Christopherson
eVMCS is a memory operand, i.e. it's MOV RSP, [
evmcs->host_rip]. The existing evmcs_{vmresume,vmlaunch}() code is rather stupid and loads the address into a register, and then manually encodes MOV RSP, [<reg>].Can't we keep it as a register operand just to avoid
vmwrite_operand? Does it actually hurt in any way?...
Quoted 18 lines
Quoted 18 lines
testing/selftests/kvm/lib/x86/vmx.c +4
-1@@ -179,7 +179,10 @@ void load_vmcs(struct vmx_pages *vmx)vmclear (vmx->shadow_vmcs_gpa); } -#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, vmwrite_operand, \ +const u64 HOST_RSP_ENCODING =HOST_RSP ; +const u64 HOST_RIP_ENCODING =HOST_RIP ; + +#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, \ __host_rsp, __host_rip) \ static int __##prefix##_##insn(void) \ { \@@ -196,16 +199,17 @@ static int __##prefix##_##insn(void) \VMX_SWITCH_GPRS_ASM \Quoted 8 lines
testing/selftests/kvm/lib/x86/vmx.c static int __##prefix##_##insn(void) \ · line 203
Quoted 6 lines
testing/selftests/kvm/lib/x86/vmx.c +2
-2"pop %%rax;" \ : [ret]"=&a"(ret) \ -: [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ -[host_rip]__stringify(vmwrite_operand)(__host_rip), \ +: [host_rsp]" m"(__host_rsp), \ +[host_rip]" m"(__host_rip), \ I suppose we can use "r" here though?
No, because then the encoding for VMWRITE needs to be:
Quoted 7 lines
vmwrite %%rsp, %[host_rsp]
but for MOV/eVMCS needs to be:
mov %%rsp, (%[host_rsp])
Have fun feeding the '(' and ')' into the asm blob :-)
Semi-joking, what if we pass in the entire instruction instead?
Sean Christopherson
maintainerRe: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 44 lines · Yosry Ahmed
Quoted 43 lines · Sean Christopherson
Quoted 7 lines · Yosry Ahmed
Quoted 3 lines · Sean Christopherson
eVMCS is a memory operand, i.e. it's MOV RSP, [
evmcs->host_rip]. The existing evmcs_{vmresume,vmlaunch}() code is rather stupid and loads the address into a register, and then manually encodes MOV RSP, [<reg>].Can't we keep it as a register operand just to avoid
vmwrite_operand? Does it actually hurt in any way?...
Quoted 18 lines
Quoted 18 lines
testing/selftests/kvm/lib/x86/vmx.c +4
-1@@ -179,7 +179,10 @@ void load_vmcs(struct vmx_pages *vmx)vmclear (vmx->shadow_vmcs_gpa); } -#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, vmwrite_operand, \ +const u64 HOST_RSP_ENCODING =HOST_RSP ; +const u64 HOST_RIP_ENCODING =HOST_RIP ; + +#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, \ __host_rsp, __host_rip) \ static int __##prefix##_##insn(void) \ { \@@ -196,16 +199,17 @@ static int __##prefix##_##insn(void) \VMX_SWITCH_GPRS_ASM \Quoted 8 lines
testing/selftests/kvm/lib/x86/vmx.c static int __##prefix##_##insn(void) \ · line 203
Quoted 6 lines
testing/selftests/kvm/lib/x86/vmx.c +2
-2"pop %%rax;" \ : [ret]"=&a"(ret) \ -: [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ -[host_rip]__stringify(vmwrite_operand)(__host_rip), \ +: [host_rsp]" m"(__host_rsp), \ +[host_rip]" m"(__host_rip), \ I suppose we can use "r" here though?
No, because then the encoding for VMWRITE needs to be:
vmwrite %%rsp, %[host_rsp]
Quoted 7 lines
Quoted 5 lines
but for MOV/eVMCS needs to be:
mov %%rsp, (%[host_rsp])
Have fun feeding the '(' and ')' into the asm blob :-)
Semi-joking, what if we pass in the entire instruction instead?
Then there needs to be separate parameters for RSP vs. RIP, and we still need to pass different operands, *and* it bleeds information into the callers since they would need to hardcode use of %%rax and of the named constraints.
As ugly as the proposed code is, IMO the maintenance implications of the below is far worse than the subtle 'r' vs. 'm' (and on principle, I dislike passing an address in a register and then manually encoding a memory operand).
#define __BUILD_VMX_VM_ENTRY_HELPER(insn, prefix, vmwrite_rsp, vmwrite_rip, \
__host_rsp, __host_rip) \
static int __##prefix##_##insn(void) \
{ \
int ret; \
\
__asm__ __volatile__("push $0;" \
vmwrite_rsp \
"lea 1f(%%rip), %%rax;" \
vmwrite_rip \
VMX_SWITCH_GPRS_ASM \
__stringify(insn)";" \
"incq (%%rsp);" \
"1: ;" \
VMX_SWITCH_GPRS_ASM \
"pop %%rax;" \
: [ret]"=&a"(ret) \
: [host_rsp]"r"((u64)__host_rsp), \
[host_rip]"r"((u64)__host_rip), \
GUEST_REGS_OFFSETS \
: "memory", "cc"); \
return ret; \
}#define BUILD_VMX_VM_ENTRY_HELPER(insn) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, _, \ "vmwrite %%rsp, %[host_rsp];", \ "vmwrite %%rax, %[host_rip];", \ HOST_RSP, HOST_RIP) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, \ "mov %%rsp, (%[host_rsp]);", \ "mov %%rsp, (%[host_rip]);", \ ¤t_evmcs->host_rsp, ¤t_evmcs->host_rip)
Re: [PATCH v3 12/13] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
Quoted 54 lines · Sean Christopherson
Quoted 44 lines · Yosry Ahmed
Quoted 43 lines · Sean Christopherson
Quoted 7 lines · Yosry Ahmed
Quoted 3 lines · Sean Christopherson
eVMCS is a memory operand, i.e. it's MOV RSP, [
evmcs->host_rip]. The existing evmcs_{vmresume,vmlaunch}() code is rather stupid and loads the address into a register, and then manually encodes MOV RSP, [<reg>].Can't we keep it as a register operand just to avoid
vmwrite_operand? Does it actually hurt in any way?...
Quoted 18 lines
Quoted 18 lines
testing/selftests/kvm/lib/x86/vmx.c +4
-1@@ -179,7 +179,10 @@ void load_vmcs(struct vmx_pages *vmx)vmclear (vmx->shadow_vmcs_gpa); } -#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, vmwrite_operand, \ +const u64 HOST_RSP_ENCODING =HOST_RSP ; +const u64 HOST_RIP_ENCODING =HOST_RIP ; + +#define __BUILD_VMX_VM_ENTRY_HELPER (insn, prefix, vmwrite_insn, \ __host_rsp, __host_rip) \ static int __##prefix##_##insn(void) \ { \@@ -196,16 +199,17 @@ static int __##prefix##_##insn(void) \VMX_SWITCH_GPRS_ASM \Quoted 8 lines
testing/selftests/kvm/lib/x86/vmx.c static int __##prefix##_##insn(void) \ · line 203
Quoted 6 lines
testing/selftests/kvm/lib/x86/vmx.c +2
-2"pop %%rax;" \ : [ret]"=&a"(ret) \ -: [host_rsp]__stringify(vmwrite_operand)(__host_rsp), \ -[host_rip]__stringify(vmwrite_operand)(__host_rip), \ +: [host_rsp]" m"(__host_rsp), \ +[host_rip]" m"(__host_rip), \ I suppose we can use "r" here though?
No, because then the encoding for VMWRITE needs to be:
vmwrite %%rsp, %[host_rsp]
Quoted 7 lines
Quoted 5 lines
but for MOV/eVMCS needs to be:
mov %%rsp, (%[host_rsp])
Have fun feeding the '(' and ')' into the asm blob :-)
Semi-joking, what if we pass in the entire instruction instead?
Quoted 7 lines
Then there needs to be separate parameters for RSP vs. RIP, and we still need to pass different operands, *and* it bleeds information into the callers since they would need to hardcode use of %%rax and of the named constraints.
As ugly as the proposed code is, IMO the maintenance implications of the below is far worse than the subtle 'r' vs. 'm' (and on principle, I dislike passing an address in a register and then manually encoding a memory operand).
Yeah this isn't pretty either. I don't feel strongly either way tbh, so whatever you think is best.
One other option is accepting some duplication, and letting the eVMCS variants be separate. Basically keep your original patch as-is, and just add a similar one for eVMCS variants.
Again, no strong preference, and I generally prefer your proposal for deduplicating all of them if it wasn't for the subtle 'r' vs 'm' thingy :/
Quoted 34 lines
#define __BUILD_VMX_VM_ENTRY_HELPER(insn, prefix, vmwrite_rsp, vmwrite_rip, \ __host_rsp, __host_rip) \ static int __##prefix##_##insn(void) \ { \ int ret; \ \ __asm__ __volatile__("push $0;" \ vmwrite_rsp \ "lea 1f(%%rip), %%rax;" \ vmwrite_rip \ VMX_SWITCH_GPRS_ASM \ __stringify(insn)";" \ "incq (%%rsp);" \ "1: ;" \ VMX_SWITCH_GPRS_ASM \ "pop %%rax;" \ : [ret]"=&a"(ret) \ : [host_rsp]"r"((u64)__host_rsp), \ [host_rip]"r"((u64)__host_rip), \ GUEST_REGS_OFFSETS \ : "memory", "cc"); \ return ret; \ }#define BUILD_VMX_VM_ENTRY_HELPER(insn) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, _, \ "vmwrite %%rsp, %[host_rsp];", \ "vmwrite %%rax, %[host_rip];", \ HOST_RSP, HOST_RIP) \ __BUILD_VMX_VM_ENTRY_HELPER(insn, __evmcs, \ "mov %%rsp, (%[host_rsp]);", \ "mov %%rsp, (%[host_rip]);", \ ¤t_evmcs->host_rsp, ¤t_evmcs->host_rip)
Sean Christopherson
maintainerPATCH v3 13/13 KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
In reply to Sean ChristophersonAdd double-underscore helpers for VMLAUNCH and VMRESUME, and have the "outer" APIs assert success, as is common through KVM selftests. In addition to providing more familiar interfaces, this makes it more obvious which paths expect VM-Enter *failure*.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 10 +++++++- .../testing/selftests/kvm/lib/x86/memstress.c | 2 +- .../selftests/kvm/x86/aperfmperf_test.c | 2 +- .../kvm/x86/evmcs_smm_controls_test.c | 2 +- .../testing/selftests/kvm/x86/hyperv_evmcs.c | 22 ++++++++--------- .../selftests/kvm/x86/kvm_buslock_test.c | 2 +- .../selftests/kvm/x86/nested_close_kvm_test.c | 2 +- .../selftests/kvm/x86/nested_dirty_log_test.c | 2 +- .../selftests/kvm/x86/nested_emulation_test.c | 2 +- .../kvm/x86/nested_exceptions_test.c | 2 +- .../kvm/x86/nested_invalid_cr3_test.c | 4 ++-- .../selftests/kvm/x86/nested_tdp_fault_test.c | 2 +- .../kvm/x86/nested_tsc_adjust_test.c | 2 +- .../kvm/x86/nested_tsc_scaling_test.c | 2 +- .../kvm/x86/save_restore_pf_stress_test.c | 4 ++-- tools/testing/selftests/kvm/x86/state_test.c | 24 +++++++++---------- .../kvm/x86/triple_fault_event_test.c | 2 +- .../selftests/kvm/x86/vmx_apic_access_test.c | 4 ++-- .../kvm/x86/vmx_apicv_updates_test.c | 4 ++-- .../kvm/x86/vmx_invalid_nested_guest_state.c | 2 +- .../kvm/x86/vmx_nested_la57_state_test.c | 2 +- .../kvm/x86/vmx_preemption_timer_test.c | 4 ++-- 22 files changed, 56 insertions(+), 48 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +9 -1
@@ -360,7 +360,7 @@ static inline u64 vmptrst(void) }#define BUILD_VMX_VM_ENTRY_HELPERS (insn) \ -static inline int insn(void) \ +static inline int __##insn(void) \ { \ int ret; \ \
@@ -383,6 +383,14 @@ static inline int insn(void) \ GUEST_REGS_OFFSETS \ : "memory", "cc"); \return ret; \ +} \ + \ +static inline void insn (void ) \ +{ \ +int ret; \ + \ + ret = __##insn(); \ + __GUEST_ASSERT(!ret, __stringify(insn) " hit VM-Fail"); \ }BUILD_VMX_VM_ENTRY_HELPERS (vmlaunch)BUILD_VMX_VM_ENTRY_HELPERS (vmresume)
tools/testing/selftests/kvm/lib/x86/memstress.c +1 -1
@@ -40,7 +40,7 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 vcpu_id) *(u64 *)vmx->stack = vcpu_id;prepare_vmcs (vmx, memstress_l2_guest_entry); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_VMCALL );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1 -1
@@ -83,7 +83,7 @@ static void l1_vmx_code(struct vmx_pages *vmx) vmreadz(CPU_BASED_VM_EXEC_CONTROL) | CPU_BASED_USE_MSR_BITMAPS);GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code)); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch (); }static void guest_code (void *nested_test_data)
tools/testing/selftests/kvm/x86/evmcs_smm_controls_test.c +1 -1
@@ -59,7 +59,7 @@ static void guest_code(struct vmx_pages *vmx_pages,GUEST_ASSERT (load_evmcs (hv_pages));prepare_vmcs (vmx_pages, l2_guest_code); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();/* L2 exits via vmcall if test fails */ sync_with_host (2 );
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +11 -11
@@ -105,7 +105,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,GUEST_SYNC (5 ); current_evmcs->revision_id =-1u ; -GUEST_ASSERT (vmlaunch ()); +GUEST_ASSERT (__vmlaunch ()); current_evmcs->revision_id =EVMCS_VERSION ;GUEST_SYNC (6 );
@@ -120,7 +120,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages, current_vp_assist->nested_control.features.directhypercall =1 ; *(u32 *)(hv_pages->partition_assist) =0 ; -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_EXCEPTION_NMI );GUEST_ASSERT_EQ ((vmreadz (VM_EXIT_INTR_INFO ) &0xff ),NMI_VECTOR );GUEST_ASSERT (vmptrst () == hv_pages->enlightened_vmcs_gpa);
@@ -130,7 +130,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,* up-to-date (RIP points where it should and not at the beginning * of l2_guest_code(). GUEST_SYNC(9) checks that. */ -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_SYNC (10 );
@@ -141,13 +141,13 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,vmwrite (CPU_BASED_VM_EXEC_CONTROL ,vmreadz (CPU_BASED_VM_EXEC_CONTROL ) |CPU_BASED_USE_MSR_BITMAPS );__set_bit (MSR_FS_BASE &0x1fff , vmx_pages->msr +0x400 ); -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); current_evmcs->guest_rip +=2 ;/* rdmsr */ /* Enable enlightened MSR bitmap */ current_evmcs->hv_enlightenments_control.msr_bitmap =1 ; -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); current_evmcs->guest_rip +=2 ;/* rdmsr */
@@ -155,14 +155,14 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,__set_bit (MSR_GS_BASE &0x1fff , vmx_pages->msr +0x400 );/* Make sure HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP is set */ current_evmcs->hv_clean_fields |=HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP ; -GUEST_ASSERT (!vmresume ()); +vmresume ();/* Make sure we don't see EXIT_REASON_MSR_READ here so eMSR bitmap works */ GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); current_evmcs->guest_rip +=3 ;/* vmcall */ /* Now tell KVM we've changed MSR-Bitmap */ current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP ; -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); current_evmcs->guest_rip +=2 ;/* rdmsr */
@@ -170,15 +170,15 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,* L2 TLB flush test. First VMCALL should be handled directly by L0, * no VMCALL exit expected. */ -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); current_evmcs->guest_rip +=2 ;/* rdmsr */ /* Enable synthetic vmexit */ *(u32 *)(hv_pages->partition_assist) =1 ; -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==HV_VMX_SYNTHETIC_EXIT_REASON_TRAP_AFTER_FLUSH ); -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_SYNC (11 );
@@ -192,7 +192,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,*/ GUEST_SYNC (12 );evmcs_vmptrld (0xdeadbeef , hv_pages->enlightened_vmcs); -GUEST_ASSERT (vmlaunch ()); +GUEST_ASSERT (__vmlaunch ());GUEST_ASSERT (ud_count ==1 );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/kvm_buslock_test.c +1 -1
@@ -48,7 +48,7 @@ static void l1_vmx_code(struct vmx_pages *vmx)prepare_vmcs (vmx,NULL );GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code)); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch (); }static void guest_code (void *test_data)
tools/testing/selftests/kvm/x86/nested_close_kvm_test.c +1 -1
@@ -36,7 +36,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)/* Prepare the VMCS for L2 execution. */ prepare_vmcs (vmx_pages, l2_guest_code); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (0 ); }
tools/testing/selftests/kvm/x86/nested_dirty_log_test.c +1 -1
@@ -104,7 +104,7 @@ void l1_vmx_code(struct vmx_pages *vmx)prepare_vmcs (vmx, l2_rip);GUEST_SYNC (TEST_SYNC_NO_FAULT ); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_SYNC (TEST_SYNC_NO_FAULT );GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_VMCALL );GUEST_DONE ();
tools/testing/selftests/kvm/x86/nested_emulation_test.c +1 -1
@@ -102,7 +102,7 @@ static void guest_code(void *test_data) exit_insn_len = vmcb->control.next_rip - vmcb->save.rip;GUEST_ASSERT_EQ (vmcb->save.rip, (u64 )l2_instruction); }else { -GUEST_ASSERT_EQ (i ?vmresume () :vmlaunch (),0 ); + i ?vmresume () :vmlaunch (); exit_reason =vmreadz (VM_EXIT_REASON ); exit_insn_len =vmreadz (VM_EXIT_INSTRUCTION_LEN );GUEST_ASSERT_EQ (vmreadz (GUEST_RIP ), (u64 )l2_instruction);
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +1 -1
@@ -112,7 +112,7 @@ static void vmx_run_l2(void *l2_code, int vector, u32 error_code) {GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_code)); -GUEST_ASSERT_EQ (vector ==SS_VECTOR ?vmlaunch () :vmresume (),0 ); + vector ==SS_VECTOR ?vmlaunch () :vmresume ();if (vector ==FAKE_TRIPLE_FAULT_VECTOR )return ;
tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c +2 -2
@@ -48,13 +48,13 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)/* Try to run L2 with invalid CR3 and make sure it fails */ save_cr3 =vmreadz (GUEST_CR3 );vmwrite (GUEST_CR3 ,-1ull ); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) == (EXIT_REASON_FAILED_VMENTRY |EXIT_REASON_INVALID_STATE ));/* Now restore CR3 and make sure L2 runs successfully */ vmwrite (GUEST_CR3 , save_cr3); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_DONE ();
tools/testing/selftests/kvm/x86/nested_tdp_fault_test.c +1 -1
@@ -60,7 +60,7 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 expected_fault_gpa,prepare_vmcs (vmx, l2_entry); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();/* Verify we got an EPT violation exit */ __GUEST_ASSERT(vmreadz(VM_EXIT_REASON) == EXIT_REASON_EPT_VIOLATION,
tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c +1 -1
@@ -95,7 +95,7 @@ static void l1_guest_code(void *data)vmwrite (CPU_BASED_VM_EXEC_CONTROL , control);vmwrite (TSC_OFFSET ,TSC_OFFSET_VALUE ); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); }else {struct svm_test_data *svm = data;
tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c +1 -1
@@ -125,7 +125,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)vmwrite (TSC_MULTIPLIER_HIGH ,TSC_MULTIPLIER_L2 >>32 );/* launch L2 */ -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );/* check that L1's frequency still looks good */
tools/testing/selftests/kvm/x86/save_restore_pf_stress_test.c +2 -2
@@ -104,11 +104,11 @@ static void l1_vmx_code(struct vmx_pages *vmx)GUEST_ASSERT (!vmwrite (EXCEPTION_BITMAP ,BIT (UD_VECTOR ))); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();while (1 ) {GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_EXCEPTION_NMI );GUEST_ASSERT_EQ (vmreadz (VM_EXIT_INTR_INFO ) &0xff ,UD_VECTOR ); -GUEST_ASSERT (!vmresume ()); +vmresume (); } }
tools/testing/selftests/kvm/x86/state_test.c +12 -12
@@ -87,20 +87,20 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)GUEST_SYNC (5 );GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );/* Check that the launched state is preserved. */ -GUEST_ASSERT (vmlaunch ()); +GUEST_ASSERT (__vmlaunch ()); -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_SYNC (7 );GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );vmwrite (GUEST_RIP ,vmreadz (GUEST_RIP ) +3 );
@@ -109,27 +109,27 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)vmwrite (VMCS_LINK_POINTER , vmx_pages->shadow_vmcs_gpa);vmptrld (vmx_pages->shadow_vmcs_gpa); -GUEST_ASSERT (vmlaunch ()); +GUEST_ASSERT (__vmlaunch ());GUEST_SYNC (8 ); -GUEST_ASSERT (vmlaunch ()); -GUEST_ASSERT (vmresume ()); +GUEST_ASSERT (__vmlaunch ()); +GUEST_ASSERT (__vmresume ());vmwrite (GUEST_RIP ,0xc0ffee );GUEST_SYNC (9 );GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffee );vmptrld (vmx_pages->vmcs_gpa); -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );vmptrld (vmx_pages->shadow_vmcs_gpa);GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffffee ); -GUEST_ASSERT (vmlaunch ()); -GUEST_ASSERT (vmresume ()); +GUEST_ASSERT (__vmlaunch ()); +GUEST_ASSERT (__vmresume ());GUEST_SYNC (13 );GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffffee ); -GUEST_ASSERT (vmlaunch ()); -GUEST_ASSERT (vmresume ()); +GUEST_ASSERT (__vmlaunch ()); +GUEST_ASSERT (__vmresume ()); }static void __attribute__((__flatten__))guest_code (void *arg)
tools/testing/selftests/kvm/x86/triple_fault_event_test.c +1 -1
@@ -30,7 +30,7 @@ void l1_guest_code_vmx(struct vmx_pages *vmx)prepare_vmcs (vmx, l2_guest_code); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();/* L2 should triple fault after a triple fault event injected. */ GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_TRIPLE_FAULT );GUEST_DONE ();
tools/testing/selftests/kvm/x86/vmx_apic_access_test.c +2 -2
@@ -53,14 +53,14 @@ static void l1_guest_code(struct vmx_pages *vmx_pages, unsigned long high_gpa)/* Try to launch L2 with the memory-backed APIC-access address. */ GUEST_SYNC (vmreadz (APIC_ACCESS_ADDR )); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );vmwrite (APIC_ACCESS_ADDR , high_gpa);/* Try to resume L2 with the unbacked APIC-access address. */ GUEST_SYNC (vmreadz (APIC_ACCESS_ADDR )); -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_DONE ();
tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c +2 -2
@@ -62,7 +62,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)* Run L2 to switch to x2APIC mode, which in turn will uninhibit APICv, * as KVM should force the APIC ID back to its default. */ -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );vmwrite (GUEST_RIP ,vmreadz (GUEST_RIP ) +vmreadz (VM_EXIT_INSTRUCTION_LEN ));GUEST_ASSERT (rdmsr (MSR_IA32_APICBASE ) &MSR_IA32_APICBASE_EXTD );
@@ -90,7 +90,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)* handles the x2APIC => xAPIC transition and inhibits APICv while L2 * is active. */ -GUEST_ASSERT (!vmresume ()); +vmresume ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_ASSERT (!(rdmsr (MSR_IA32_APICBASE ) &MSR_IA32_APICBASE_EXTD ));
tools/testing/selftests/kvm/x86/vmx_invalid_nested_guest_state.c +1 -1
@@ -55,7 +55,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (!(vmreadz (CPU_BASED_VM_EXEC_CONTROL ) &CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ) || !(vmreadz (SECONDARY_VM_EXEC_CONTROL ) &SECONDARY_EXEC_UNRESTRICTED_GUEST )); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();/* L2 should triple fault after main() stuffs invalid guest state. */ GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_TRIPLE_FAULT );
tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c +1 -1
@@ -56,7 +56,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages) guest_cr4 &= ~X86_CR4_LA57 ;vmwrite (GUEST_CR4 , guest_cr4); -GUEST_ASSERT (!vmlaunch ()); +vmlaunch (); exit_reason =vmreadz (VM_EXIT_REASON );GUEST_ASSERT (exit_reason ==EXIT_REASON_VMCALL );
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c +2 -2
@@ -90,7 +90,7 @@ void l1_guest_code(struct vmx_pages *vmx_pages) !(ctrl_exit_rev.clr & VM_EXIT_SAVE_VMX_PREEMPTION_TIMER)) return; -GUEST_ASSERT (!vmlaunch ()); +vmlaunch ();GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );vmwrite (GUEST_RIP ,vmreadz (GUEST_RIP ) +vmreadz (VM_EXIT_INSTRUCTION_LEN ));
@@ -110,7 +110,7 @@ void l1_guest_code(struct vmx_pages *vmx_pages) l1_vmx_pt_start = (rdtsc () >> vmx_pt_rate) << vmx_pt_rate; -GUEST_ASSERT (!vmresume ()); +vmresume (); l1_vmx_pt_finish =rdtsc ();
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v3 13/13] KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
Quoted 5 lines · Sean Christopherson
Add double-underscore helpers for VMLAUNCH and VMRESUME, and have the "outer" APIs assert success, as is common through KVM selftests. In addition to providing more familiar interfaces, this makes it more obvious which paths expect VM-Enter *failure*.
Nice.
Quoted 2 lines
Signed-off-by Sean Christopherson <[email protected]>
Few semi-related comments below.
[..]
tools/testing/selftests/kvm/x86/aperfmperf_test.c static void l1_vmx_code(struct vmx_pages *vmx) · line 85
Quoted 8 lines
tools/testing/selftests/kvm/x86/aperfmperf_test.c +0
-0@@ -83,7 +83,7 @@ static void l1_vmx_code(struct vmx_pages *vmx) vmreadz(CPU_BASED_VM_EXEC_CONTROL) | CPU_BASED_USE_MSR_BITMAPS);GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code));
Do we wanna give the same treatment to vmwrite()?
Quoted 5 lines
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1
-1-GUEST_ASSERT (!vmlaunch ()); +vmlaunch (); }static void guest_code (void *nested_test_data)
[..]
tools/testing/selftests/kvm/x86/nested_emulation_test.c static void guest_code(void *test_data) · line 105
Quoted 10 lines
tools/testing/selftests/kvm/x86/nested_emulation_test.c +1
-1@@ -102,7 +102,7 @@ static void guest_code(void *test_data) exit_insn_len = vmcb->control.next_rip - vmcb->save.rip;GUEST_ASSERT_EQ (vmcb->save.rip, (u64 )l2_instruction); }else { -GUEST_ASSERT_EQ (i ?vmresume () :vmlaunch (),0 ); + i ?vmresume () :vmlaunch ();
Ewww
tools/testing/selftests/kvm/x86/nested_exceptions_test.c static void vmx_run_l2(void *l2_code, int vector, u32 error_code) · line 115
Quoted 13 lines
tools/testing/selftests/kvm/x86/nested_emulation_test.c +0
-0exit_reason =vmreadz (VM_EXIT_REASON ); exit_insn_len =vmreadz (VM_EXIT_INSTRUCTION_LEN );GUEST_ASSERT_EQ (vmreadz (GUEST_RIP ), (u64 )l2_instruction);tools/testing/selftests/kvm/x86/nested_exceptions_test.c +1
-1@@ -112,7 +112,7 @@ static void vmx_run_l2(void *l2_code, int vector, u32 error_code) {GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_code)); -GUEST_ASSERT_EQ (vector ==SS_VECTOR ?vmlaunch () :vmresume (),0 ); + vector ==SS_VECTOR ?vmlaunch () :vmresume ();
Ewwwww
Can we make these if/else statements? It was already ugly, but it looks even more ugly outside of GUEST_ASSERT_EQ().
Quoted 3 lines
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +0
-0if (vector ==FAKE_TRIPLE_FAULT_VECTOR )return ;
Sean Christopherson
maintainerRe: [PATCH v3 13/13] KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
Quoted 11 lines · Yosry Ahmed
tools/testing/selftests/kvm/x86/aperfmperf_test.c static void l1_vmx_code(struct vmx_pages *vmx) · line 85
Quoted 8 lines · Sean Christopherson
tools/testing/selftests/kvm/x86/aperfmperf_test.c +0
-0@@ -83,7 +83,7 @@ static void l1_vmx_code(struct vmx_pages *vmx) vmreadz(CPU_BASED_VM_EXEC_CONTROL) | CPU_BASED_USE_MSR_BITMAPS);GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code));Do we wanna give the same treatment to
vmwrite()?
Yes, and vmreadz(). Assuming '0' is simultaneously a reasonable failure and "safe" value is so stupid, especially since AFAICT literally none of the users actually need to gracefully tolerate failure.
LOL, and it can't possibly work, because vmread() clobbers the zeroed value on VM-Fail. Hilarious.
I didn't include those changes purely because I had "#$*@ this code" fatigue. :-) But since this is going to conflict the world over, yeah, it makes sense to just fix everything.
Quoted 30 lines
Quoted 5 lines
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1
-1-GUEST_ASSERT (!vmlaunch ()); +vmlaunch (); }static void guest_code (void *nested_test_data)[..]
tools/testing/selftests/kvm/x86/nested_emulation_test.c static void guest_code(void *test_data) · line 105
Quoted 10 lines
tools/testing/selftests/kvm/x86/nested_emulation_test.c +1
-1@@ -102,7 +102,7 @@ static void guest_code(void *test_data) exit_insn_len = vmcb->control.next_rip - vmcb->save.rip;GUEST_ASSERT_EQ (vmcb->save.rip, (u64 )l2_instruction); }else { -GUEST_ASSERT_EQ (i ?vmresume () :vmlaunch (),0 ); + i ?vmresume () :vmlaunch ();Ewww
Quoted 11 lines
tools/testing/selftests/kvm/x86/nested_emulation_test.c +0
-0exit_reason =vmreadz (VM_EXIT_REASON ); exit_insn_len =vmreadz (VM_EXIT_INSTRUCTION_LEN );GUEST_ASSERT_EQ (vmreadz (GUEST_RIP ), (u64 )l2_instruction);tools/testing/selftests/kvm/x86/nested_exceptions_test.c +0
-0@@ -112,7 +112,7 @@ static void vmx_run_l2(void *l2_code, int vector, u32 error_code) {GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_code));
Quoted 7 lines
tools/testing/selftests/kvm/x86/nested_exceptions_test.c static void vmx_run_l2(void *l2_code, int vector, u32 error_code) · line 115
Quoted 2 lines
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +1
-1-GUEST_ASSERT_EQ (vector ==SS_VECTOR ?vmlaunch () :vmresume (),0 ); + vector ==SS_VECTOR ?vmlaunch () :vmresume ();Ewwwww
Can we make these if/else statements? It was already ugly, but it looks even more ugly outside of
GUEST_ASSERT_EQ().
Yeah. Another idea would be:
void vmenter(bool do_vmlaunch)
{
if (do_vmlaunch)
vmlaunch();
else
vmresume();}
To yield:
vmenter(vector == SS_VECTOR); vmenter(!i);
Never mind, that's a terrible idea, the call sites are inscrutable.
Re: [PATCH v3 13/13] KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
Quoted 73 lines · Sean Christopherson
Quoted 11 lines · Yosry Ahmed
tools/testing/selftests/kvm/x86/aperfmperf_test.c static void l1_vmx_code(struct vmx_pages *vmx) · line 85
Quoted 8 lines · Sean Christopherson
tools/testing/selftests/kvm/x86/aperfmperf_test.c +0
-0@@ -83,7 +83,7 @@ static void l1_vmx_code(struct vmx_pages *vmx) vmreadz(CPU_BASED_VM_EXEC_CONTROL) | CPU_BASED_USE_MSR_BITMAPS);GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code));Do we wanna give the same treatment to
vmwrite()?Yes, and
vmreadz(). Assuming '0' is simultaneously a reasonable failure and "safe" value is so stupid, especially since AFAICT literally none of the users actually need to gracefully tolerate failure.LOL, and it can't possibly work, because
vmread()clobbers the zeroed value on VM-Fail. Hilarious.I didn't include those changes purely because I had "#$*@ this code" fatigue. :-) But since this is going to conflict the world over, yeah, it makes sense to just fix everything.
Quoted 30 lines
Quoted 5 lines
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1
-1-GUEST_ASSERT (!vmlaunch ()); +vmlaunch (); }static void guest_code (void *nested_test_data)[..]
tools/testing/selftests/kvm/x86/nested_emulation_test.c static void guest_code(void *test_data) · line 105
Quoted 10 lines
tools/testing/selftests/kvm/x86/nested_emulation_test.c +1
-1@@ -102,7 +102,7 @@ static void guest_code(void *test_data) exit_insn_len = vmcb->control.next_rip - vmcb->save.rip;GUEST_ASSERT_EQ (vmcb->save.rip, (u64 )l2_instruction); }else { -GUEST_ASSERT_EQ (i ?vmresume () :vmlaunch (),0 ); + i ?vmresume () :vmlaunch ();Ewww
Quoted 11 lines
tools/testing/selftests/kvm/x86/nested_emulation_test.c +0
-0exit_reason =vmreadz (VM_EXIT_REASON ); exit_insn_len =vmreadz (VM_EXIT_INSTRUCTION_LEN );GUEST_ASSERT_EQ (vmreadz (GUEST_RIP ), (u64 )l2_instruction);tools/testing/selftests/kvm/x86/nested_exceptions_test.c +0
-0@@ -112,7 +112,7 @@ static void vmx_run_l2(void *l2_code, int vector, u32 error_code) {GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_code));Quoted 7 lines
tools/testing/selftests/kvm/x86/nested_exceptions_test.c static void vmx_run_l2(void *l2_code, int vector, u32 error_code) · line 115
Quoted 2 lines
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +1
-1-GUEST_ASSERT_EQ (vector ==SS_VECTOR ?vmlaunch () :vmresume (),0 ); + vector ==SS_VECTOR ?vmlaunch () :vmresume ();Ewwwww
Can we make these if/else statements? It was already ugly, but it looks even more ugly outside of
GUEST_ASSERT_EQ().Yeah. Another idea would be:
void vmenter(bool do_vmlaunch) { if (do_vmlaunch) vmlaunch(); else vmresume(); }
Quoted 6 lines
To yield:
vmenter(vector == SS_VECTOR); vmenter(!i);Never mind, that's a terrible idea, the call sites are inscrutable.
Yeah, but I do agree that vmlaunch() vs vmresume() handling in selftests is annoying (e.g. see run_l2() in [1]).
If you wanna go scorched earth on the nested VMX infra, what if we track launch vs resume (e.g. set launch=true in prepare_vmcs() and lauch=false in vmlaunch()), then provide a single vmenter() API for tests (with no arguments)?
Sean Christopherson
maintainerRe: [PATCH v3 13/13] KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
Quoted 18 lines · Yosry Ahmed
Quoted 10 lines · Sean Christopherson
Yeah. Another idea would be:
void vmenter(bool do_vmlaunch) { if (do_vmlaunch) vmlaunch(); else vmresume(); }Quoted 6 lines
To yield:
vmenter(vector == SS_VECTOR); vmenter(!i);Never mind, that's a terrible idea, the call sites are inscrutable.
Quoted 7 lines
Yeah, but I do agree that
vmlaunch()vsvmresume()handling in selftests is annoying (e.g. seerun_l2()in [1]).If you wanna go scorched earth on the nested VMX infra, what if we track launch vs resume (e.g. set launch=true in
prepare_vmcs()and lauch=false invmlaunch()), then provide a singlevmenter()API for tests (with no arguments)?
For selftests, it would be much more difficult to do correctly, as compared to KUT. KUT has a "fixed" number of vCPUs, doesn't need to worry about pCPU:vCPU bindings, and has a strong need for per-vCPU state for other reasons (because it's more like per-pCPU state than per-vCPU state).
Selftests doesn't have per-vCPU state, so making the tracking thread-safe would be challenging. And I don't really want to add per-vCPU state because making GS (or FS) off-limits is actually problematic when the goal is often to do "bad" things to vCPU state (I've debugged weird KUT failures due to GS getting clobbered more than once).
Quoted 1 line
Re: [PATCH v3 13/13] KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
Quoted 33 lines · Sean Christopherson
Quoted 18 lines · Yosry Ahmed
Quoted 10 lines · Sean Christopherson
Yeah. Another idea would be:
void vmenter(bool do_vmlaunch) { if (do_vmlaunch) vmlaunch(); else vmresume(); }Quoted 6 lines
To yield:
vmenter(vector == SS_VECTOR); vmenter(!i);Never mind, that's a terrible idea, the call sites are inscrutable.
Quoted 7 lines
Yeah, but I do agree that
vmlaunch()vsvmresume()handling in selftests is annoying (e.g. seerun_l2()in [1]).If you wanna go scorched earth on the nested VMX infra, what if we track launch vs resume (e.g. set launch=true in
prepare_vmcs()and lauch=false invmlaunch()), then provide a singlevmenter()API for tests (with no arguments)?For selftests, it would be much more difficult to do correctly, as compared to KUT. KUT has a "fixed" number of vCPUs, doesn't need to worry about pCPU:vCPU bindings, and has a strong need for per-vCPU state for other reasons (because it's more like per-pCPU state than per-vCPU state).
Quoted 5 lines
Selftests doesn't have per-vCPU state, so making the tracking thread-safe would be challenging. And I don't really want to add per-vCPU state because making GS (or FS) off-limits is actually problematic when the goal is often to do "bad" things to vCPU state (I've debugged weird KUT failures due to GS getting clobbered more than once).
Isn't vmx_pages effectively per-vCPU state (for nested)?
Quoted 2 lines
Quoted 2 lines
Sean Christopherson
maintainerRe: [PATCH v3 13/13] KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
Quoted 34 lines · Yosry Ahmed
Quoted 33 lines · Sean Christopherson
Quoted 18 lines · Yosry Ahmed
Quoted 10 lines · Sean Christopherson
Yeah. Another idea would be:
void vmenter(bool do_vmlaunch) { if (do_vmlaunch) vmlaunch(); else vmresume(); }Quoted 6 lines
To yield:
vmenter(vector == SS_VECTOR); vmenter(!i);Never mind, that's a terrible idea, the call sites are inscrutable.
Quoted 7 lines
Yeah, but I do agree that
vmlaunch()vsvmresume()handling in selftests is annoying (e.g. seerun_l2()in [1]).If you wanna go scorched earth on the nested VMX infra, what if we track launch vs resume (e.g. set launch=true in
prepare_vmcs()and lauch=false invmlaunch()), then provide a singlevmenter()API for tests (with no arguments)?For selftests, it would be much more difficult to do correctly, as compared to KUT. KUT has a "fixed" number of vCPUs, doesn't need to worry about pCPU:vCPU bindings, and has a strong need for per-vCPU state for other reasons (because it's more like per-pCPU state than per-vCPU state).
Quoted 7 lines
Quoted 5 lines
Selftests doesn't have per-vCPU state, so making the tracking thread-safe would be challenging. And I don't really want to add per-vCPU state because making GS (or FS) off-limits is actually problematic when the goal is often to do "bad" things to vCPU state (I've debugged weird KUT failures due to GS getting clobbered more than once).
Isn't
vmx_pageseffectively per-vCPU state (for nested)?
Yeah, but you said "with no arguments", there are tests that use helpers, and IMO passing in a vmx_pages pointer is uglier than implicitly tracking launched state.
Re: [PATCH v3 13/13] KVM: selftests: Add and use double-underscore versions of vmlaunch() and vmresume()
Quoted 42 lines · Sean Christopherson
Quoted 40 lines · Yosry Ahmed
Quoted 38 lines · Sean Christopherson
Quoted 18 lines · Yosry Ahmed
Quoted 10 lines · Sean Christopherson
Yeah. Another idea would be:
void vmenter(bool do_vmlaunch) { if (do_vmlaunch) vmlaunch(); else vmresume(); }Quoted 6 lines
To yield:
vmenter(vector == SS_VECTOR); vmenter(!i);Never mind, that's a terrible idea, the call sites are inscrutable.
Quoted 7 lines
Yeah, but I do agree that
vmlaunch()vsvmresume()handling in selftests is annoying (e.g. seerun_l2()in [1]).If you wanna go scorched earth on the nested VMX infra, what if we track launch vs resume (e.g. set launch=true in
prepare_vmcs()and lauch=false invmlaunch()), then provide a singlevmenter()API for tests (with no arguments)?For selftests, it would be much more difficult to do correctly, as compared to KUT. KUT has a "fixed" number of vCPUs, doesn't need to worry about pCPU:vCPU bindings, and has a strong need for per-vCPU state for other reasons (because it's more like per-pCPU state than per-vCPU state).
Selftests doesn't have per-vCPU state, so making the tracking thread-safe would be challenging. And I don't really want to add per-vCPU state because making GS (or FS) off-limits is actually problematic when the goal is often to do "bad" things to vCPU state (I've debugged weird KUT failures due to GS getting clobbered more than once).
Quoted 5 lines
Quoted 1 line
Isn't
vmx_pageseffectively per-vCPU state (for nested)?Yeah, but you said "with no arguments", there are tests that use helpers, and IMO passing in a
vmx_pagespointer is uglier than implicitly tracking launched state.
That's fair.