KVM: nVMX: Adjust VMPTRLD/VMPTRST behavior with active eVMCS
Sean Christopherson
maintainerv4 cover KVM: nVMX: Adjust VMPTRLD/VMPTRST behavior with active eVMCS
The first four patches are 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 churn piled on top came from wanting to use KVM_ASM_SAFE() for more VMX instructions to verify the RFLAGS bug+fix Sashiko pointed out, lack impulse control when it comes to cleanups, and Yosry being a bad/good influence.
v4:
- Redo the VMLAUNCH/VMRESUME handling, dedup eVMCS as well. [Yosry]
- Give vmread() and vmwrite() the same treatment. [Yosry]
- Drop pointless returns from eVMCS setup.
v3:
- https://lore.kernel.org/all/[email protected]
- MOAR PATCHES.
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 (13):
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: Drop dead return code from evmcs_vmptrld() and
load_evmcs()
KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
KVM: selftests: Assert success in vmlaunch() and vmresume()
KVM: selftests: Add __vmwrite() and use it when initializing optional
fields.
KVM: selftests: Always assert that vmwrite() succeeds
KVM: selftests: Always assert that vmreadz() succeeds
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 | 78 +-------- .../selftests/kvm/include/x86/processor.h | 2 +- tools/testing/selftests/kvm/include/x86/vmx.h | 165 ++++++------------ .../testing/selftests/kvm/lib/x86/memstress.c | 8 +- tools/testing/selftests/kvm/lib/x86/vmx.c | 143 ++++++++++----- .../selftests/kvm/x86/aperfmperf_test.c | 10 +- .../kvm/x86/evmcs_smm_controls_test.c | 6 +- .../testing/selftests/kvm/x86/hyperv_evmcs.c | 83 +++++---- .../selftests/kvm/x86/kvm_buslock_test.c | 8 +- .../selftests/kvm/x86/nested_close_kvm_test.c | 6 +- .../selftests/kvm/x86/nested_dirty_log_test.c | 8 +- .../selftests/kvm/x86/nested_emulation_test.c | 23 +-- .../kvm/x86/nested_exceptions_test.c | 29 +-- .../kvm/x86/nested_invalid_cr3_test.c | 14 +- .../selftests/kvm/x86/nested_tdp_fault_test.c | 16 +- .../kvm/x86/nested_tsc_adjust_test.c | 10 +- .../kvm/x86/nested_tsc_scaling_test.c | 12 +- .../kvm/x86/save_restore_pf_stress_test.c | 14 +- tools/testing/selftests/kvm/x86/smm_test.c | 4 +- tools/testing/selftests/kvm/x86/state_test.c | 70 ++++---- .../kvm/x86/triple_fault_event_test.c | 8 +- .../selftests/kvm/x86/vmx_apic_access_test.c | 20 +-- .../kvm/x86/vmx_apicv_updates_test.c | 16 +- .../kvm/x86/vmx_invalid_nested_guest_state.c | 12 +- .../kvm/x86/vmx_nested_la57_state_test.c | 10 +- .../kvm/x86/vmx_preemption_timer_test.c | 24 ++- 27 files changed, 387 insertions(+), 436 deletions(-)
base-commit: 76671054f9a1ff6abb976583cd8da37650acdc97
Signature · 1 line
2.55.0.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 1/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 2/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 3/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 4/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 5/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 6/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 7/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 8/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 9/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 10/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 11/17 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.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 12/17 KVM: selftests: Drop dead return code from evmcs_vmptrld() and load_evmcs()
In reply to Sean ChristophersonDrop the return codes from evmcs_vmptrld() and load_evmcs() as they are hardcoded to return '0' and "true" respectively.
No functional change intended.
--- tools/testing/selftests/kvm/include/x86/evmcs.h | 12 +++--------- .../selftests/kvm/x86/evmcs_smm_controls_test.c | 2 +- tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-)
tools/testing/selftests/kvm/include/x86/evmcs.h +3 -9
@@ -245,24 +245,18 @@ static inline void evmcs_enable(void) enable_evmcs = true; } -static inline int evmcs_vmptrld (u64 vmcs_pa,void *vmcs) +static inline void evmcs_vmptrld (u64 vmcs_pa,void *vmcs) { current_vp_assist->current_nested_vmcs = vmcs_pa; current_vp_assist->enlighten_vmentry =1 ; current_evmcs = vmcs; - -return 0 ; } -static inline bool load_evmcs (struct hyperv_test_pages *hv) +static inline void load_evmcs (struct hyperv_test_pages *hv) { -if (evmcs_vmptrld (hv->enlightened_vmcs_gpa, hv->enlightened_vmcs)) -return false; - +evmcs_vmptrld (hv->enlightened_vmcs_gpa, hv->enlightened_vmcs); current_evmcs->revision_id =EVMCS_VERSION ; - -return true; }static inline int evmcs_vmread (u64 encoding,u64 *value)
tools/testing/selftests/kvm/x86/evmcs_smm_controls_test.c +1 -1
@@ -56,7 +56,7 @@ static void guest_code(struct vmx_pages *vmx_pages,evmcs_enable ();prepare_for_vmx_operation (vmx_pages); -GUEST_ASSERT (load_evmcs (hv_pages)); +load_evmcs (hv_pages);prepare_vmcs (vmx_pages, l2_guest_code);GUEST_ASSERT (!vmlaunch ());
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +1 -1
@@ -95,7 +95,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,prepare_for_vmx_operation (vmx_pages);GUEST_SYNC (3 ); -GUEST_ASSERT (load_evmcs (hv_pages)); +load_evmcs (hv_pages);/* VMPTRST returns -1 until VMLAUNCH with eVMCS ptr set */ GUEST_ASSERT (vmptrst () ==-1 );
Signature · 1 line
2.55.0.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 13/17 KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME
In reply to Sean ChristophersonDedup the assembly code for VMLAUNCH vs. VMRESUME, for both architectural VMCS and eVMCS, as the difference is literally only the actual VM-Enter instruction for VMLAUNCH vs. VMRESUME, and VMWRITE vs. MOV for VMCS vs. eVMCS.
Opportunistically place the implementations in vmx.c so that the lengthy sequence (~580 bytes of code) aren't inlined for every single VM-Enter.
000000000041b910 <__vmlaunch>:
41b910: 80 3d 61 5e 10 00 00 cmpb $0x0,0x105e61(%rip) # 521778 <enable_evmcs> 41b917: 0f 85 13 01 00 00 jne 41ba30 <__vmlaunch+0x120> 41b91d: ba 14 6c 00 00 mov $0x6c14,%edx 41b922: b9 16 6c 00 00 mov $0x6c16,%ecx 41b927: 6a 00 push $0x0 41b929: 0f 79 d4 vmwrite %rsp,%rdx 41b92c: 48 8d 05 82 00 00 00 lea 0x82(%rip),%rax # 41b9b5 <__vmlaunch+0xa5> 41b933: 0f 79 c8 vmwrite %rax,%rcx <xchg GPRs> 41b9ae: 0f 01 c2 vmlaunch 41b9b1: 48 ff 04 24 incq (%rsp) <xchg GPRs> 41ba2d: 58 pop %rax 41ba2e: c3 ret 41ba2f: 90 nop 41ba30: 48 8b 35 39 5d 10 00 mov 0x105d39(%rip),%rsi # 521770 <current_evmcs> 41ba37: c7 86 38 03 00 00 00 00 00 00 movl $0x0,0x338(%rsi) 41ba41: 6a 00 push $0x0 41ba43: 48 89 a6 68 02 00 00 mov %rsp,0x268(%rsi) 41ba4a: 48 8d 05 83 00 00 00 lea 0x83(%rip),%rax # 41bad4 <__vmlaunch+0x1c4> 41ba51: 48 89 46 50 mov %rax,0x50(%rsi) <xchg GPRs> 41bacd: 0f 01 c2 vmlaunch 41bad0: 48 ff 04 24 incq (%rsp) <xchg GPRs> 41bb4c: 58 pop %rax 41bb4d: c3 ret
No functional change intended (though the code generation will be quite different).
--- .../testing/selftests/kvm/include/x86/evmcs.h | 58 ------------------- tools/testing/selftests/kvm/include/x86/vmx.h | 47 ++------------- tools/testing/selftests/kvm/lib/x86/vmx.c | 55 ++++++++++++++++++ 3 files changed, 60 insertions(+), 100 deletions(-)
tools/testing/selftests/kvm/include/x86/evmcs.h +0 -58
@@ -1187,62 +1187,4 @@ static inline int evmcs_vmwrite(u64 encoding, u64 value) return 0; } -static inline int evmcs_vmlaunch (void ) -{ -int ret; - - current_evmcs->hv_clean_fields =0 ; - - __asm__ __volatile__("push $0;" -"mov %%rsp, (%[host_rsp]);" -"lea 1f(%%rip), %%rax;" -"mov %%rax, (%[host_rip]);" -VMX_SWITCH_GPRS_ASM -"vmlaunch;" -"incq (%%rsp);" -"1: ;" -VMX_SWITCH_GPRS_ASM -"pop %%rax;" - : [ret]"=&a" (ret) - : [host_rsp]"r" - ((u64)¤t_evmcs->host_rsp), - [host_rip]"r" - ((u64)¤t_evmcs->host_rip), - GUEST_REGS_OFFSETS - :"memory" ,"cc" ); -return ret; -} - -/* -* No guest state (e.g. GPRs) is established by this vmresume. -*/ -static inline int evmcs_vmresume (void ) -{ -int ret; - -/* 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 ; - - __asm__ __volatile__("push $0;" -"mov %%rsp, (%[host_rsp]);" -"lea 1f(%%rip), %%rax;" -"mov %%rax, (%[host_rip]);" -VMX_SWITCH_GPRS_ASM -"vmresume;" -"incq (%%rsp);" -"1: ;" -VMX_SWITCH_GPRS_ASM -"pop %%rax;" - : [ret]"=&a" (ret) - : [host_rsp]"r" - ((u64)¤t_evmcs->host_rsp), - [host_rip]"r" - ((u64)¤t_evmcs->host_rip), - GUEST_REGS_OFFSETS - :"memory" ,"cc" ); -return ret; -} -#endif /* !SELFTEST_KVM_EVMCS_H */
tools/testing/selftests/kvm/include/x86/vmx.h +5 -42
59 lines not on this page · raw message
tools/testing/selftests/kvm/lib/x86/vmx.c +55 -0
61 lines not on this page · raw message
Signature · 1 line
2.55.0.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 14/17 KVM: selftests: Assert success in vmlaunch() and vmresume()
In reply to Sean ChristophersonAssert 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*.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 8 +++---- .../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 | 5 +++- .../kvm/x86/nested_exceptions_test.c | 5 +++- .../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, 57 insertions(+), 51 deletions(-)
tools/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 )
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,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 +4 -1
@@ -102,7 +102,10 @@ 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 ); +if (!i) +vmlaunch (); +else +vmresume (); 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 +4 -1
@@ -112,7 +112,10 @@ 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 ); +if (vector ==SS_VECTOR ) +vmlaunch (); +else +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.979.g7e5102b832-goog
[email protected]
AI reviewRe: [PATCH v4 14/17] KVM: selftests: Assert success in vmlaunch() and vmresume()
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] The vmlaunch() and vmresume() wrappers are defined as static inline functions instead of macros.…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] The vmlaunch() and vmresume() wrappers are defined as static inline functions instead of macros. Because __GUEST_ASSERT captures __FILE__ and __LINE__ at the point of its invocation, assertion failures in these wrappers will report the file and line number inside vmx.h rather than the actual caller's location in the test file. --
commit 00cde4aa7e9af50759c8cee7b3f7fecea0caf3ed
Author: Sean Christopherson <[email protected]>
KVM: selftests: Assert success in vmlaunch() and vmresume()
This patch updates the outer vmlaunch and vmresume selftests APIs to assert success directly, deduplicating error checking across tests. Tests expecting VM-Enter failures now explicitly use the double-underscore versions.
Quoted 5 lines
tools/testing/selftests/kvm/include/x86/vmx.h +0
-0
tools/testing/selftests/kvm/include/x86/vmx.h static inline u64 vmptrst(void) · line 368
Quoted 9 lines
tools/testing/selftests/kvm/include/x86/vmx.h +2
-2@@ -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" ); }
[Severity: Medium]
Because __GUEST_ASSERT captures the __FILE__ and __LINE__ macros at the point of its invocation, placing it inside a static inline function will cause assertion failures to always report the location inside vmx.h instead of the actual caller's location in the test file (for example, inside state_test.c or nested_emulation_test.c).
Does this cause a loss of debugging context when a VM-Fail assertion triggers in tests with multiple vmlaunch invocations? Could vmlaunch be defined as a macro instead to preserve the caller's location?
tools/testing/selftests/kvm/include/x86/vmx.h static inline u64 vmptrst(void) · line 373
Quoted 7 lines
tools/testing/selftests/kvm/include/x86/vmx.h +2
-2-static inline int vmresume (void ) +static inline void vmresume (void ) { -return __vmresume (); +__GUEST_ASSERT (!__vmresume (),"vmresume hit VM-Fail" ); }
[Severity: Medium]
Similarly for vmresume, using __GUEST_ASSERT in an inline function will mask the file and line number of the actual test invocation. Would a macro be more appropriate here as well to retain the debugging context?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=14
Sean Christopherson
maintainerPATCH v4 15/17 KVM: selftests: Add __vmwrite() and use it when initializing optional fields.
In reply to Sean ChristophersonAdd __vmwrite() in anticipation of having vmwrite() assert success, and use the "failure allowed" version in the common VMCS setup code, which is the only code that wants to write fields that may or may not exist (although arguably the code should check if the field exists instead of blindly writing).
E.g. When doing initial configuration of a VMCS, the core library doesn't want to assume secondary controls are supported, and so blindly does a VMWRITE and pivots on success/failure.
All usage of vmwrite() outside of common setup already asserts success, or 100% relies on VMWRITE succeeding in order for the test to function correctly.
No functional change intended.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 7 ++++++- tools/testing/selftests/kvm/lib/x86/vmx.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +6 -1
@@ -414,7 +414,7 @@ static inline u64 vmreadz(u64 encoding)return value; } -static inline int vmwrite (u64 encoding,u64 value) +static __always_inline int __vmwrite(u64 encoding, u64 value) {u8 ret;
@@ -429,6 +429,11 @@ static inline int vmwrite(u64 encoding, u64 value)return ret; } +static inline int vmwrite (u64 encoding,u64 value) +{ +return __vmwrite (encoding, value); +} +static inline u32 vmcs_revision (void ) {return rdmsr (MSR_IA32_VMX_BASIC );
tools/testing/selftests/kvm/lib/x86/vmx.c +9 -9
@@ -252,7 +252,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx)u32 sec_exec_ctl =0 ;vmwrite (VIRTUAL_PROCESSOR_ID ,0 ); -vmwrite (POSTED_INTR_NV ,0 ); +__vmwrite (POSTED_INTR_NV ,0 );vmwrite (PIN_BASED_VM_EXEC_CONTROL ,rdmsr (MSR_IA32_VMX_TRUE_PINBASED_CTLS ));
@@ -269,7 +269,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx) sec_exec_ctl |=SECONDARY_EXEC_ENABLE_EPT ; } -if (!vmwrite (SECONDARY_VM_EXEC_CONTROL , sec_exec_ctl)) +if (!__vmwrite (SECONDARY_VM_EXEC_CONTROL , sec_exec_ctl))vmwrite (CPU_BASED_VM_EXEC_CONTROL ,rdmsr (MSR_IA32_VMX_TRUE_PROCBASED_CTLS ) |CPU_BASED_ACTIVATE_SECONDARY_CONTROLS );else {
@@ -289,16 +289,16 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx) VM_ENTRY_IA32E_MODE); /* 64-bit guest */vmwrite (VM_ENTRY_MSR_LOAD_COUNT ,0 );vmwrite (VM_ENTRY_INTR_INFO_FIELD ,0 ); -vmwrite (TPR_THRESHOLD ,0 ); +__vmwrite (TPR_THRESHOLD ,0 );vmwrite (CR0_GUEST_HOST_MASK ,0 );vmwrite (CR4_GUEST_HOST_MASK ,0 );vmwrite (CR0_READ_SHADOW ,get_cr0 ());vmwrite (CR4_READ_SHADOW ,get_cr4 ()); -vmwrite (MSR_BITMAP , vmx->msr_gpa); -vmwrite (VMREAD_BITMAP , vmx->vmread_gpa); -vmwrite (VMWRITE_BITMAP , vmx->vmwrite_gpa); +__vmwrite (MSR_BITMAP , vmx->msr_gpa); +__vmwrite (VMREAD_BITMAP , vmx->vmread_gpa); +__vmwrite (VMWRITE_BITMAP , vmx->vmwrite_gpa); }/*
@@ -356,8 +356,8 @@ static inline void init_vmcs_guest_state(void *rip, void *rsp)vmwrite (GUEST_GS_SELECTOR ,vmreadz (HOST_GS_SELECTOR ));vmwrite (GUEST_LDTR_SELECTOR ,0 );vmwrite (GUEST_TR_SELECTOR ,vmreadz (HOST_TR_SELECTOR )); -vmwrite (GUEST_INTR_STATUS ,0 ); -vmwrite (GUEST_PML_INDEX ,0 ); +__vmwrite (GUEST_INTR_STATUS ,0 ); +__vmwrite (GUEST_PML_INDEX ,0 );vmwrite (VMCS_LINK_POINTER ,-1ll );vmwrite (GUEST_IA32_DEBUGCTL ,0 );
@@ -391,7 +391,7 @@ static inline void init_vmcs_guest_state(void *rip, void *rsp)vmwrite (GUEST_INTERRUPTIBILITY_INFO ,0 );vmwrite (GUEST_ACTIVITY_STATE ,0 );vmwrite (GUEST_SYSENTER_CS ,vmreadz (HOST_IA32_SYSENTER_CS )); -vmwrite (VMX_PREEMPTION_TIMER_VALUE ,0 ); +__vmwrite (VMX_PREEMPTION_TIMER_VALUE ,0 );vmwrite (GUEST_CR0 ,vmreadz (HOST_CR0 ));vmwrite (GUEST_CR3 ,vmreadz (HOST_CR3 ));
Signature · 1 line
2.55.0.979.g7e5102b832-goog
[email protected]
AI reviewRe: [PATCH v4 15/17] KVM: selftests: Add __vmwrite() and use it when initializing optional fields.
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] The patch fails to convert all blind writes of optional VMCS fields to the non-asserting…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] The patch fails to convert all blind writes of optional VMCS fields to the non-asserting __vmwrite() in the common setup code, contradicting its stated intent and setting up a test crash. --
commit 2bdd2a9b67ebe18b99a514555581198b78d1fab6
Author: Sean Christopherson <[email protected]>
KVM: selftests: Add __vmwrite() and use it when initializing optional fields.
This commit introduces __vmwrite(), a non-asserting version of vmwrite(), to allow writing optional VMCS fields in common setup code where success is not guaranteed. It prepares for vmwrite() to unconditionally assert success in subsequent patches.
tools/testing/selftests/kvm/lib/x86/vmx.c static inline void init_vmcs_control_fields(struct vmx_pages *vmx) · line 254
Quoted 8 lines
tools/testing/selftests/kvm/lib/x86/vmx.c +0
-0@@ -252,7 +252,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx)u32 sec_exec_ctl =0 ;vmwrite (VIRTUAL_PROCESSOR_ID ,0 );
[Severity: Medium]
Will this blindly write to the VIRTUAL_PROCESSOR_ID field using the asserting vmwrite()?
Since VPID is an optional secondary control that may not exist on all hardware, this could crash selftests with a VM-Fail assertion on unsupported hardware once vmwrite() is modified to assert success. Could this be converted to __vmwrite() similar to POSTED_INTR_NV?
Quoted 4 lines
tools/testing/selftests/kvm/lib/x86/vmx.c +1
-1-vmwrite (POSTED_INTR_NV ,0 ); +__vmwrite (POSTED_INTR_NV ,0 );vmwrite (PIN_BASED_VM_EXEC_CONTROL ,rdmsr (MSR_IA32_VMX_TRUE_PINBASED_CTLS ));
[ ... ]
tools/testing/selftests/kvm/lib/x86/vmx.c static inline void init_vmcs_guest_state(void *rip, void *rsp) · line 363
Quoted 11 lines
tools/testing/selftests/kvm/lib/x86/vmx.c +2
-2@@ -356,8 +356,8 @@ static inline void init_vmcs_guest_state(void *rip, void *rsp)vmwrite (GUEST_GS_SELECTOR ,vmreadz (HOST_GS_SELECTOR ));vmwrite (GUEST_LDTR_SELECTOR ,0 );vmwrite (GUEST_TR_SELECTOR ,vmreadz (HOST_TR_SELECTOR )); -vmwrite (GUEST_INTR_STATUS ,0 ); -vmwrite (GUEST_PML_INDEX ,0 ); +__vmwrite (GUEST_INTR_STATUS ,0 ); +__vmwrite (GUEST_PML_INDEX ,0 );vmwrite (VMCS_LINK_POINTER ,-1ll );vmwrite (GUEST_IA32_DEBUGCTL ,0 );
[Severity: Medium]
Will these writes to optional guest state fields cause test failures on CPUs or nested hypervisors that lack these features?
Fields like GUEST_IA32_DEBUGCTL, GUEST_IA32_PAT, GUEST_IA32_EFER, and GUEST_IA32_PERF_GLOBAL_CTRL are written unconditionally using vmwrite() here in init_vmcs_guest_state(). It seems they will assert failure on unsupported hardware. Should these also be switched to use __vmwrite() to avoid crashing?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=15
Sean Christopherson
maintainerRe: [PATCH v4 15/17] KVM: selftests: Add __vmwrite() and use it when initializing optional fields.
Quoted 55 lines · On Fri, Sep 04, 2026, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] The patch fails to convert all blind writes of optional VMCS fields to the non-asserting__vmwrite()in the common setup code, contradicting its stated intent and setting up a test crash. --commit
2bdd2a9b67ebe18b99a514555581198b78d1fab6
Author: Sean Christopherson <[email protected]>KVM: selftests: Add
__vmwrite()and use it when initializing optional fields.This commit introduces
__vmwrite(), a non-asserting version ofvmwrite(), to allow writing optional VMCS fields in common setup code where success is not guaranteed. It prepares forvmwrite()to unconditionally assert success in subsequent patches.tools/testing/selftests/kvm/lib/x86/vmx.c static inline void init_vmcs_control_fields(struct vmx_pages *vmx) · line 254
Quoted 8 lines
tools/testing/selftests/kvm/lib/x86/vmx.c +0
-0@@ -252,7 +252,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx)u32 sec_exec_ctl =0 ;vmwrite (VIRTUAL_PROCESSOR_ID ,0 );[Severity: Medium]
Will this blindly write to theVIRTUAL_PROCESSOR_IDfield using the assertingvmwrite()?Since VPID is an optional secondary control that may not exist on all hardware, this could crash selftests with a VM-Fail assertion on unsupported hardware once
vmwrite()is modified to assert success. Could this be converted to__vmwrite()similar toPOSTED_INTR_NV?Quoted 4 lines
tools/testing/selftests/kvm/lib/x86/vmx.c +1
-1-vmwrite (POSTED_INTR_NV ,0 ); +__vmwrite (POSTED_INTR_NV ,0 );vmwrite (PIN_BASED_VM_EXEC_CONTROL ,rdmsr (MSR_IA32_VMX_TRUE_PINBASED_CTLS ));[ ... ]
tools/testing/selftests/kvm/lib/x86/vmx.c static inline void init_vmcs_guest_state(void *rip, void *rsp) · line 363
Quoted 11 lines
tools/testing/selftests/kvm/lib/x86/vmx.c +2
-2@@ -356,8 +356,8 @@ static inline void init_vmcs_guest_state(void *rip, void *rsp)vmwrite (GUEST_GS_SELECTOR ,vmreadz (HOST_GS_SELECTOR ));vmwrite (GUEST_LDTR_SELECTOR ,0 );vmwrite (GUEST_TR_SELECTOR ,vmreadz (HOST_TR_SELECTOR )); -vmwrite (GUEST_INTR_STATUS ,0 ); -vmwrite (GUEST_PML_INDEX ,0 ); +__vmwrite (GUEST_INTR_STATUS ,0 ); +__vmwrite (GUEST_PML_INDEX ,0 );vmwrite (VMCS_LINK_POINTER ,-1ll );vmwrite (GUEST_IA32_DEBUGCTL ,0 );[Severity: Medium]
Will these writes to optional guest state fields cause test failures on CPUs or nested hypervisors that lack these features?
Quoted 4 lines
Fields like
GUEST_IA32_DEBUGCTL,GUEST_IA32_PAT,GUEST_IA32_EFER, andGUEST_IA32_PERF_GLOBAL_CTRLare written unconditionally usingvmwrite()here ininit_vmcs_guest_state(). It seems they will assert failure on unsupported hardware. Should these also be switched to use__vmwrite()to avoid crashing?
VM_ENTRY_LOAD_DEBUG_CONTROLS and thus GUEST_IA32_DEBUGCTL support is required by KVM. I'll fixup the others when applying.
Sean Christopherson
maintainerPATCH v4 16/17 KVM: selftests: Always assert that vmwrite() succeeds
In reply to Sean ChristophersonAssert that vmwrite() succeeds instead of forcing all callers to do the same (or as is much more common, ignoring VM-Fail and likely letting the test fail in weird ways), opportunistically provide a more verbose error message on failure.
All usage of vmwrite() "guarantees" success, either because the field in question is unconditionally emulated by KVM, by virtue of earlier support checks, or by falling over (later in the test) if the VMWRITE fails.
--- tools/testing/selftests/kvm/include/x86/vmx.h | 5 +++-- tools/testing/selftests/kvm/x86/aperfmperf_test.c | 2 +- tools/testing/selftests/kvm/x86/kvm_buslock_test.c | 2 +- .../testing/selftests/kvm/x86/nested_emulation_test.c | 6 +++--- .../testing/selftests/kvm/x86/nested_exceptions_test.c | 10 +++++----- .../selftests/kvm/x86/save_restore_pf_stress_test.c | 2 +- tools/testing/selftests/kvm/x86/state_test.c | 4 ++-- .../selftests/kvm/x86/vmx_preemption_timer_test.c | 8 +++----- 8 files changed, 19 insertions(+), 20 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +3 -2
@@ -429,9 +429,10 @@ static __always_inline int __vmwrite(u64 encoding, u64 value)return ret; } -static inline int vmwrite (u64 encoding,u64 value) +static inline void vmwrite (u64 encoding,u64 value) { -return __vmwrite (encoding, value); +__GUEST_ASSERT (!__vmwrite (encoding, value), +"vmwrite[0x%lx] = 0x%lx hit VM-Fail" , encoding, value); }static inline u32 vmcs_revision (void )
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1 -1
@@ -82,7 +82,7 @@ static void l1_vmx_code(struct vmx_pages *vmx)vmwrite (CPU_BASED_VM_EXEC_CONTROL ,vmreadz (CPU_BASED_VM_EXEC_CONTROL ) |CPU_BASED_USE_MSR_BITMAPS ); -GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code)); +vmwrite (GUEST_RIP , (u64 )l2_guest_code);vmlaunch (); }
tools/testing/selftests/kvm/x86/kvm_buslock_test.c +1 -1
@@ -47,7 +47,7 @@ static void l1_vmx_code(struct vmx_pages *vmx)prepare_vmcs (vmx,NULL ); -GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code)); +vmwrite (GUEST_RIP , (u64 )l2_guest_code);vmlaunch (); }
tools/testing/selftests/kvm/x86/nested_emulation_test.c +3 -3
@@ -70,9 +70,9 @@ static void guest_code(void *test_data)load_vmcs (test_data);prepare_vmcs (test_data,NULL ); -GUEST_ASSERT (!vmwrite (GUEST_IDTR_LIMIT ,0 )); -GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_guest_code)); -GUEST_ASSERT (!vmwrite (EXCEPTION_BITMAP ,0 )); +vmwrite (GUEST_IDTR_LIMIT ,0 ); +vmwrite (GUEST_RIP , (u64 )l2_guest_code); +vmwrite (EXCEPTION_BITMAP ,0 ); vmwrite(CPU_BASED_VM_EXEC_CONTROL, vmreadz(CPU_BASED_VM_EXEC_CONTROL) | CPU_BASED_PAUSE_EXITING |
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +5 -5
@@ -110,7 +110,7 @@ static void l1_svm_code(struct svm_test_data *svm)static void vmx_run_l2 (void *l2_code,int vector,u32 error_code) { -GUEST_ASSERT (!vmwrite (GUEST_RIP , (u64 )l2_code)); +vmwrite (GUEST_RIP , (u64 )l2_code);if (vector ==SS_VECTOR )vmlaunch ();
@@ -133,21 +133,21 @@ static void l1_vmx_code(struct vmx_pages *vmx)load_vmcs (vmx);prepare_vmcs (vmx,NULL ); -GUEST_ASSERT_EQ (vmwrite (GUEST_IDTR_LIMIT ,0 ),0 ); +vmwrite (GUEST_IDTR_LIMIT ,0 );/* * VMX disallows injecting an exception with error_code[31:16] != 0, * and hardware will never generate a VM-Exit with bits 31:16 set. * KVM should likewise truncate the "bad" userspace value. */ -GUEST_ASSERT_EQ (vmwrite (EXCEPTION_BITMAP ,INTERCEPT_SS_GP_DF ),0 ); +vmwrite (EXCEPTION_BITMAP ,INTERCEPT_SS_GP_DF );vmx_run_l2 (l2_ss_pending_test,SS_VECTOR , (u16 )SS_ERROR_CODE );vmx_run_l2 (l2_ss_injected_gp_test,GP_VECTOR ,GP_ERROR_CODE_INTEL ); -GUEST_ASSERT_EQ (vmwrite (EXCEPTION_BITMAP ,INTERCEPT_SS_DF ),0 ); +vmwrite (EXCEPTION_BITMAP ,INTERCEPT_SS_DF );vmx_run_l2 (l2_ss_injected_df_test,DF_VECTOR ,DF_ERROR_CODE ); -GUEST_ASSERT_EQ (vmwrite (EXCEPTION_BITMAP ,INTERCEPT_SS ),0 ); +vmwrite (EXCEPTION_BITMAP ,INTERCEPT_SS );vmx_run_l2 (l2_ss_injected_tf_test,FAKE_TRIPLE_FAULT_VECTOR ,0 );GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_TRIPLE_FAULT );
tools/testing/selftests/kvm/x86/save_restore_pf_stress_test.c +1 -1
@@ -102,7 +102,7 @@ static void l1_vmx_code(struct vmx_pages *vmx)load_vmcs (vmx);prepare_vmcs (vmx, guest_access_memory); -GUEST_ASSERT (!vmwrite (EXCEPTION_BITMAP ,BIT (UD_VECTOR ))); +vmwrite (EXCEPTION_BITMAP ,BIT (UD_VECTOR ));vmlaunch ();while (1 ) {
tools/testing/selftests/kvm/x86/state_test.c +2 -2
@@ -62,10 +62,10 @@ void vmx_l2_guest_code(void)GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffee );GUEST_SYNC (10 );GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffee ); -GUEST_ASSERT (!vmwrite (GUEST_RIP ,0xc0fffee )); +vmwrite (GUEST_RIP ,0xc0fffee );GUEST_SYNC (11 );GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0fffee ); -GUEST_ASSERT (!vmwrite (GUEST_RIP ,0xc0ffffee )); +vmwrite (GUEST_RIP ,0xc0ffffee );GUEST_SYNC (12 );/* Done, exit to L1 and never come back. */
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c +3 -5
@@ -97,12 +97,10 @@ void l1_guest_code(struct vmx_pages *vmx_pages)/* * Turn on PIN control and resume the guest */ -GUEST_ASSERT (!vmwrite (PIN_BASED_VM_EXEC_CONTROL , -vmreadz (PIN_BASED_VM_EXEC_CONTROL ) | -PIN_BASED_VMX_PREEMPTION_TIMER )); +vmwrite (PIN_BASED_VM_EXEC_CONTROL , +vmreadz (PIN_BASED_VM_EXEC_CONTROL ) |PIN_BASED_VMX_PREEMPTION_TIMER ); -GUEST_ASSERT (!vmwrite (VMX_PREEMPTION_TIMER_VALUE , -PREEMPTION_TIMER_VALUE )); +vmwrite (VMX_PREEMPTION_TIMER_VALUE ,PREEMPTION_TIMER_VALUE ); vmx_pt_rate =rdmsr (MSR_IA32_VMX_MISC ) &0x1F ;
Signature · 1 line
2.55.0.979.g7e5102b832-goog
Sean Christopherson
maintainerPATCH v4 17/17 KVM: selftests: Always assert that vmreadz() succeeds
In reply to Sean ChristophersonRename vmreadz() => vmread() (and vmread() => __vmread()) and have it assert success instead of returning garbage on failure. While the eVMCS path avoids clobbering *value on failure, the VMREAD path unconditionally stores tmp to *value, without ever zeroing tmp. I.e. if VMREAD did fail, *value would be loaded with random stack data, not '0'.
An audit of the code confirms that nothing is actually relying on vmreadz() to zero the result on failure, as all paths either check for a non-zero value, propagate the result into vmwrite(), or guard the vmread() with a pre-check that the field exists.
Opportunistically fix the bug in what is now __vmread(), so that the code isn't consuming uninitialized stack data. Begrudgingly keep zeroing value in vmread(), as gcc-15 at least isn't smart enough to figure out that value won't be used uninitialized (though to be fair, strictly speaking it isn't actually unreachable code).
--- tools/testing/selftests/kvm/include/x86/vmx.h | 15 +++--- .../testing/selftests/kvm/lib/x86/memstress.c | 2 +- tools/testing/selftests/kvm/lib/x86/vmx.c | 52 +++++++++---------- .../selftests/kvm/x86/aperfmperf_test.c | 2 +- .../testing/selftests/kvm/x86/hyperv_evmcs.c | 24 ++++----- .../selftests/kvm/x86/nested_dirty_log_test.c | 2 +- .../selftests/kvm/x86/nested_emulation_test.c | 8 +-- .../kvm/x86/nested_exceptions_test.c | 10 ++-- .../kvm/x86/nested_invalid_cr3_test.c | 6 +-- .../selftests/kvm/x86/nested_tdp_fault_test.c | 10 ++-- .../kvm/x86/nested_tsc_adjust_test.c | 4 +- .../kvm/x86/nested_tsc_scaling_test.c | 6 +-- .../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 | 12 ++--- .../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 | 4 +- .../kvm/x86/vmx_preemption_timer_test.c | 8 +-- 20 files changed, 104 insertions(+), 105 deletions(-)
tools/testing/selftests/kvm/include/x86/vmx.h +7 -8
@@ -386,7 +386,7 @@ static inline void vmcall(void) "r10", "r11", "r12", "r13", "r14", "r15"); } -static inline int vmread (u64 encoding,u64 *value) +static inline int __vmread (u64 encoding,u64 *value) {u64 tmp;u8 ret;
@@ -399,18 +399,17 @@ static inline int vmread(u64 encoding, u64 *value) : [encoding]"r"(encoding) : "cc", "memory"); - *value = tmp; +if (!ret) + *value = tmp;return ret; } -/* -* A wrapper around vmread that ignores errors and returns zero if the -* vmread instruction fails. -*/ -static inline u64 vmreadz (u64 encoding) +static inline u64 vmread (u64 encoding) {u64 value =0 ; -vmread (encoding, &value); + +__GUEST_ASSERT (!__vmread (encoding, &value), +"vmwread[0x%lx] hit VM-Fail" , encoding);return value; }
tools/testing/selftests/kvm/lib/x86/memstress.c +1 -1
@@ -41,7 +41,7 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 vcpu_id)prepare_vmcs (vmx, memstress_l2_guest_entry);vmlaunch (); -GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_VMCALL ); +GUEST_ASSERT_EQ (vmread (VM_EXIT_REASON ),EXIT_REASON_VMCALL );GUEST_DONE (); }
tools/testing/selftests/kvm/lib/x86/vmx.c +26 -26
98 lines not on this page · raw message
tools/testing/selftests/kvm/x86/aperfmperf_test.c +1 -1
@@ -80,7 +80,7 @@ static void l1_vmx_code(struct vmx_pages *vmx)* in the VMCS by prepare_vmcs()), as MSR exiting mandatory on Intel. */ vmwrite (CPU_BASED_VM_EXEC_CONTROL , -vmreadz (CPU_BASED_VM_EXEC_CONTROL ) |CPU_BASED_USE_MSR_BITMAPS ); +vmread (CPU_BASED_VM_EXEC_CONTROL ) |CPU_BASED_USE_MSR_BITMAPS );vmwrite (GUEST_RIP , (u64 )l2_guest_code);vmlaunch ();
tools/testing/selftests/kvm/x86/hyperv_evmcs.c +12 -12
@@ -109,7 +109,7 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages, current_evmcs->revision_id =EVMCS_VERSION ;GUEST_SYNC (6 ); -vmwrite (PIN_BASED_VM_EXEC_CONTROL ,vmreadz (PIN_BASED_VM_EXEC_CONTROL ) | +vmwrite (PIN_BASED_VM_EXEC_CONTROL ,vmread (PIN_BASED_VM_EXEC_CONTROL ) |PIN_BASED_NMI_EXITING );/* L2 TLB flush setup */
@@ -121,8 +121,8 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages, *(u32 *)(hv_pages->partition_assist) =0 ;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_EQ (vmread (VM_EXIT_REASON ),EXIT_REASON_EXCEPTION_NMI ); +GUEST_ASSERT_EQ ((vmread (VM_EXIT_INTR_INFO ) &0xff ),NMI_VECTOR );GUEST_ASSERT (vmptrst () == hv_pages->enlightened_vmcs_gpa);/*
@@ -134,21 +134,21 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,GUEST_SYNC (10 ); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); current_evmcs->guest_rip +=3 ;/* vmcall */ /* Intercept RDMSR 0xc0000100 */ -vmwrite (CPU_BASED_VM_EXEC_CONTROL ,vmreadz (CPU_BASED_VM_EXEC_CONTROL ) | +vmwrite (CPU_BASED_VM_EXEC_CONTROL ,vmread (CPU_BASED_VM_EXEC_CONTROL ) |CPU_BASED_USE_MSR_BITMAPS );__set_bit (MSR_FS_BASE &0x1fff , vmx_pages->msr +0x400 );vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); +GUEST_ASSERT (vmread (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 ;vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); current_evmcs->guest_rip +=2 ;/* rdmsr */ /* Intercept RDMSR 0xc0000101 without telling KVM about it */
@@ -157,13 +157,13 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages, current_evmcs->hv_clean_fields |=HV_VMX_ENLIGHTENED_CLEAN_FIELD_MSR_BITMAP ;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 ); +GUEST_ASSERT (vmread (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 ;vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); current_evmcs->guest_rip +=2 ;/* rdmsr */ /*
@@ -171,15 +171,15 @@ void guest_code(struct vmx_pages *vmx_pages, struct hyperv_test_pages *hv_pages,* no VMCALL exit expected. */ vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_MSR_READ ); current_evmcs->guest_rip +=2 ;/* rdmsr */ /* Enable synthetic vmexit */ *(u32 *)(hv_pages->partition_assist) =1 ;vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==HV_VMX_SYNTHETIC_EXIT_REASON_TRAP_AFTER_FLUSH ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==HV_VMX_SYNTHETIC_EXIT_REASON_TRAP_AFTER_FLUSH );vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_SYNC (11 );/* VMPTRLD instruction causes #UD after enlightened VMLAUNCH */
tools/testing/selftests/kvm/x86/nested_dirty_log_test.c +1 -1
@@ -106,7 +106,7 @@ void l1_vmx_code(struct vmx_pages *vmx)GUEST_SYNC (TEST_SYNC_NO_FAULT );vmlaunch ();GUEST_SYNC (TEST_SYNC_NO_FAULT ); -GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_VMCALL ); +GUEST_ASSERT_EQ (vmread (VM_EXIT_REASON ),EXIT_REASON_VMCALL );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/nested_emulation_test.c +4 -4
@@ -74,7 +74,7 @@ static void guest_code(void *test_data)vmwrite (GUEST_RIP , (u64 )l2_guest_code);vmwrite (EXCEPTION_BITMAP ,0 ); -vmwrite (CPU_BASED_VM_EXEC_CONTROL ,vmreadz (CPU_BASED_VM_EXEC_CONTROL ) | +vmwrite (CPU_BASED_VM_EXEC_CONTROL ,vmread (CPU_BASED_VM_EXEC_CONTROL ) |CPU_BASED_PAUSE_EXITING |CPU_BASED_HLT_EXITING ); }
@@ -106,9 +106,9 @@ static void guest_code(void *test_data)vmlaunch (); elsevmresume (); - exit_reason =vmreadz (VM_EXIT_REASON ); - exit_insn_len =vmreadz (VM_EXIT_INSTRUCTION_LEN ); -GUEST_ASSERT_EQ (vmreadz (GUEST_RIP ), (u64 )l2_instruction); + exit_reason =vmread (VM_EXIT_REASON ); + exit_insn_len =vmread (VM_EXIT_INSTRUCTION_LEN ); +GUEST_ASSERT_EQ (vmread (GUEST_RIP ), (u64 )l2_instruction); } __GUEST_ASSERT(exit_reason == insn->exit_reason[f],
tools/testing/selftests/kvm/x86/nested_exceptions_test.c +5 -5
@@ -120,10 +120,10 @@ static void vmx_run_l2(void *l2_code, int vector, u32 error_code)if (vector ==FAKE_TRIPLE_FAULT_VECTOR )return ; -GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_EXCEPTION_NMI ); -GUEST_ASSERT_EQ ((vmreadz (VM_EXIT_INTR_INFO ) &0xff ), vector); -GUEST_ASSERT_EQ (vmreadz (VM_EXIT_INTR_ERROR_CODE ), error_code); -GUEST_ASSERT (!vmreadz (GUEST_INTERRUPTIBILITY_INFO )); +GUEST_ASSERT_EQ (vmread (VM_EXIT_REASON ),EXIT_REASON_EXCEPTION_NMI ); +GUEST_ASSERT_EQ ((vmread (VM_EXIT_INTR_INFO ) &0xff ), vector); +GUEST_ASSERT_EQ (vmread (VM_EXIT_INTR_ERROR_CODE ), error_code); +GUEST_ASSERT (!vmread (GUEST_INTERRUPTIBILITY_INFO )); }static void l1_vmx_code (struct vmx_pages *vmx)
@@ -149,7 +149,7 @@ static void l1_vmx_code(struct vmx_pages *vmx)vmwrite (EXCEPTION_BITMAP ,INTERCEPT_SS );vmx_run_l2 (l2_ss_injected_tf_test,FAKE_TRIPLE_FAULT_VECTOR ,0 ); -GUEST_ASSERT_EQ (vmreadz (VM_EXIT_REASON ),EXIT_REASON_TRIPLE_FAULT ); +GUEST_ASSERT_EQ (vmread (VM_EXIT_REASON ),EXIT_REASON_TRIPLE_FAULT );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c +3 -3
@@ -46,16 +46,16 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)prepare_vmcs (vmx_pages, l2_guest_code);/* Try to run L2 with invalid CR3 and make sure it fails */ - save_cr3 =vmreadz (GUEST_CR3 ); + save_cr3 =vmread (GUEST_CR3 );vmwrite (GUEST_CR3 ,-1ull );vmlaunch (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) == +GUEST_ASSERT (vmread (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);vmlaunch (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/nested_tdp_fault_test.c +5 -5
@@ -63,17 +63,17 @@ static void l1_vmx_code(struct vmx_pages *vmx, u64 expected_fault_gpa,vmlaunch ();/* Verify we got an EPT violation exit */ -__GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_EPT_VIOLATION , +__GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_EPT_VIOLATION ,"Expected EPT violation (0x%x), got 0x%lx" ,EXIT_REASON_EPT_VIOLATION , -vmreadz (VM_EXIT_REASON )); +vmread (VM_EXIT_REASON )); -__GUEST_ASSERT (vmreadz (GUEST_PHYSICAL_ADDRESS ) == expected_fault_gpa, +__GUEST_ASSERT (vmread (GUEST_PHYSICAL_ADDRESS ) == expected_fault_gpa,"Expected guest_physical_address = 0x%lx, got 0x%lx" , expected_fault_gpa, -vmreadz (GUEST_PHYSICAL_ADDRESS )); +vmread (GUEST_PHYSICAL_ADDRESS )); - exit_qual =vmreadz (EXIT_QUALIFICATION ); + exit_qual =vmread (EXIT_QUALIFICATION );/* * Note, EPT page table accesses are always read+write, e.g. so that
tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c +2 -2
@@ -90,13 +90,13 @@ static void l1_guest_code(void *data)load_vmcs (vmx_pages);prepare_vmcs (vmx_pages, l2_guest_code); - control =vmreadz (CPU_BASED_VM_EXEC_CONTROL ); + control =vmread (CPU_BASED_VM_EXEC_CONTROL ); control |=CPU_BASED_USE_MSR_BITMAPS |CPU_BASED_USE_TSC_OFFSETTING ;vmwrite (CPU_BASED_VM_EXEC_CONTROL , control);vmwrite (TSC_OFFSET ,TSC_OFFSET_VALUE );vmlaunch (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); }else {struct svm_test_data *svm = data;
tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c +3 -3
@@ -112,11 +112,11 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)prepare_vmcs (vmx_pages, l2_guest_code);/* enable TSC offsetting and TSC scaling for L2 */ - control =vmreadz (CPU_BASED_VM_EXEC_CONTROL ); + control =vmread (CPU_BASED_VM_EXEC_CONTROL ); control |=CPU_BASED_USE_MSR_BITMAPS |CPU_BASED_USE_TSC_OFFSETTING ;vmwrite (CPU_BASED_VM_EXEC_CONTROL , control); - control =vmreadz (SECONDARY_VM_EXEC_CONTROL ); + control =vmread (SECONDARY_VM_EXEC_CONTROL ); control |=SECONDARY_EXEC_TSC_SCALING ;vmwrite (SECONDARY_VM_EXEC_CONTROL , control);
@@ -126,7 +126,7 @@ static void l1_vmx_code(struct vmx_pages *vmx_pages)/* launch L2 */ vmlaunch (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );/* check that L1's frequency still looks good */ check_tsc_freq (UCHECK_L1 );
tools/testing/selftests/kvm/x86/save_restore_pf_stress_test.c +2 -2
@@ -106,8 +106,8 @@ static void l1_vmx_code(struct vmx_pages *vmx)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_EQ (vmread (VM_EXIT_REASON ),EXIT_REASON_EXCEPTION_NMI ); +GUEST_ASSERT_EQ (vmread (VM_EXIT_INTR_INFO ) &0xff ,UD_VECTOR );vmresume (); } }
tools/testing/selftests/kvm/x86/state_test.c +12 -12
@@ -59,12 +59,12 @@ void vmx_l2_guest_code(void)vmcall ();/* L1 has now set up a shadow VMCS for us. */ -GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffee ); +GUEST_ASSERT (vmread (GUEST_RIP ) ==0xc0ffee );GUEST_SYNC (10 ); -GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffee ); +GUEST_ASSERT (vmread (GUEST_RIP ) ==0xc0ffee );vmwrite (GUEST_RIP ,0xc0fffee );GUEST_SYNC (11 ); -GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0fffee ); +GUEST_ASSERT (vmread (GUEST_RIP ) ==0xc0fffee );vmwrite (GUEST_RIP ,0xc0ffffee );GUEST_SYNC (12 );
@@ -89,21 +89,21 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa);vmlaunch ();GUEST_ASSERT (vmptrst () == vmx_pages->vmcs_gpa); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );/* Check that the launched state is preserved. */ GUEST_ASSERT (__vmlaunch ());vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_SYNC (7 ); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); -vmwrite (GUEST_RIP ,vmreadz (GUEST_RIP ) +3 ); +vmwrite (GUEST_RIP ,vmread (GUEST_RIP ) +3 );vmwrite (SECONDARY_VM_EXEC_CONTROL ,SECONDARY_EXEC_SHADOW_VMCS );vmwrite (VMCS_LINK_POINTER , vmx_pages->shadow_vmcs_gpa);
@@ -116,18 +116,18 @@ static void vmx_l1_guest_code(struct vmx_pages *vmx_pages)vmwrite (GUEST_RIP ,0xc0ffee );GUEST_SYNC (9 ); -GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffee ); +GUEST_ASSERT (vmread (GUEST_RIP ) ==0xc0ffee );vmptrld (vmx_pages->vmcs_gpa);vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );vmptrld (vmx_pages->shadow_vmcs_gpa); -GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffffee ); +GUEST_ASSERT (vmread (GUEST_RIP ) ==0xc0ffffee );GUEST_ASSERT (__vmlaunch ());GUEST_ASSERT (__vmresume ());GUEST_SYNC (13 ); -GUEST_ASSERT (vmreadz (GUEST_RIP ) ==0xc0ffffee ); +GUEST_ASSERT (vmread (GUEST_RIP ) ==0xc0ffffee );GUEST_ASSERT (__vmlaunch ());GUEST_ASSERT (__vmresume ()); }
tools/testing/selftests/kvm/x86/triple_fault_event_test.c +1 -1
@@ -32,7 +32,7 @@ void l1_guest_code_vmx(struct vmx_pages *vmx)vmlaunch ();/* L2 should triple fault after a triple fault event injected. */ -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_TRIPLE_FAULT ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_TRIPLE_FAULT );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/vmx_apic_access_test.c +6 -6
@@ -43,25 +43,25 @@ static void l1_guest_code(struct vmx_pages *vmx_pages, unsigned long high_gpa)/* Prepare the VMCS for L2 execution. */ prepare_vmcs (vmx_pages, l2_guest_code); - control =vmreadz (CPU_BASED_VM_EXEC_CONTROL ); + control =vmread (CPU_BASED_VM_EXEC_CONTROL ); control |=CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ;vmwrite (CPU_BASED_VM_EXEC_CONTROL , control); - control =vmreadz (SECONDARY_VM_EXEC_CONTROL ); + control =vmread (SECONDARY_VM_EXEC_CONTROL ); control |=SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES ;vmwrite (SECONDARY_VM_EXEC_CONTROL , control);vmwrite (APIC_ACCESS_ADDR , vmx_pages->apic_access_gpa);/* Try to launch L2 with the memory-backed APIC-access address. */ -GUEST_SYNC (vmreadz (APIC_ACCESS_ADDR )); +GUEST_SYNC (vmread (APIC_ACCESS_ADDR ));vmlaunch (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (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_SYNC (vmread (APIC_ACCESS_ADDR ));vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c +4 -4
@@ -38,7 +38,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)/* Prepare the VMCS for L2 execution. */ prepare_vmcs (vmx_pages, l2_guest_code); - control =vmreadz (CPU_BASED_VM_EXEC_CONTROL ); + control =vmread (CPU_BASED_VM_EXEC_CONTROL ); control |=CPU_BASED_USE_MSR_BITMAPS ;vmwrite (CPU_BASED_VM_EXEC_CONTROL , control);
@@ -63,8 +63,8 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)* as KVM should force the APIC ID back to its default. */ vmlaunch (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); -vmwrite (GUEST_RIP ,vmreadz (GUEST_RIP ) +vmreadz (VM_EXIT_INSTRUCTION_LEN )); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +vmwrite (GUEST_RIP ,vmread (GUEST_RIP ) +vmread (VM_EXIT_INSTRUCTION_LEN ));GUEST_ASSERT (rdmsr (MSR_IA32_APICBASE ) &MSR_IA32_APICBASE_EXTD );/*
@@ -91,7 +91,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)* is active. */ vmresume (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL );GUEST_ASSERT (!(rdmsr (MSR_IA32_APICBASE ) &MSR_IA32_APICBASE_EXTD ));xapic_write_reg (APIC_ICR ,APIC_DEST_SELF |APIC_DM_FIXED |GOOD_IPI_VECTOR );
tools/testing/selftests/kvm/x86/vmx_invalid_nested_guest_state.c +3 -3
@@ -52,13 +52,13 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)* library hasn't enabled it. Because KVM selftests jump directly to * 64-bit mode, unrestricted guest support isn't required. */ -GUEST_ASSERT (!(vmreadz (CPU_BASED_VM_EXEC_CONTROL ) &CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ) || - !(vmreadz (SECONDARY_VM_EXEC_CONTROL ) &SECONDARY_EXEC_UNRESTRICTED_GUEST )); +GUEST_ASSERT (!(vmread (CPU_BASED_VM_EXEC_CONTROL ) &CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ) || + !(vmread (SECONDARY_VM_EXEC_CONTROL ) &SECONDARY_EXEC_UNRESTRICTED_GUEST ));vmlaunch ();/* L2 should triple fault after main() stuffs invalid guest state. */ -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_TRIPLE_FAULT ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_TRIPLE_FAULT );GUEST_DONE (); }
tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c +2 -2
@@ -52,13 +52,13 @@ static void l1_guest_code(struct vmx_pages *vmx_pages) pml4_pa = pml5[0 ] &PHYSICAL_PAGE_MASK ;vmwrite (GUEST_CR3 , pml4_pa); - guest_cr4 =vmreadz (GUEST_CR4 ); + guest_cr4 =vmread (GUEST_CR4 ); guest_cr4 &= ~X86_CR4_LA57 ;vmwrite (GUEST_CR4 , guest_cr4);vmlaunch (); - exit_reason =vmreadz (VM_EXIT_REASON ); + exit_reason =vmread (VM_EXIT_REASON );GUEST_ASSERT (exit_reason ==EXIT_REASON_VMCALL ); }
tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c +4 -4
@@ -91,14 +91,14 @@ void l1_guest_code(struct vmx_pages *vmx_pages)return ;vmlaunch (); -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); -vmwrite (GUEST_RIP ,vmreadz (GUEST_RIP ) +vmreadz (VM_EXIT_INSTRUCTION_LEN )); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_VMCALL ); +vmwrite (GUEST_RIP ,vmread (GUEST_RIP ) +vmread (VM_EXIT_INSTRUCTION_LEN ));/* * Turn on PIN control and resume the guest */ vmwrite (PIN_BASED_VM_EXEC_CONTROL , -vmreadz (PIN_BASED_VM_EXEC_CONTROL ) |PIN_BASED_VMX_PREEMPTION_TIMER ); +vmread (PIN_BASED_VM_EXEC_CONTROL ) |PIN_BASED_VMX_PREEMPTION_TIMER );vmwrite (VMX_PREEMPTION_TIMER_VALUE ,PREEMPTION_TIMER_VALUE );
@@ -121,7 +121,7 @@ void l1_guest_code(struct vmx_pages *vmx_pages)/* * Ensure the exit from L2 is due to preemption timer expiry */ -GUEST_ASSERT (vmreadz (VM_EXIT_REASON ) ==EXIT_REASON_PREEMPTION_TIMER ); +GUEST_ASSERT (vmread (VM_EXIT_REASON ) ==EXIT_REASON_PREEMPTION_TIMER ); l1_tsc_deadline = l1_vmx_pt_start + (PREEMPTION_TIMER_VALUE << vmx_pt_rate);
Signature · 1 line
2.55.0.979.g7e5102b832-goog
[email protected]
AI reviewRe: [PATCH v4 17/17] KVM: selftests: Always assert that vmreadz() succeeds
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Typo in assertion message: 'vmwread' instead of 'vmread'. --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Typo in assertion message: 'vmwread' instead of 'vmread'.
--
commit b99bd290de04e34e69f57ca551e7c07af56c2b56
Author: Sean Christopherson <[email protected]>
KVM: selftests: Always assert that vmreadz() succeeds
Rename vmreadz() => vmread() (and vmread() => __vmread()) and have it assert success instead of returning garbage on failure. While the eVMCS path avoids clobbering *value on failure, the VMREAD path unconditionally stores tmp to *value, without ever zeroing tmp.
Quoted 4 lines
tools/testing/selftests/kvm/include/x86/vmx.h +0
-0
[ ... ]
Quoted 12 lines
tools/testing/selftests/kvm/include/x86/vmx.h +2
-3@@ -399,18 +399,17 @@ static inline int vmread(u64 encoding, u64 *value) : [encoding]"r"(encoding) : "cc", "memory"); - *value = tmp; +if (!ret) + *value = tmp;return ret; } -/* -* A wrapper around vmread that ignores errors and returns zero if the
tools/testing/selftests/kvm/include/x86/vmx.h static inline int vmread(u64 encoding, u64 *value) · line 412
Quoted 10 lines
tools/testing/selftests/kvm/include/x86/vmx.h +4
-4-* vmread instruction fails. -*/ -static inline u64 vmreadz (u64 encoding) +static inline u64 vmread (u64 encoding) {u64 value =0 ; -vmread (encoding, &value); + +__GUEST_ASSERT (!__vmread (encoding, &value), +"vmwread[0x%lx] hit VM-Fail" , encoding);
[Severity: Low]
Is there a typo in the assert message here? It says 'vmwread' instead of 'vmread'.
Quoted 3 lines
tools/testing/selftests/kvm/include/x86/vmx.h +0
-0return value; }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=17
Sean Christopherson
maintainerQuoted 9 lines · Sean Christopherson
The first four patches are 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 churn piled on top came from wanting to use
KVM_ASM_SAFE()for more VMX instructions to verify the RFLAGS bug+fix Sashiko pointed out, lack impulse control when it comes to cleanups, and Yosry being a bad/good influence.[...]
Applied to kvm-x86 selftests. Yes, really, that's not a typo. I didn't want to split the nVMX fixes from their testcases, and this series ended up being 99% selftests and 1% nVMX.
[01/17] KVM: nVMX: Make VMPTRLD result in #UD when eVMCS is used
https://github.com/kvm-x86/linux/commit/35097cefedaf [02/17] KVM: nVMX: Make VMPTRST return eVMCS GPA when it is used https://github.com/kvm-x86/linux/commit/5b1acaadcdcb [03/17] KVM: selftests: Don't clobber RFLAGS in happy path of __KVM_ASM_SAFE() https://github.com/kvm-x86/linux/commit/be7875808fcd [04/17] KVM: selftests: Adapt to the updated VMPTRST behavior when eVMCS is used https://github.com/kvm-x86/linux/commit/455919e76945 [05/17] KVM: selftests: Check VMPTRLD with active eVMCS https://github.com/kvm-x86/linux/commit/0d6e35f6ab7d [06/17] KVM: selftests: Assert success in vmptrst(), kill off vmptrstz() https://github.com/kvm-x86/linux/commit/f1d4e357a695 [07/17] KVM: selftests: Always assert that vmxon() and prepare_for_vmx_operation() succeed https://github.com/kvm-x86/linux/commit/154b098cada9 [08/17] KVM: selftests: Always assert that vmclear() succeeds https://github.com/kvm-x86/linux/commit/5f73777a27b1 [09/17] KVM: selftests: Always assert that vmptrld() succeeds https://github.com/kvm-x86/linux/commit/9007b746aeb5 [10/17] KVM: selftests: Drop useless return code from load_vmcs() https://github.com/kvm-x86/linux/commit/f2bad303f403 [11/17] KVM: selftests: Add macros to handle simple VMX instructions https://github.com/kvm-x86/linux/commit/b2f44e713c6d [12/17] KVM: selftests: Drop dead return code from evmcs_vmptrld() and load_evmcs() https://github.com/kvm-x86/linux/commit/776334470450 [13/17] KVM: selftests: Dedup assembly code for VMLAUNCH and VMRESUME https://github.com/kvm-x86/linux/commit/978c4df4b245 [14/17] KVM: selftests: Assert success in vmlaunch() and vmresume() https://github.com/kvm-x86/linux/commit/5adf7087cfd2 [15/17] KVM: selftests: Add __vmwrite() and use it when initializing optional fields. https://github.com/kvm-x86/linux/commit/68b94d08f9dc [16/17] KVM: selftests: Always assert that vmwrite() succeeds https://github.com/kvm-x86/linux/commit/6ecd351628f3 [17/17] KVM: selftests: Always assert that vmreadz() succeeds https://github.com/kvm-x86/linux/commit/4e824a04d4fa