x86/emulator: Add some tests for loading segment descriptor in emulator
v4 cover x86/emulator: Add some tests for loading segment descriptor in emulator
Add some far ret and far jmp tests for the related x86 emulator bugs[*]. Those tests would be tested both on hardware and emulator. Enable kvm.force_emulation_prefix to test them on emulator.
Changed from v3:
- Fix build failure with --target-efi.
Changed from v2:
- Fix some complication errors, which are not gotten in my gcc.
- Rename lret as far ret, and rename ljmp as far jmp.
Changed from v1:
- As Sean suggested, refactor the test loop to make the code simple.
v3: https://lore.kernel.org/kvm/[email protected]
[*] https://lore.kernel.org/kvm/[email protected]
Hou Wenlong (3):
x86/emulator: Add some tests for far ret instruction emulation x86/emulator: Rename test_ljmp() as test_far_jmp() x86/emulator: Add some tests for far jmp instruction emulation
x86/emulator.c | 203 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 189 insertions(+), 14 deletions(-)
--
2.31.1
PATCH v4 1/3 x86/emulator: Add some tests for far ret instruction emulation
Per Intel's SDM on the "Instruction Set Reference", when loading segment descriptor for far return, not-present segment check should be after all type and privilege checks. However, __load_segment_descriptor() in x86's emulator does not-present segment check first, so it would trigger #NP instead of #GP if type or privilege checks fail and the segment is not present.
And if RPL < CPL, it should trigger #GP, but the check is missing in emulator.
So add some tests for far ret instruction, and it will test those tests on hardware and emulator. Enable kvm.force_emulation_prefix when try to test them on emulator.
--- x86/emulator.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+)
x86/emulator.c +130 -0
@@ -21,6 +21,61 @@ static int exceptions;#define KVM_FEP "ud2; .byte 'k', 'v', 'm';"#define KVM_FEP_LENGTH 5static int fep_available =1 ; +static int far_xfer_vector =-1 ; +static unsigned int far_xfer_error_code =-1 ; + +struct far_xfer_test_case { +uint16_t rpl; +uint16_t type; +uint16_t dpl; +uint16_t p; +bool usermode; +int vector; +const char *msg; +}; + +enum far_xfer_insn { +FAR_XFER_RET , +}; + +struct far_xfer_test { +enum far_xfer_insn insn; +const char *insn_name; +struct far_xfer_test_case *testcases; +unsigned int nr_testcases; +}; + +#define NON_CONFORM_CS_TYPE 0xb +#define CONFORM_CS_TYPE 0xf +#define DS_TYPE 0x3 + +static struct far_xfer_test_case far_ret_testcases[] = { + {0 ,DS_TYPE ,0 ,0 , false,GP_VECTOR ,"desc.type!=code && desc.p=0" }, + {0 ,NON_CONFORM_CS_TYPE ,3 ,0 , false,GP_VECTOR ,"non-conforming && dpl!=rpl && desc.p=0" }, + {0 ,CONFORM_CS_TYPE ,3 ,0 , false,GP_VECTOR ,"conforming && dpl>rpl && desc.p=0" }, + {0 ,NON_CONFORM_CS_TYPE ,0 ,0 , false,NP_VECTOR ,"desc.p=0" }, + {0 ,NON_CONFORM_CS_TYPE ,3 ,1 , true,GP_VECTOR ,"rpl<cpl" }, +}; + +static struct far_xfer_test far_ret_test = { + .insn =FAR_XFER_RET , + .insn_name ="far ret" , + .testcases = &far_ret_testcases[0 ], + .nr_testcases =sizeof (far_ret_testcases) /sizeof (struct far_xfer_test_case ), +}; + +#define TEST_FAR_RET_ASM (seg, prefix) \ +({ \ + asm volatile("pushq %[asm_seg]\n\t" \ + "lea 2f(%%rip), %%rax\n\t" \ + "pushq %%rax\n\t" \ + "lea 1f(%%rip), %%rax\n\t" \ + prefix "lretq\n\t" \ + "1: addq $16, %%rsp\n\t" \ + "2:" \ + : : [asm_seg]"r"((u64)seg) \ + : "eax", "memory"); \ +})struct regs {u64 rax, rbx, rcx, rdx;
@@ -895,6 +950,79 @@ static void test_mov_dr(uint64_t *mem)report (rax ==DR6_ACTIVE_LOW ,"mov_dr6" ); } +static void far_xfer_exception_handler (struct ex_regs *regs) +{ + far_xfer_vector = regs->vector; + far_xfer_error_code = regs->error_code; + regs->rip = regs->rax; +} + +static void __test_far_xfer (enum far_xfer_insn insn,uint16_t seg, +bool force_emulation) +{ +switch (insn) { +case FAR_XFER_RET : +if (force_emulation) +TEST_FAR_RET_ASM (seg,KVM_FEP ); +else +TEST_FAR_RET_ASM (seg,"" ); +break ; +default : +report_fail ("Unexpected insn enum = %d\n" , insn); +break ; + } +} + +static void test_far_xfer (bool force_emulation,struct far_xfer_test *test) +{ +struct far_xfer_test_case *t; +uint16_t seg; +bool ign; +int i; + +handle_exception (GP_VECTOR , far_xfer_exception_handler); +handle_exception (NP_VECTOR , far_xfer_exception_handler); + +for (i =0 ; i < test->nr_testcases; i++) { + t = &test->testcases[i]; + + seg =FIRST_SPARE_SEL | t->rpl; + gdt[seg /8 ] = gdt[(t->usermode ?USER_CS64 :KERNEL_CS ) /8 ]; + gdt[seg /8 ].type = t->type; + gdt[seg /8 ].dpl = t->dpl; + gdt[seg /8 ].p = t->p; + + far_xfer_vector =-1 ; + far_xfer_error_code =-1 ; + +if (t->usermode) +run_in_user ((usermode_func )__test_far_xfer,UD_VECTOR , + test->insn, seg, force_emulation,0 , &ign); +else +__test_far_xfer (test->insn, seg, force_emulation); + +report (far_xfer_vector == t->vector && + (far_xfer_vector <0 || far_xfer_error_code ==FIRST_SPARE_SEL ), +"%s on %s, %s: wanted %d (%d), got %d (%d)" , + test->insn_name, force_emulation ?"emulator" :"hardware" , t->msg, + t->vector, t->vector <0 ?-1 :FIRST_SPARE_SEL , + far_xfer_vector, far_xfer_error_code); + } + +handle_exception (GP_VECTOR ,0 ); +handle_exception (NP_VECTOR ,0 ); +} + +static void test_far_ret (uint64_t *mem) +{ +test_far_xfer (false, &far_ret_test); +} + +static void test_em_far_ret (uint64_t *mem) +{ +test_far_xfer (true, &far_ret_test); +} +static void test_push16 (uint64_t *mem) {uint64_t rsp1, rsp2;
@@ -1169,6 +1297,7 @@ int main(void)test_smsw (mem);test_lmsw ();test_ljmp (mem); +test_far_ret (mem);test_stringio ();test_incdecnotneg (mem);test_btc (mem);
@@ -1193,6 +1322,7 @@ int main(void)test_smsw_reg (mem);test_nop (mem);test_mov_dr (mem); +test_em_far_ret (mem); }else {report_skip ("skipping register-only tests, " "use kvm.force_emulation_prefix=1 to enable" );
Signature · 1 line
2.31.1
PATCH v4 2/3 x86/emulator: Rename test_ljmp() as test_far_jmp()
In reply to Hou WenlongRename test_ljmp() as test_far_jmp() to better match the SDM. Also change the output of test to explain what it is doing.
--- x86/emulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
x86/emulator.c +3 -3
@@ -359,7 +359,7 @@ static void test_pop(void *mem) "enter"); } -static void test_ljmp (void *mem) +static void test_far_jmp (void *mem) {unsigned char *m = mem;volatile int res =1 ;
@@ -369,7 +369,7 @@ static void test_ljmp(void *mem) asmvolatile ("rex64 ljmp *%0" ::"m" (*m)); res =0 ; jmpf: -report (res,"ljmp" ); +report (res,"far jmp, via emulated MMIO" ); }static void test_incdecnotneg (void *mem)
@@ -1296,7 +1296,7 @@ int main(void)test_smsw (mem);test_lmsw (); -test_ljmp (mem); +test_far_jmp (mem);test_far_ret (mem);test_stringio ();test_incdecnotneg (mem);
Signature · 1 line
2.31.1
PATCH v4 3/3 x86/emulator: Add some tests for far jmp instruction emulation
In reply to Hou WenlongPer Intel's SDM on the "Instruction Set Reference", when loading segment descriptor for far jmp, not-present segment check should be after all type and privilege checks. However, __load_segment_descriptor() in x86's emulator does not-present segment check first, so it would trigger #NP instead of #GP if type or privilege checks fail and the segment is not present.
So add some tests for far jmp instruction, and it will test those tests on hardware and emulator. Enable kvm.force_emulation_prefix when try to test them on emulator.
--- x86/emulator.c | 71 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 13 deletions(-)
x86/emulator.c +58 -13
@@ -36,6 +36,7 @@ struct far_xfer_test_case {enum far_xfer_insn {FAR_XFER_RET , +FAR_XFER_JMP , };struct far_xfer_test {
@@ -64,6 +65,25 @@ static struct far_xfer_test far_ret_test = { .nr_testcases = sizeof(far_ret_testcases) / sizeof(struct far_xfer_test_case), }; +static struct far_xfer_test_case far_jmp_testcases[] = { + {0 ,DS_TYPE ,0 ,0 , false,GP_VECTOR ,"desc.type!=code && desc.p=0" }, + {0 ,NON_CONFORM_CS_TYPE ,3 ,0 , false,GP_VECTOR ,"non-conforming && dpl!=cpl && desc.p=0" }, + {3 ,NON_CONFORM_CS_TYPE ,0 ,0 , false,GP_VECTOR ,"conforming && rpl>cpl && desc.p=0" }, + {0 ,CONFORM_CS_TYPE ,3 ,0 , false,GP_VECTOR ,"conforming && dpl>cpl && desc.p=0" }, + {0 ,NON_CONFORM_CS_TYPE ,0 ,0 , false,NP_VECTOR ,"desc.p=0" }, + {3 ,CONFORM_CS_TYPE ,0 ,1 , true,-1 ,"dpl<cpl" }, +}; + +static struct far_xfer_test far_jmp_test = { + .insn =FAR_XFER_JMP , + .insn_name ="far jmp" , + .testcases = &far_jmp_testcases[0 ], + .nr_testcases =sizeof (far_jmp_testcases) /sizeof (struct far_xfer_test_case ), +}; + +static unsigned long fep_jmp_buf[2 ]; +static unsigned long *fep_jmp_buf_ptr = &fep_jmp_buf[0 ]; +#define TEST_FAR_RET_ASM (seg, prefix) \ ({ \ asm volatile("pushq %[asm_seg]\n\t" \
@@ -77,6 +97,17 @@ static struct far_xfer_test far_ret_test = { : "eax", "memory"); \ }) +#define TEST_FAR_JMP_ASM (seg, prefix) \ +({ \ + *(uint16_t *)(&fep_jmp_buf[1]) = seg; \ + asm volatile("lea 1f(%%rip), %%rax\n\t" \ + "movq %%rax, (%[mem])\n\t" \ + prefix "rex64 ljmp *(%[mem])\n\t" \ + "1:" \ + : : [mem]"r"(fep_jmp_buf_ptr) \ + : "eax", "memory"); \ +}) +struct regs {u64 rax, rbx, rcx, rdx;u64 rsi, rdi, rsp, rbp;
@@ -359,19 +390,6 @@ static void test_pop(void *mem) "enter"); } -static void test_far_jmp (void *mem) -{ -unsigned char *m = mem; -volatile int res =1 ; - - *(unsigned long **)m = &&jmpf; - asmvolatile ("data16 mov %%cs, %0" :"=m" (*(m +sizeof (unsigned long )))); - asmvolatile ("rex64 ljmp *%0" ::"m" (*m)); - res =0 ; -jmpf: -report (res,"far jmp, via emulated MMIO" ); -} -static void test_incdecnotneg (void *mem) {unsigned long *m = mem, v =1234 ;
@@ -967,6 +985,12 @@ static void __test_far_xfer(enum far_xfer_insn insn, uint16_t seg,else TEST_FAR_RET_ASM (seg,"" );break ; +case FAR_XFER_JMP : +if (force_emulation) +TEST_FAR_JMP_ASM (seg,KVM_FEP ); +else +TEST_FAR_JMP_ASM (seg,"" ); +break ;default :report_fail ("Unexpected insn enum = %d\n" , insn);break ;
@@ -1013,6 +1037,26 @@ static void test_far_xfer(bool force_emulation, struct far_xfer_test *test)handle_exception (NP_VECTOR ,0 ); } +static void test_far_jmp (uint64_t *mem) +{ +unsigned char *m = (unsigned char *)mem; +volatile int res =1 ; + + *(unsigned long **)m = &&jmpf; + asmvolatile ("data16 mov %%cs, %0" :"=m" (*(m +sizeof (unsigned long )))); + asmvolatile ("rex64 ljmp *%0" ::"m" (*m)); + res =0 ; +jmpf: +report (res,"far jmp, via emulated MMIO" ); + +test_far_xfer (false, &far_jmp_test); +} + +static void test_em_far_jmp (uint64_t *mem) +{ +test_far_xfer (true, &far_jmp_test); +} +static void test_far_ret (uint64_t *mem) {test_far_xfer (false, &far_ret_test);
@@ -1322,6 +1366,7 @@ int main(void)test_smsw_reg (mem);test_nop (mem);test_mov_dr (mem); +test_em_far_jmp (mem);test_em_far_ret (mem); }else { report_skip("skipping register-only tests, "
Signature · 1 line
2.31.1