Add additional testing for routing L2 exceptions
v3 cover Add additional testing for routing L2 exceptions
In a previous series testing was added to verify that when a #PF occured in L2 the exception was routed to the correct place. In this series other exceptions are tested (ie: #GP, #UD, #DE, #DB, #BP, #AC).
v2 -> v3:
- Commits 1 and 2 from v2 were accepted upstream (bug fixes).
- Moved exception_mnemonic() into a separate commit.
- Moved support for running a nested guest multiple times in one test into a separate commit.
- Moved the test framework into the same commit as the test itself.
- Simplified the test framework and test code based on Sean's recommendations.
v1 -> v2:
- Add guest_stack_top and guest_syscall_stack_top for aligning L2's stacks.
- Refactor test to make it more extensible (ie: Added vmx_exception_tests array and framework around it).
- Split test into 2 commits:
1. Test infrustructure.
2. Test cases.
Aaron Lewis (3):
x86: Make exception_mnemonic() visible to the tests
x86: Add support for running a nested guest multiple times in one test
x86: Add test coverage for nested_vmx_reflect_vmexit() testing
lib/x86/desc.c | 2 +- lib/x86/desc.h | 1 + x86/unittests.cfg | 7 +++ x86/vmx.c | 24 ++++++++- x86/vmx.h | 2 + x86/vmx_tests.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 162 insertions(+), 3 deletions(-)
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v3 1/3 x86: Make exception_mnemonic() visible to the tests
exception_mnemonic() is a useful function for more than just desc.c. Make it global, so it can be used in other KUT tests.
--- lib/x86/desc.c | 2 +- lib/x86/desc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
lib/x86/desc.c +1 -1
@@ -91,7 +91,7 @@ struct ex_record {extern struct ex_record exception_table_start, exception_table_end; -static const char *exception_mnemonic (int vector) +const char *exception_mnemonic (int vector) {switch (vector) {case 0 :return "#DE" ;
lib/x86/desc.h +1 -0
@@ -224,6 +224,7 @@ void set_intr_alt_stack(int e, void *fn);void print_current_tss_info (void );handler handle_exception (u8 v,handler fn);void unhandled_exception (struct ex_regs *regs,bool cpu); +const char *exception_mnemonic (int vector);bool test_for_exception (unsigned int ex,void (*trigger_func)(void *data),void *data);
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v3 2/3 x86: Add support for running a nested guest multiple times in one test
In reply to Aaron LewisKUT has a limit of only being able to run one nested guest per vmx test. This is limiting and not necessary. Add support for allowing a test to run guest code multiple times.
--- x86/vmx.c | 24 ++++++++++++++++++++++-- x86/vmx.h | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-)
x86/vmx.c +22 -2
@@ -1884,15 +1884,35 @@ void test_add_teardown(test_teardown_func func, void *data) step->data = data; } +static void __test_set_guest (test_guest_func func) +{ +assert (current->v2); + v2_guest_main = func; +} +/* * Set the target of the first enter_guest call. Can only be called once per * test. Must be called before first enter_guest call. */ void test_set_guest (test_guest_func func) { -assert (current->v2);TEST_ASSERT_MSG (!v2_guest_main,"Already set guest func." ); - v2_guest_main = func; +__test_set_guest (func); +} + +/* +* Set the target of the enter_guest call and reset the RIP so 'func' will +* start from the beginning. This can be called multiple times per test. +*/ +void test_override_guest (test_guest_func func) +{ +__test_set_guest (func); +init_vmcs_guest (); +} + +void test_set_guest_finished (void ) +{ + guest_finished =1 ; }static void check_for_guest_termination (union exit_reason exit_reason)
x86/vmx.h +2 -0
@@ -1055,7 +1055,9 @@ void hypercall(u32 hypercall_no);typedef void (*test_guest_func )(void );typedef void (*test_teardown_func )(void *data);void test_set_guest (test_guest_func func); +void test_override_guest (test_guest_func func);void test_add_teardown (test_teardown_func func,void *data);void test_skip (const char *msg); +void test_set_guest_finished (void );#endif
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
PATCH v3 3/3 x86: Add test coverage for nested_vmx_reflect_vmexit() testing
In reply to Aaron LewisAdd a framework and test cases to ensure exceptions that occur in L2 are forwarded to the correct place by nested_vmx_reflect_vmexit().
Add testing for exceptions: #GP, #UD, #DE, #DB, #BP, and #AC.
--- x86/unittests.cfg | 7 +++ x86/vmx_tests.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+)
x86/unittests.cfg +7 -0
@@ -390,6 +390,13 @@ arch = x86_64 groups = vmx nested_exception check = /sys/module/kvm_intel/parameters/allow_smaller_maxphyaddr=Y +[vmx_exception_test] +file = vmx.flat +extra_params = -cpu max,+vmx -append vmx_exception_test +arch = x86_64 +groups = vmx nested_exception +timeout = 10 + [debug] file = debug.flat arch = x86_64
x86/vmx_tests.c +129 -0
146 lines not on this page · raw message
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog