Fix test failures caused by CET KVM series
v2 cover Fix test failures caused by CET KVM series
CET KVM series causes sereral test cases fail due to:
1) New introduced constraints between CR0.WP and CR4.CET bits, i.e., setting CR4.CET == 1 fails if CR0.WP == 0, and setting CR0.WP == 0 fails if CR4.CET
== 1
2) New introduced support of VMX_BASIC[bit56], i.e., skipping HW consistent check for event error code if the bit is set.
Opportunistically rename related struct and variable to avoid confusion.
Yang Weijiang (3):
x86: VMX: Exclude CR4.CET from the test_vmxon_bad_cr()
x86: VMX: Rename union vmx_basic and related global variable x86:VMX: Introduce new vmx_basic MSR feature bit for vmx tests
x86/vmx.c | 46 +++++++++++++++++++++++----------------------- x86/vmx.h | 7 ++++--- x86/vmx_tests.c | 31 ++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 35 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/3 x86: VMX: Exclude CR4.CET from the test_vmxon_bad_cr()
CET KVM enabling patch series introduces extra constraints on CR0.WP and CR4.CET bits, i.e., setting CR4.CET == 1 causes fault if CR0.WP == 0. Skip the bit testing to avoid folding it in flexible_cr4 and finally trigger a #GP when write the CR4 with CET bit set while CR0.WP is cleared.
--- x86/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
x86/vmx.c +1 -1
@@ -1430,7 +1430,7 @@ static int test_vmxon_bad_cr(int cr_number, unsigned long orig_cr,*/ if ((cr_number ==0 && (bit ==X86_CR0_PE || bit ==X86_CR0_PG )) || (cr_number ==4 && (bit ==X86_CR4_PAE || bit ==X86_CR4_SMAP || - bit ==X86_CR4_SMEP ))) + bit ==X86_CR4_SMEP || bit ==X86_CR4_CET )))continue ;if (!(bit & required1) && !(bit & disallowed1)) {
Signature · 1 line
2.27.0
PATCH v2 2/3 x86: VMX: Rename union vmx_basic and related global variable
In reply to Yang Weijiangvmx_basic is somewhat confusing with exit_reason.basic, rename the former definition to vmx_basic_msr and the global variable to make them self- descriptive.
No functional change intended.
--- x86/vmx.c | 44 ++++++++++++++++++++++---------------------- x86/vmx.h | 4 ++-- x86/vmx_tests.c | 10 +++++----- 3 files changed, 29 insertions(+), 29 deletions(-)
x86/vmx.c +22 -22
@@ -66,7 +66,7 @@ static int matched;static int guest_finished;static int in_guest; -union vmx_basic basic; +union vmx_basic_msr basic_msr;union vmx_ctrl_msr ctrl_pin_rev;union vmx_ctrl_msr ctrl_cpu_rev[2 ];union vmx_ctrl_msr ctrl_exit_rev;
@@ -369,7 +369,7 @@ static void test_vmwrite_vmread(void)struct vmcs *vmcs =alloc_page ();u32 vmcs_enum_max, max_index =0 ; - vmcs->hdr.revision_id = basic.revision; + vmcs->hdr.revision_id = basic_msr.revision;assert (!vmcs_clear (vmcs));assert (!make_vmcs_current (vmcs));
@@ -430,7 +430,7 @@ static void test_vmread_vmwrite_pf(bool vmread)void *vpage =alloc_vpage ();memset (vmcs,0 ,PAGE_SIZE ); - vmcs->hdr.revision_id = basic.revision; + vmcs->hdr.revision_id = basic_msr.revision;assert (!vmcs_clear (vmcs));assert (!make_vmcs_current (vmcs));
@@ -456,7 +456,7 @@ static void test_vmcs_high(void) {struct vmcs *vmcs =alloc_page (); - vmcs->hdr.revision_id = basic.revision; + vmcs->hdr.revision_id = basic_msr.revision;assert (!vmcs_clear (vmcs));assert (!make_vmcs_current (vmcs));
@@ -482,7 +482,7 @@ static void test_vmcs_lifecycle(void)for (i =0 ; i <ARRAY_SIZE (vmcs); i++) { vmcs[i] =alloc_page (); - vmcs[i]->hdr.revision_id = basic.revision; + vmcs[i]->hdr.revision_id = basic_msr.revision; }#define VMPTRLD (_i) do { \
@@ -731,13 +731,13 @@ static void test_vmclear_flushing(void) vmcs[i] =alloc_page (); } - vmcs[0 ]->hdr.revision_id = basic.revision; + vmcs[0 ]->hdr.revision_id = basic_msr.revision;assert (!vmcs_clear (vmcs[0 ]));assert (!make_vmcs_current (vmcs[0 ]));set_all_vmcs_fields (0x86 );assert (!vmcs_clear (vmcs[0 ])); -memcpy (vmcs[1 ], vmcs[0 ], basic.size); +memcpy (vmcs[1 ], vmcs[0 ], basic_msr.size);assert (!make_vmcs_current (vmcs[1 ]));report (check_all_vmcs_fields (0x86 ),"test vmclear flush (current VMCS)" );
@@ -745,7 +745,7 @@ static void test_vmclear_flushing(void)set_all_vmcs_fields (0x87 );assert (!make_vmcs_current (vmcs[0 ]));assert (!vmcs_clear (vmcs[1 ])); -memcpy (vmcs[2 ], vmcs[1 ], basic.size); +memcpy (vmcs[2 ], vmcs[1 ], basic_msr.size);assert (!make_vmcs_current (vmcs[2 ]));report (check_all_vmcs_fields (0x87 ),"test vmclear flush (!current VMCS)" );
@@ -1232,7 +1232,7 @@ static void init_vmcs_guest(void)int init_vmcs (struct vmcs **vmcs) { *vmcs =alloc_page (); - (*vmcs)->hdr.revision_id = basic.revision; + (*vmcs)->hdr.revision_id = basic_msr.revision;/* vmclear first to init vmcs */ if (vmcs_clear (*vmcs)) {printf ("%s : vmcs_clear error\n" , __func__);
@@ -1279,14 +1279,14 @@ void enable_vmx(void)static void init_vmx_caps (void ) { - basic.val =rdmsr (MSR_IA32_VMX_BASIC ); - ctrl_pin_rev.val =rdmsr (basic.ctrl ?MSR_IA32_VMX_TRUE_PIN + basic_msr.val =rdmsr (MSR_IA32_VMX_BASIC ); + ctrl_pin_rev.val =rdmsr (basic_msr.ctrl ?MSR_IA32_VMX_TRUE_PIN :MSR_IA32_VMX_PINBASED_CTLS ); - ctrl_exit_rev.val =rdmsr (basic.ctrl ?MSR_IA32_VMX_TRUE_EXIT + ctrl_exit_rev.val =rdmsr (basic_msr.ctrl ?MSR_IA32_VMX_TRUE_EXIT :MSR_IA32_VMX_EXIT_CTLS ); - ctrl_enter_rev.val =rdmsr (basic.ctrl ?MSR_IA32_VMX_TRUE_ENTRY + ctrl_enter_rev.val =rdmsr (basic_msr.ctrl ?MSR_IA32_VMX_TRUE_ENTRY :MSR_IA32_VMX_ENTRY_CTLS ); - ctrl_cpu_rev[0 ].val =rdmsr (basic.ctrl ?MSR_IA32_VMX_TRUE_PROC + ctrl_cpu_rev[0 ].val =rdmsr (basic_msr.ctrl ?MSR_IA32_VMX_TRUE_PROC :MSR_IA32_VMX_PROCBASED_CTLS );if ((ctrl_cpu_rev[0 ].clr &CPU_SECONDARY ) !=0 ) ctrl_cpu_rev[1 ].val =rdmsr (MSR_IA32_VMX_PROCBASED_CTLS2 );
@@ -1311,7 +1311,7 @@ void init_vmx(u64 *vmxon_region)write_cr0 ((read_cr0 () & fix_cr0_clr) | fix_cr0_set);write_cr4 ((read_cr4 () & fix_cr4_clr) | fix_cr4_set |X86_CR4_VMXE ); - *vmxon_region = basic.revision; + *vmxon_region = basic_msr.revision; }static void alloc_bsp_vmx_pages (void )
@@ -1515,7 +1515,7 @@ static int test_vmxon(void)/* and finally a valid region, with valid-but-tweaked cr0/cr4 */ write_cr0 (orig_cr0 ^ flexible_cr0);write_cr4 (orig_cr4 ^ flexible_cr4); - *bsp_vmxon_region = basic.revision; + *bsp_vmxon_region = basic_msr.revision; ret =vmxon_safe ();report (!ret,"test vmxon with valid vmxon region" );write_cr0 (orig_cr0);
@@ -1529,7 +1529,7 @@ static void test_vmptrld(void)int width =cpuid_maxphyaddr (); vmcs =alloc_page (); - vmcs->hdr.revision_id = basic.revision; + vmcs->hdr.revision_id = basic_msr.revision;/* Unaligned page access */ tmp_root = (struct vmcs *)((intptr_t )vmcs +1 );
@@ -1592,10 +1592,10 @@ static void test_vmx_caps(void)printf ("\nTest suite: VMX capability reporting\n" ); -report ((basic.revision & (1ul <<31 )) ==0 && - basic.size >0 && basic.size <=4096 && - (basic.type ==0 || basic.type ==6 ) && - basic.reserved1 ==0 && basic.reserved2 ==0 , +report ((basic_msr.revision & (1ul <<31 )) ==0 && + basic_msr.size >0 && basic_msr.size <=4096 && + (basic_msr.type ==0 || basic_msr.type ==6 ) && + basic_msr.reserved1 ==0 && basic_msr.reserved2 ==0 ,"MSR_IA32_VMX_BASIC" ); val =rdmsr (MSR_IA32_VMX_MISC );
@@ -1609,7 +1609,7 @@ static void test_vmx_caps(void) default1 = vmx_ctl_msr[n].default1; ok = (ctrl.set & default1) == default1; ok = ok && (ctrl.set & ~ctrl.clr) ==0 ; -if (ok && basic.ctrl) { +if (ok && basic_msr.ctrl) { true_ctrl.val =rdmsr (vmx_ctl_msr[n].true_index); ok = ctrl.clr == true_ctrl.clr; ok = ok && ctrl.set == (true_ctrl.set | default1);
x86/vmx.h +2 -2
@@ -156,7 +156,7 @@ struct vmx_test {void (*v2)(void ); }; -union vmx_basic { +union vmx_basic_msr {u64 val;struct {u32 revision;
@@ -778,7 +778,7 @@ enum vm_entry_failure_code {extern struct regs regs; -extern union vmx_basic basic; +extern union vmx_basic_msr basic_msr;extern union vmx_ctrl_msr ctrl_pin_rev;extern union vmx_ctrl_msr ctrl_cpu_rev[2 ];extern union vmx_ctrl_msr ctrl_exit_rev;
x86/vmx_tests.c +5 -5
@@ -3427,7 +3427,7 @@ static void test_pin_based_ctls(void) {unsigned bit; -printf ("%s: %lx\n" , basic.ctrl ?"MSR_IA32_VMX_TRUE_PIN" : +printf ("%s: %lx\n" , basic_msr.ctrl ?"MSR_IA32_VMX_TRUE_PIN" :"MSR_IA32_VMX_PINBASED_CTLS" , ctrl_pin_rev.val);for (bit =0 ; bit <32 ; bit++) test_rsvd_ctl_bit("pin-based controls",
@@ -3444,7 +3444,7 @@ static void test_primary_processor_based_ctls(void) {unsigned bit; -printf ("\n%s: %lx\n" , basic.ctrl ?"MSR_IA32_VMX_TRUE_PROC" : +printf ("\n%s: %lx\n" , basic_msr.ctrl ?"MSR_IA32_VMX_TRUE_PROC" :"MSR_IA32_VMX_PROCBASED_CTLS" , ctrl_cpu_rev[0 ].val);for (bit =0 ; bit <32 ; bit++) test_rsvd_ctl_bit("primary processor-based controls",
@@ -5287,7 +5287,7 @@ static void test_entry_msr_load(void)report_prefix_pop (); } -if (basic.val & (1ul <<48 )) +if (basic_msr.val & (1ul <<48 )) addr_len =32 ; test_vmcs_addr_values("VM-entry-MSR-load address",
@@ -5415,7 +5415,7 @@ static void test_exit_msr_store(void)report_prefix_pop (); } -if (basic.val & (1ul <<48 )) +if (basic_msr.val & (1ul <<48 )) addr_len =32 ; test_vmcs_addr_values("VM-exit-MSR-store address",
@@ -10173,7 +10173,7 @@ static void vmx_vmcs_shadow_test(void)vmcs_write (VMWRITE_BITMAP ,virt_to_phys (bitmap[ACCESS_VMWRITE ])); shadow =alloc_page (); - shadow->hdr.revision_id = basic.revision; + shadow->hdr.revision_id = basic_msr.revision; shadow->hdr.shadow_vmcs =1 ;TEST_ASSERT (!vmcs_clear (shadow));
Signature · 1 line
2.27.0
PATCH v2 3/3 x86:VMX: Introduce new vmx_basic MSR feature bit for vmx tests
In reply to Yang WeijiangIntroduce IA32_VMX_BASIC[bit56] support, i.e., skipping HW consistency check for event error code if the bit is supported..
CET KVM enabling series introduces the vmx_basic_msr feature bit and it causes some of the original test cases expecting a VM entry failure end up with a successful result and the selftests report test failures. Now checks the VM launch status conditionally against the bit support status so as to make test results consistent with the change enforced by KVM.
--- x86/vmx.h | 3 ++- x86/vmx_tests.c | 21 +++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-)
x86/vmx.h +2 -1
@@ -167,7 +167,8 @@ union vmx_basic_msr { type:4, insouts:1, ctrl:1, - reserved2:8; + no_hw_errcode_cc:1, + reserved2:7; }; };
x86/vmx_tests.c +17 -4
@@ -4173,7 +4173,10 @@ static void test_invalid_event_injection(void) ent_intr_info);vmcs_write (GUEST_CR0 , guest_cr0_save & ~X86_CR0_PE & ~X86_CR0_PG );vmcs_write (ENT_INTR_INFO , ent_intr_info); -test_vmx_invalid_controls (); +if (basic_msr.no_hw_errcode_cc) +test_vmx_valid_controls (); +else +test_vmx_invalid_controls ();report_prefix_pop (); ent_intr_info = ent_intr_info_base | INTR_INFO_DELIVER_CODE_MASK |
@@ -4206,7 +4209,10 @@ static void test_invalid_event_injection(void) ent_intr_info);vmcs_write (GUEST_CR0 , guest_cr0_save |X86_CR0_PE );vmcs_write (ENT_INTR_INFO , ent_intr_info); -test_vmx_invalid_controls (); +if (basic_msr.no_hw_errcode_cc) +test_vmx_valid_controls (); +else +test_vmx_invalid_controls ();report_prefix_pop ();vmcs_write (CPU_EXEC_CTRL1 , secondary_save);
@@ -4228,7 +4234,11 @@ skip_unrestricted_guest:report_prefix_pushf ("VM-entry intr info=0x%x [-]" , ent_intr_info);vmcs_write (ENT_INTR_INFO , ent_intr_info); -test_vmx_invalid_controls (); +if (exception_type_mask ==INTR_TYPE_HARD_EXCEPTION && + basic_msr.no_hw_errcode_cc) +test_vmx_valid_controls (); +else +test_vmx_invalid_controls ();report_prefix_pop (); }report_prefix_pop ();
@@ -4265,7 +4275,10 @@ skip_unrestricted_guest:report_prefix_pushf ("VM-entry intr info=0x%x [-]" , ent_intr_info);vmcs_write (ENT_INTR_INFO , ent_intr_info); -test_vmx_invalid_controls (); +if (basic_msr.no_hw_errcode_cc) +test_vmx_valid_controls (); +else +test_vmx_invalid_controls ();report_prefix_pop ();/* Positive case */
Signature · 1 line
2.27.0
Quoted 7 lines · Yang Weijiang
CET KVM series causes sereral test cases fail due to:
1) New introduced constraints between CR0.WP and CR4.CET bits, i.e., setting CR4.CET == 1 fails if CR0.WP == 0, and setting CR0.WP == 0 fails if CR4.CET
== 1
2) New introduced support of VMX_BASIC[bit56], i.e., skipping HW consistent check for event error code if the bit is set.
Queued, thanks.
Paolo
Quoted 15 lines
Opportunistically rename related struct and variable to avoid confusion.
Yang Weijiang (3):
x86: VMX: Exclude CR4.CET from thetest_vmxon_bad_cr()
x86: VMX: Rename unionvmx_basicand related global variable x86:VMX: Introduce newvmx_basicMSR feature bit for vmx testsx86/vmx.c | 46 +++++++++++++++++++++++----------------------- x86/vmx.h | 7 ++++--- x86/vmx_tests.c | 31 ++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 35 deletions(-)--
2.27.0
Quoted 8 lines · Paolo Bonzini
Quoted 6 lines · Yang Weijiang
CET KVM series causes sereral test cases fail due to:
1) New introduced constraints between CR0.WP and CR4.CET bits, i.e., setting CR4.CET == 1 fails if CR0.WP == 0, and setting CR0.WP == 0 fails if CR4.CET
== 1
2) New introduced support of VMX_BASIC[bit56], i.e., skipping HW consistent check for event error code if the bit is set.Queued, thanks.
Hi, Paolo,
I don't find the fixup patches in this series merged in kvm-unit-tests, could you double check? Thanks!
Quoted 18 lines
Paolo
Quoted 15 lines
Opportunistically rename related struct and variable to avoid confusion.
Yang Weijiang (3):
x86: VMX: Exclude CR4.CET from thetest_vmxon_bad_cr()
x86: VMX: Rename unionvmx_basicand related global variable x86:VMX: Introduce newvmx_basicMSR feature bit for vmx testsx86/vmx.c | 46 +++++++++++++++++++++++----------------------- x86/vmx.h | 7 ++++--- x86/vmx_tests.c | 31 ++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 35 deletions(-)--
2.27.0
Quoted 8 lines · Yang Weijiang
CET KVM series causes sereral test cases fail due to:
1) New introduced constraints between CR0.WP and CR4.CET bits, i.e., setting CR4.CET == 1 fails if CR0.WP == 0, and setting CR0.WP == 0 fails if CR4.CET
== 1
2) New introduced support of VMX_BASIC[bit56], i.e., skipping HW consistent check for event error code if the bit is set.[...]
Applied to kvm-x86 next, thanks!
[1/3] x86: VMX: Exclude CR4.CET from the test_vmxon_bad_cr()
https://github.com/kvm-x86/kvm-unit-tests/commit/b518eb1397f4 [2/3] x86: VMX: Rename union vmx_basic and related global variable https://github.com/kvm-x86/kvm-unit-tests/commit/0903962d63f5 [3/3] x86:VMX: Introduce new vmx_basic MSR feature bit for vmx tests https://github.com/kvm-x86/kvm-unit-tests/commit/9b27e5d66846