Common KVM exit reason test assertions and exit reason sync
v2 cover Common KVM exit reason test assertions and exit reason sync
Hi,
This patch seris is extracted from
https://lore.kernel.org/lkml/[email protected]/
series.
Specifically, patch 12 is taken out from there and now expanded in to this series.
This patch series contains following changes:
Patch 1 & 2:
Make a macro to clean up all KVM exit reason test assertion.
There are few places where explicit run->exit_reason are used but they cannot be replaced with current macro.
I used following command KVM selftests directory and changed each occurrence:
grep "run->exit_reason" -nir ./
Patch 3:
This is from Sean Christopherson. Adding a macro to generate KVM exit strings.
Patch 4:
Sync KVM_EXIT_* reasons to sefltests. Many reasons are not present in selftest code.
v2:
- Improve test assert message.
- Add macro to generate KVM_EXIT_* reason strings.
- Update selftests KVM_EXIT_ reasons to latest version.
v1: https://lore.kernel.org/lkml/[email protected]/
Sean Christopherson (1):
KVM: selftests: Add macro to generate KVM exit reason strings
Vipin Sharma (3):
KVM: selftests: Make vCPU exit reason test assertion common
KVM: selftests: Print expected and actual exit reason in KVM exit
reason assert
KVM: selftests: Sync KVM exit reasons in selftests
.../testing/selftests/kvm/aarch64/psci_test.c | 4 +- .../testing/selftests/kvm/include/test_util.h | 9 +++ tools/testing/selftests/kvm/lib/kvm_util.c | 66 ++++++++++++------- .../kvm/lib/s390x/diag318_test_handler.c | 3 +- .../selftests/kvm/s390x/sync_regs_test.c | 15 +---- .../selftests/kvm/set_memory_region_test.c | 6 +- tools/testing/selftests/kvm/x86_64/amx_test.c | 8 +-- .../kvm/x86_64/cr4_cpuid_sync_test.c | 8 +-- .../testing/selftests/kvm/x86_64/debug_regs.c | 2 +- .../selftests/kvm/x86_64/flds_emulation.h | 5 +- .../selftests/kvm/x86_64/hyperv_clock.c | 7 +- .../selftests/kvm/x86_64/hyperv_evmcs.c | 8 +-- .../selftests/kvm/x86_64/hyperv_features.c | 14 +--- .../testing/selftests/kvm/x86_64/hyperv_ipi.c | 6 +- .../selftests/kvm/x86_64/hyperv_svm_test.c | 7 +- .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 14 +--- .../selftests/kvm/x86_64/kvm_clock_test.c | 5 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 5 +- .../selftests/kvm/x86_64/monitor_mwait_test.c | 9 +-- .../kvm/x86_64/nested_exceptions_test.c | 5 +- .../selftests/kvm/x86_64/platform_info_test.c | 14 +--- .../kvm/x86_64/pmu_event_filter_test.c | 6 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 9 +-- .../testing/selftests/kvm/x86_64/state_test.c | 8 +-- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 8 +-- .../kvm/x86_64/svm_nested_shutdown_test.c | 7 +- .../kvm/x86_64/svm_nested_soft_inject_test.c | 6 +- .../selftests/kvm/x86_64/svm_vmcall_test.c | 6 +- .../selftests/kvm/x86_64/sync_regs_test.c | 25 ++----- .../kvm/x86_64/triple_fault_event_test.c | 9 +-- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 6 +- .../kvm/x86_64/ucna_injection_test.c | 22 ++----- .../selftests/kvm/x86_64/userspace_io_test.c | 6 +- .../kvm/x86_64/userspace_msr_exit_test.c | 22 ++----- .../kvm/x86_64/vmx_apic_access_test.c | 11 +--- .../kvm/x86_64/vmx_close_while_nested_test.c | 5 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 7 +- .../vmx_exception_with_invalid_guest_state.c | 4 +- .../x86_64/vmx_invalid_nested_guest_state.c | 4 +- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 6 +- .../kvm/x86_64/vmx_preemption_timer_test.c | 8 +-- .../kvm/x86_64/vmx_tsc_adjust_test.c | 6 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 6 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 7 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 5 +- 45 files changed, 111 insertions(+), 318 deletions(-)
Signature · 1 line
2.39.1.519.gcb327c4b5f-goog
PATCH v2 1/4 KVM: selftests: Make vCPU exit reason test assertion common
Make TEST_ASSERT_KVM_EXIT_REASON() macro and replace all exit reason test assert statements with it.
No functional changes intended.
--- .../testing/selftests/kvm/aarch64/psci_test.c | 4 +-- .../testing/selftests/kvm/include/test_util.h | 8 ++++++ .../kvm/lib/s390x/diag318_test_handler.c | 3 +-- .../selftests/kvm/s390x/sync_regs_test.c | 15 +++-------- .../selftests/kvm/set_memory_region_test.c | 6 +---- tools/testing/selftests/kvm/x86_64/amx_test.c | 8 +----- .../kvm/x86_64/cr4_cpuid_sync_test.c | 8 +----- .../testing/selftests/kvm/x86_64/debug_regs.c | 2 +- .../selftests/kvm/x86_64/flds_emulation.h | 5 +--- .../selftests/kvm/x86_64/hyperv_clock.c | 7 +----- .../selftests/kvm/x86_64/hyperv_evmcs.c | 8 +----- .../selftests/kvm/x86_64/hyperv_features.c | 14 ++--------- .../testing/selftests/kvm/x86_64/hyperv_ipi.c | 6 +---- .../selftests/kvm/x86_64/hyperv_svm_test.c | 7 +----- .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 14 ++--------- .../selftests/kvm/x86_64/kvm_clock_test.c | 5 +--- .../selftests/kvm/x86_64/kvm_pv_test.c | 5 +--- .../selftests/kvm/x86_64/monitor_mwait_test.c | 9 +------ .../kvm/x86_64/nested_exceptions_test.c | 5 +--- .../selftests/kvm/x86_64/platform_info_test.c | 14 +++-------- .../kvm/x86_64/pmu_event_filter_test.c | 6 +---- tools/testing/selftests/kvm/x86_64/smm_test.c | 9 +------ .../testing/selftests/kvm/x86_64/state_test.c | 8 +----- .../selftests/kvm/x86_64/svm_int_ctl_test.c | 8 +----- .../kvm/x86_64/svm_nested_shutdown_test.c | 7 +----- .../kvm/x86_64/svm_nested_soft_inject_test.c | 6 +---- .../selftests/kvm/x86_64/svm_vmcall_test.c | 6 +---- .../selftests/kvm/x86_64/sync_regs_test.c | 25 ++++--------------- .../kvm/x86_64/triple_fault_event_test.c | 9 ++----- .../selftests/kvm/x86_64/tsc_scaling_sync.c | 6 +---- .../kvm/x86_64/ucna_injection_test.c | 22 +++------------- .../selftests/kvm/x86_64/userspace_io_test.c | 6 +---- .../kvm/x86_64/userspace_msr_exit_test.c | 22 +++------------- .../kvm/x86_64/vmx_apic_access_test.c | 11 ++------ .../kvm/x86_64/vmx_close_while_nested_test.c | 5 +--- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 7 +----- .../vmx_exception_with_invalid_guest_state.c | 4 +-- .../x86_64/vmx_invalid_nested_guest_state.c | 4 +-- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 6 +---- .../kvm/x86_64/vmx_preemption_timer_test.c | 8 +----- .../kvm/x86_64/vmx_tsc_adjust_test.c | 6 +---- .../selftests/kvm/x86_64/xapic_ipi_test.c | 6 +---- .../selftests/kvm/x86_64/xen_shinfo_test.c | 7 +----- .../selftests/kvm/x86_64/xen_vmcall_test.c | 5 +--- 44 files changed, 69 insertions(+), 293 deletions(-)
tools/testing/selftests/kvm/aarch64/psci_test.c +1 -3
@@ -180,9 +180,7 @@ static void host_test_system_suspend(void)enter_guest (source); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SYSTEM_EVENT , -"Unhandled exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (source,KVM_EXIT_SYSTEM_EVENT );TEST_ASSERT (run->system_event.type ==KVM_SYSTEM_EVENT_SUSPEND ,"Unhandled system event: %u (expected: %u)" , run->system_event.type,KVM_SYSTEM_EVENT_SUSPEND );
tools/testing/selftests/kvm/include/test_util.h +8 -0
@@ -63,6 +63,14 @@ void test_assert(bool exp, const char *exp_str,#a , #b, #a, (unsigned long) __a, #b, (unsigned long) __b); \ } while (0) +#define TEST_ASSERT_KVM_EXIT_REASON (vcpu, expected) do { \ + __u32 exit_reason = (vcpu)->run->exit_reason; \ + \ + TEST_ASSERT(exit_reason == (expected), \ + "Unexpected exit reason: %u (%s)", \ + exit_reason, exit_reason_str(exit_reason)); \ +} while (0) +#define TEST_FAIL (fmt, ...) do { \ TEST_ASSERT(false, fmt, ##__VA_ARGS__); \ __builtin_unreachable(); \
tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c +1 -2
@@ -35,8 +35,7 @@ static uint64_t diag318_handler(void)vcpu_run (vcpu); run = vcpu->run; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"DIAGNOSE 0x0318 instruction was not intercepted" ); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC );TEST_ASSERT (run->s390_sieic.icptcode ==ICPT_INSTRUCTION ,"Unexpected intercept code: 0x%x" , run->s390_sieic.icptcode); TEST_ASSERT((run->s390_sieic.ipa & 0xff00) == IPA0_DIAG,
tools/testing/selftests/kvm/s390x/sync_regs_test.c +3 -12
@@ -126,10 +126,7 @@ void test_req_and_verify_all_valid_regs(struct kvm_vcpu *vcpu) run->kvm_valid_regs =TEST_SYNC_FIELDS ; rv =_vcpu_run (vcpu);TEST_ASSERT (rv ==0 ,"vcpu_run failed: %d\n" , rv); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"Unexpected exit reason: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC ); TEST_ASSERT(run->s390_sieic.icptcode == 4 && (run->s390_sieic.ipa >> 8) == 0x83 && (run->s390_sieic.ipb >> 16) == 0x501,
@@ -165,10 +162,7 @@ void test_set_and_verify_various_reg_values(struct kvm_vcpu *vcpu) rv =_vcpu_run (vcpu);TEST_ASSERT (rv ==0 ,"vcpu_run failed: %d\n" , rv); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"Unexpected exit reason: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC );TEST_ASSERT (run->s.regs.gprs[11 ] ==0xBAD1DEA +1 ,"r11 sync regs value incorrect 0x%llx." , run->s.regs.gprs[11 ]);
@@ -200,10 +194,7 @@ void test_clear_kvm_dirty_regs_bits(struct kvm_vcpu *vcpu) run->s.regs.diag318 =0x4B1D ; rv =_vcpu_run (vcpu);TEST_ASSERT (rv ==0 ,"vcpu_run failed: %d\n" , rv); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC , -"Unexpected exit reason: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_S390_SIEIC );TEST_ASSERT (run->s.regs.gprs[11 ] !=0xDEADBEEF ,"r11 sync regs value incorrect 0x%llx." , run->s.regs.gprs[11 ]);
tools/testing/selftests/kvm/set_memory_region_test.c +1 -5
@@ -308,7 +308,6 @@ static void test_delete_memory_region(void)static void test_zero_memory_regions (void ) {struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;pr_info ("Testing KVM_RUN with zero added memory regions\n" );
@@ -318,10 +317,7 @@ static void test_zero_memory_regions(void)vm_ioctl (vm,KVM_SET_NR_MMU_PAGES , (void *)64ul );vcpu_run (vcpu); - - run = vcpu->run; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_INTERNAL_ERROR , -"Unexpected exit_reason = %u\n" , run->exit_reason); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR );kvm_vm_free (vm); }
tools/testing/selftests/kvm/x86_64/amx_test.c +1 -7
@@ -241,7 +241,6 @@ int main(int argc, char *argv[])struct kvm_regs regs1, regs2;struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_x86_state *state;int xsave_restore_size;vm_vaddr_t amx_cfg, tiledata, xsavedata;
@@ -268,7 +267,6 @@ int main(int argc, char *argv[]) "KVM should enumerate max XSAVE size when XSAVE is supported"); xsave_restore_size =kvm_cpu_property (X86_PROPERTY_XSTATE_MAX_SIZE ); - run = vcpu->run;vcpu_regs_get (vcpu, ®s1);/* Register #NM handler */
@@ -291,10 +289,7 @@ int main(int argc, char *argv[])for (stage =1 ; ; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -350,7 +345,6 @@ int main(int argc, char *argv[])/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2));
tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +1 -7
@@ -50,7 +50,6 @@ static void guest_code(void)int main (int argc,char *argv[]) {struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct kvm_sregs sregs;struct ucall uc;
@@ -58,15 +57,10 @@ int main(int argc, char *argv[])TEST_REQUIRE (kvm_cpu_has (X86_FEATURE_XSAVE )); vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run;while (1 ) {vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/debug_regs.c +1 -1
@@ -204,7 +204,7 @@ int main(void)vcpu_guest_debug_set (vcpu, &debug);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO ,"KVM_EXIT_IO" ); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO ); cmd =get_ucall (vcpu, &uc);TEST_ASSERT (cmd ==UCALL_DONE ,"UCALL_DONE" );
tools/testing/selftests/kvm/x86_64/flds_emulation.h +1 -4
@@ -24,10 +24,7 @@ static inline void handle_flds_emulation_failure_exit(struct kvm_vcpu *vcpu)uint8_t *insn_bytes;uint64_t flags; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_INTERNAL_ERROR , -"Unexpected exit reason: %u (%s)" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR ); TEST_ASSERT(run->emulation_failure.suberror == KVM_INTERNAL_ERROR_EMULATION, "Unexpected suberror: %u",
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +1 -6
@@ -207,13 +207,11 @@ int main(void) {struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;vm_vaddr_t tsc_page_gva;int stage; vm =vm_create_with_one_vcpu (&vcpu, guest_main); - run = vcpu->run;vcpu_set_hv_cpuid (vcpu);
@@ -227,10 +225,7 @@ int main(void)for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c +1 -7
@@ -237,7 +237,6 @@ int main(int argc, char *argv[])struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;int stage;
@@ -266,13 +265,8 @@ int main(int argc, char *argv[])pr_info ("Running L1 which uses EVMCS to run L2\n" );for (stage =1 ;; stage++) { - run = vcpu->run; -vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_features.c +2 -12
@@ -122,7 +122,6 @@ static void guest_test_msrs_access(void) {struct kvm_cpuid2 *prev_cpuid =NULL ;struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct ucall uc;int stage =0 ;
@@ -151,8 +150,6 @@ static void guest_test_msrs_access(void)vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vcpu); - run = vcpu->run; -/* TODO: Make this entire test easier to maintain. */ if (stage >=21 )vcpu_enable_cap (vcpu,KVM_CAP_HYPERV_SYNIC2 ,0 );
@@ -494,9 +491,7 @@ static void guest_test_msrs_access(void) msr->idx, msr->write ? "write" : "read");vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -518,7 +513,6 @@ static void guest_test_hcalls_access(void) {struct kvm_cpuid2 *prev_cpuid =NULL ;struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct ucall uc;int stage =0 ;
@@ -550,8 +544,6 @@ static void guest_test_hcalls_access(void)vcpu_init_cpuid (vcpu, prev_cpuid); } - run = vcpu->run; -switch (stage) {case 0 :vcpu_set_cpuid_feature (vcpu,HV_MSR_HYPERCALL_AVAILABLE );
@@ -660,9 +652,7 @@ static void guest_test_hcalls_access(void)pr_debug ("Stage %d: testing hcall: 0x%lx\n" , stage, hcall->control);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_ipi.c +1 -5
@@ -243,7 +243,6 @@ int main(int argc, char *argv[]) {struct kvm_vm *vm;struct kvm_vcpu *vcpu[3 ]; -unsigned int exit_reason;vm_vaddr_t hcall_page;pthread_t threads[2 ];int stage =1 , r;
@@ -283,10 +282,7 @@ int main(int argc, char *argv[])while (true) {vcpu_run (vcpu[0 ]); - exit_reason = vcpu[0 ]->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu[0 ],KVM_EXIT_IO );switch (get_ucall (vcpu[0 ], &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +1 -6
@@ -156,7 +156,6 @@ int main(int argc, char *argv[])vm_vaddr_t hcall_page;struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;int stage;
@@ -165,7 +164,6 @@ int main(int argc, char *argv[])/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code);vcpu_set_hv_cpuid (vcpu); - run = vcpu->run;vcpu_alloc_svm (vm, &nested_gva);vcpu_alloc_hyperv_test_pages (vm, &hv_pages_gva);
@@ -177,10 +175,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/hyperv_tlb_flush.c +2 -12
@@ -542,18 +542,13 @@ static void *vcpu_thread(void *arg)struct ucall uc;int old;int r; -unsigned int exit_reason; r =pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS , &old);TEST_ASSERT (!r,"pthread_setcanceltype failed on vcpu_id=%u with errno=%d" , vcpu->id, r);vcpu_run (vcpu); - exit_reason = vcpu->run->exit_reason; - -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"vCPU %u exited with unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - vcpu->id, exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -587,7 +582,6 @@ int main(int argc, char *argv[]) {struct kvm_vm *vm;struct kvm_vcpu *vcpu[3 ]; -unsigned int exit_reason;pthread_t threads[2 ];vm_vaddr_t test_data_page, gva;vm_paddr_t gpa;
@@ -657,11 +651,7 @@ int main(int argc, char *argv[])while (true) {vcpu_run (vcpu[0 ]); - exit_reason = vcpu[0 ]->run->exit_reason; - -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu[0 ],KVM_EXIT_IO );switch (get_ucall (vcpu[0 ], &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/kvm_clock_test.c +1 -4
@@ -105,7 +105,6 @@ static void setup_clock(struct kvm_vm *vm, struct test_case *test_case)static void enter_guest (struct kvm_vcpu *vcpu) {struct kvm_clock_data start, end; -struct kvm_run *run = vcpu->run;struct kvm_vm *vm = vcpu->vm;struct ucall uc;int i;
@@ -118,9 +117,7 @@ static void enter_guest(struct kvm_vcpu *vcpu)vcpu_run (vcpu);vm_ioctl (vm,KVM_GET_CLOCK , &end); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +1 -4
@@ -111,14 +111,11 @@ static void pr_hcall(struct ucall *uc)static void enter_guest (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;while (true) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"unexpected exit reason: %u (%s)" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_PR_MSR :
tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c +1 -8
@@ -64,7 +64,6 @@ int main(int argc, char *argv[]) {uint64_t disabled_quirks;struct kvm_vcpu *vcpu; -struct kvm_run *run;struct kvm_vm *vm;struct ucall uc;int testcase;
@@ -74,18 +73,12 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, guest_code);vcpu_clear_cpuid_feature (vcpu,X86_FEATURE_MWAIT ); - run = vcpu->run; -vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vcpu);while (1 ) {vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/nested_exceptions_test.c +1 -4
@@ -166,12 +166,9 @@ static void __attribute__((__flatten__)) l1_guest_code(void *test_data)static void assert_ucall_vector (struct kvm_vcpu *vcpu,int vector) { -struct kvm_run *run = vcpu->run;struct ucall uc; -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/platform_info_test.c +3 -11
@@ -36,15 +36,12 @@ static void guest_code(void)static void test_msr_platform_info_enabled (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;vm_enable_cap (vcpu->vm,KVM_CAP_MSR_PLATFORM_INFO , true);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Exit_reason other than KVM_EXIT_IO: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO ); +get_ucall (vcpu, &uc);TEST_ASSERT (uc.cmd ==UCALL_SYNC ,"Received ucall other than UCALL_SYNC: %lu\n" , uc.cmd);
@@ -56,14 +53,9 @@ static void test_msr_platform_info_enabled(struct kvm_vcpu *vcpu)static void test_msr_platform_info_disabled (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run; -vm_enable_cap (vcpu->vm,KVM_CAP_MSR_PLATFORM_INFO , false);vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SHUTDOWN , -"Exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_SHUTDOWN ); }int main (int argc,char *argv[])
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 -5
@@ -151,14 +151,10 @@ static void amd_guest_code(void)*/ static uint64_t run_vcpu_to_sync (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );get_ucall (vcpu, &uc);TEST_ASSERT (uc.cmd ==UCALL_SYNC ,"Received ucall other than UCALL_SYNC: %lu" , uc.cmd);
tools/testing/selftests/kvm/x86_64/smm_test.c +1 -8
@@ -133,7 +133,6 @@ int main(int argc, char *argv[])struct kvm_vcpu *vcpu;struct kvm_regs regs;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_x86_state *state;int stage, stage_reported;
@@ -142,8 +141,6 @@ int main(int argc, char *argv[])/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run; -vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,SMRAM_GPA ,SMRAM_MEMSLOT ,SMRAM_PAGES ,0 ); TEST_ASSERT(vm_phy_pages_alloc(vm, SMRAM_PAGES, SMRAM_GPA, SMRAM_MEMSLOT)
@@ -169,10 +166,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );memset (®s,0 ,sizeof (regs));vcpu_regs_get (vcpu, ®s);
@@ -208,7 +202,6 @@ int main(int argc, char *argv[]) vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state); }
tools/testing/selftests/kvm/x86_64/state_test.c +1 -7
@@ -158,14 +158,12 @@ int main(int argc, char *argv[])struct kvm_regs regs1, regs2;struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_x86_state *state;struct ucall uc;int stage;/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run;vcpu_regs_get (vcpu, ®s1);
@@ -183,10 +181,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -214,7 +209,6 @@ int main(int argc, char *argv[])/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2));
tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c +1 -7
@@ -85,7 +85,6 @@ static void l1_guest_code(struct svm_test_data *svm)int main (int argc,char *argv[]) {struct kvm_vcpu *vcpu; -struct kvm_run *run;vm_vaddr_t svm_gva;struct kvm_vm *vm;struct ucall uc;
@@ -103,13 +102,8 @@ int main(int argc, char *argv[])vcpu_alloc_svm (vm, &svm_gva);vcpu_args_set (vcpu,1 , svm_gva); - run = vcpu->run; -vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/svm_nested_shutdown_test.c +1 -6
@@ -42,7 +42,6 @@ static void l1_guest_code(struct svm_test_data *svm, struct idt_entry *idt)int main (int argc,char *argv[]) {struct kvm_vcpu *vcpu; -struct kvm_run *run;vm_vaddr_t svm_gva;struct kvm_vm *vm;
@@ -55,13 +54,9 @@ int main(int argc, char *argv[])vcpu_alloc_svm (vm, &svm_gva);vcpu_args_set (vcpu,2 , svm_gva, vm->idt); - run = vcpu->run;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SHUTDOWN , -"Got exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_SHUTDOWN );kvm_vm_free (vm); }
tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c +1 -5
@@ -176,16 +176,12 @@ static void run_test(bool is_nmi)memset (&debug,0 ,sizeof (debug));vcpu_guest_debug_set (vcpu, &debug); -struct kvm_run *run = vcpu->run;struct ucall uc;alarm (2 );vcpu_run (vcpu);alarm (0 ); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/svm_vmcall_test.c +1 -5
@@ -47,14 +47,10 @@ int main(int argc, char *argv[])vcpu_args_set (vcpu,1 , svm_gva);for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/sync_regs_test.c +5 -20
@@ -132,10 +132,7 @@ int main(int argc, char *argv[])/* TODO: BUILD TIME CHECK: TEST_ASSERT(KVM_SYNC_X86_NUM_FIELDS != 3); */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );vcpu_regs_get (vcpu, ®s);compare_regs (®s, &run->s.regs.regs);
@@ -154,10 +151,7 @@ int main(int argc, char *argv[]) run->kvm_valid_regs =TEST_SYNC_FIELDS ; run->kvm_dirty_regs =KVM_SYNC_X86_REGS |KVM_SYNC_X86_SREGS ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx ==0xBAD1DEA +1 ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
@@ -181,10 +175,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs =0 ; run->s.regs.regs.rbx =0xDEADBEEF ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx !=0xDEADBEEF ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
@@ -199,10 +190,7 @@ int main(int argc, char *argv[]) regs.rbx =0xBAC0 ;vcpu_regs_set (vcpu, ®s); rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx ==0xAAAA ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
@@ -219,10 +207,7 @@ int main(int argc, char *argv[]) run->kvm_dirty_regs =TEST_SYNC_FIELDS ; run->s.regs.regs.rbx =0xBBBB ; rv =_vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->s.regs.regs.rbx ==0xBBBB ,"rbx sync regs value incorrect 0x%llx." , run->s.regs.regs.rbx);
tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c +2 -7
@@ -89,9 +89,7 @@ int main(void) run = vcpu->run;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Expected KVM_EXIT_IO, got: %u (%s)\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (run->io.port ==ARBITRARY_IO_PORT ,"Expected IN from port %d from L2, got port %d" ,ARBITRARY_IO_PORT , run->io.port);
@@ -111,10 +109,7 @@ int main(void)if (has_svm) { -TEST_ASSERT (run->exit_reason ==KVM_EXIT_SHUTDOWN , -"Got exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_SHUTDOWN ); }else {switch (get_ucall (vcpu, &uc)) {case UCALL_DONE :
tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c +1 -5
@@ -64,14 +64,10 @@ static void *run_vcpu(void *_cpu_nr)pthread_spin_unlock (&create_lock);for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_DONE :
tools/testing/selftests/kvm/x86_64/ucna_injection_test.c +4 -18
@@ -137,15 +137,11 @@ static void guest_gp_handler(struct ex_regs *regs)static void run_vcpu_expect_gp (struct kvm_vcpu *vcpu) { -unsigned int exit_reason;struct ucall uc;vcpu_run (vcpu); - exit_reason = vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"exited with unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );TEST_ASSERT (get_ucall (vcpu, &uc) ==UCALL_SYNC ,"Expect UCALL_SYNC\n" );TEST_ASSERT (uc.args[1 ] ==SYNC_GP ,"#GP is expected." );
@@ -182,7 +178,6 @@ static void *run_ucna_injection(void *arg)struct ucall uc;int old;int r; -unsigned int exit_reason; r =pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS , &old); TEST_ASSERT(r == 0,
@@ -191,10 +186,7 @@ static void *run_ucna_injection(void *arg)vcpu_run (params->vcpu); - exit_reason = params->vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (params->vcpu,KVM_EXIT_IO );TEST_ASSERT (get_ucall (params->vcpu, &uc) ==UCALL_SYNC ,"Expect UCALL_SYNC\n" );TEST_ASSERT (uc.args[1 ] ==SYNC_FIRST_UCNA ,"Injecting first UCNA." );
@@ -204,10 +196,7 @@ static void *run_ucna_injection(void *arg)inject_ucna (params->vcpu,FIRST_UCNA_ADDR );vcpu_run (params->vcpu); - exit_reason = params->vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (params->vcpu,KVM_EXIT_IO );TEST_ASSERT (get_ucall (params->vcpu, &uc) ==UCALL_SYNC ,"Expect UCALL_SYNC\n" );TEST_ASSERT (uc.args[1 ] ==SYNC_SECOND_UCNA ,"Injecting second UCNA." );
@@ -217,10 +206,7 @@ static void *run_ucna_injection(void *arg)inject_ucna (params->vcpu,SECOND_UCNA_ADDR );vcpu_run (params->vcpu); - exit_reason = params->vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (params->vcpu,KVM_EXIT_IO );if (get_ucall (params->vcpu, &uc) ==UCALL_ABORT ) {TEST_ASSERT (false,"vCPU assertion failure: %s.\n" , (const char *)uc.args[0 ]);
tools/testing/selftests/kvm/x86_64/userspace_io_test.c +1 -5
@@ -63,11 +63,7 @@ int main(int argc, char *argv[])while (1 ) {vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );if (get_ucall (vcpu, &uc))break ;
tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +4 -18
@@ -410,10 +410,7 @@ static void process_rdmsr(struct kvm_vcpu *vcpu, uint32_t msr_index)check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_X86_RDMSR , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_X86_RDMSR );TEST_ASSERT (run->msr.index == msr_index,"Unexpected msr (0x%04x), expected 0x%04x" , run->msr.index, msr_index);
@@ -445,10 +442,7 @@ static void process_wrmsr(struct kvm_vcpu *vcpu, uint32_t msr_index)check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_X86_WRMSR , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_X86_WRMSR );TEST_ASSERT (run->msr.index == msr_index,"Unexpected msr (0x%04x), expected 0x%04x" , run->msr.index, msr_index);
@@ -472,15 +466,11 @@ static void process_wrmsr(struct kvm_vcpu *vcpu, uint32_t msr_index)static void process_ucall_done (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc;check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s)" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO ); TEST_ASSERT(get_ucall(vcpu, &uc) == UCALL_DONE, "Unexpected ucall command: %lu, expected UCALL_DONE (%d)",
@@ -489,15 +479,11 @@ static void process_ucall_done(struct kvm_vcpu *vcpu)static uint64_t process_ucall (struct kvm_vcpu *vcpu) { -struct kvm_run *run = vcpu->run;struct ucall uc = {};check_for_guest_assert (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s)" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_SYNC :
tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +2 -9
@@ -96,21 +96,14 @@ int main(int argc, char *argv[])vcpu_run (vcpu);if (apic_access_addr == high_gpa) { -TEST_ASSERT (run->exit_reason == -KVM_EXIT_INTERNAL_ERROR , -"Got exit reason other than KVM_EXIT_INTERNAL_ERROR: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR );TEST_ASSERT (run->internal.suberror ==KVM_INTERNAL_ERROR_EMULATION ,"Got internal suberror other than KVM_INTERNAL_ERROR_EMULATION: %u\n" , run->internal.suberror);break ; } -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c +1 -4
@@ -64,10 +64,7 @@ int main(int argc, char *argv[])struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );if (run->io.port ==PORT_L0_EXIT )break ;
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +1 -6
@@ -73,7 +73,6 @@ int main(int argc, char *argv[])struct kvm_vcpu *vcpu;struct kvm_vm *vm; -struct kvm_run *run;struct ucall uc;bool done = false;
@@ -84,7 +83,6 @@ int main(int argc, char *argv[]) vm =vm_create_with_one_vcpu (&vcpu, l1_guest_code); vmx =vcpu_alloc_vmx (vm, &vmx_pages_gva);vcpu_args_set (vcpu,1 , vmx_pages_gva); - run = vcpu->run;/* Add an extra memory slot for testing dirty logging */ vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,
@@ -117,10 +115,7 @@ int main(int argc, char *argv[])while (!done) {memset (host_test_mem,0xaa ,TEST_MEM_PAGES *4096 );vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/vmx_exception_with_invalid_guest_state.c +1 -3
@@ -26,9 +26,7 @@ static void __run_vcpu_with_invalid_state(struct kvm_vcpu *vcpu)vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_INTERNAL_ERROR , -"Expected KVM_EXIT_INTERNAL_ERROR, got %d (%s)\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_INTERNAL_ERROR );TEST_ASSERT (run->emulation_failure.suberror ==KVM_INTERNAL_ERROR_EMULATION ,"Expected emulation failure, got %d\n" , run->emulation_failure.suberror);
tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c +1 -3
@@ -74,9 +74,7 @@ int main(int argc, char *argv[])* The first exit to L0 userspace should be an I/O access from L2. * Running L1 should launch L2 without triggering an exit to userspace. */ -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Expected KVM_EXIT_IO, got: %u (%s)\n" , - run->exit_reason,exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO ); TEST_ASSERT(run->io.port == ARBITRARY_IO_PORT, "Expected IN from port %d from L2, got port %d",
tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +1 -5
@@ -183,14 +183,10 @@ int main(int argc, char *argv[])vcpu_ioctl (vcpu,KVM_SET_TSC_KHZ , (void *) (tsc_khz / l1_scale_factor));for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +1 -7
@@ -157,7 +157,6 @@ int main(int argc, char *argv[])struct kvm_regs regs1, regs2;struct kvm_vm *vm; -struct kvm_run *run;struct kvm_vcpu *vcpu;struct kvm_x86_state *state;struct ucall uc;
@@ -173,7 +172,6 @@ int main(int argc, char *argv[])/* Create VM */ vm =vm_create_with_one_vcpu (&vcpu, guest_code); - run = vcpu->run;vcpu_regs_get (vcpu, ®s1);
@@ -182,10 +180,7 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Stage %d: unexpected exit reason: %u (%s),\n" , - stage, run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
@@ -237,7 +232,6 @@ int main(int argc, char *argv[])/* Restore state in a new VM. */ vcpu =vm_recreate_with_one_vcpu (vm);vcpu_load_state (vcpu, state); - run = vcpu->run;kvm_x86_state_cleanup (state);memset (®s2,0 ,sizeof (regs2));
tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +1 -5
@@ -131,14 +131,10 @@ int main(int argc, char *argv[])vcpu_args_set (vcpu,1 , vmx_pages_gva);for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +1 -5
@@ -198,7 +198,6 @@ static void *vcpu_thread(void *arg)struct ucall uc;int old;int r; -unsigned int exit_reason; r =pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS , &old); TEST_ASSERT(r == 0,
@@ -207,11 +206,8 @@ static void *vcpu_thread(void *arg)fprintf (stderr,"vCPU thread running vCPU %u\n" , vcpu->id);vcpu_run (vcpu); - exit_reason = vcpu->run->exit_reason; -TEST_ASSERT (exit_reason ==KVM_EXIT_IO , -"vCPU %u exited with unexpected exit reason %u-%s, expected KVM_EXIT_IO" , - vcpu->id, exit_reason,exit_reason_str (exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );if (get_ucall (vcpu, &uc) ==UCALL_ABORT ) { TEST_ASSERT(false,
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +1 -6
@@ -625,15 +625,10 @@ int main(int argc, char *argv[])bool evtchn_irq_expected = false;for (;;) { -volatile struct kvm_run *run = vcpu->run;struct ucall uc;vcpu_run (vcpu); - -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c +1 -4
@@ -122,10 +122,7 @@ int main(int argc, char *argv[])continue ; } -TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Got exit_reason other than KVM_EXIT_IO: %u (%s)\n" , - run->exit_reason, -exit_reason_str (run->exit_reason)); +TEST_ASSERT_KVM_EXIT_REASON (vcpu,KVM_EXIT_IO );switch (get_ucall (vcpu, &uc)) {case UCALL_ABORT :
Signature · 1 line
2.39.1.519.gcb327c4b5f-goog
PATCH v2 2/4 KVM: selftests: Print expected and actual exit reason in KVM exit reason assert
In reply to Vipin SharmaPrint what KVM exit reason a test was expecting and what it actually got int TEST_ASSERT_KVM_EXIT_REASON().
--- tools/testing/selftests/kvm/include/test_util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/kvm/include/test_util.h +2 -1
@@ -67,7 +67,8 @@ void test_assert(bool exp, const char *exp_str,__u32 exit_reason = (vcpu)->run->exit_reason; \ \TEST_ASSERT (exit_reason == (expected), \ -"Unexpected exit reason: %u (%s)" , \ +"Wanted KVM exit reason: %u (%s), got: %u (%s)" , \ + (expected),exit_reason_str ((expected)), \ exit_reason,exit_reason_str (exit_reason)); \ }while (0 )
Signature · 1 line
2.39.1.519.gcb327c4b5f-goog
PATCH v2 3/4 KVM: selftests: Add macro to generate KVM exit reason strings
In reply to Vipin SharmaFrom: Sean Christopherson <[email protected]>
Add and use a macro to generate the KVM exit reason strings array instead of relying on developers to correctly copy+paste+edit each string.
--- tools/testing/selftests/kvm/lib/kvm_util.c | 52 +++++++++++----------- 1 file changed, 27 insertions(+), 25 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +27 -25
@@ -1815,37 +1815,39 @@ void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)vcpu_dump (stream, vcpu, indent +2 ); } +#define KVM_EXIT_STRING (x) {KVM_EXIT_##x, #x} +/* Known KVM exit reasons */ static struct exit_reason {unsigned int reason;const char *name; } exit_reasons_known[] = { - {KVM_EXIT_UNKNOWN ,"UNKNOWN" }, - {KVM_EXIT_EXCEPTION ,"EXCEPTION" }, - {KVM_EXIT_IO ,"IO" }, - {KVM_EXIT_HYPERCALL ,"HYPERCALL" }, - {KVM_EXIT_DEBUG ,"DEBUG" }, - {KVM_EXIT_HLT ,"HLT" }, - {KVM_EXIT_MMIO ,"MMIO" }, - {KVM_EXIT_IRQ_WINDOW_OPEN ,"IRQ_WINDOW_OPEN" }, - {KVM_EXIT_SHUTDOWN ,"SHUTDOWN" }, - {KVM_EXIT_FAIL_ENTRY ,"FAIL_ENTRY" }, - {KVM_EXIT_INTR ,"INTR" }, - {KVM_EXIT_SET_TPR ,"SET_TPR" }, - {KVM_EXIT_TPR_ACCESS ,"TPR_ACCESS" }, - {KVM_EXIT_S390_SIEIC ,"S390_SIEIC" }, - {KVM_EXIT_S390_RESET ,"S390_RESET" }, - {KVM_EXIT_DCR ,"DCR" }, - {KVM_EXIT_NMI ,"NMI" }, - {KVM_EXIT_INTERNAL_ERROR ,"INTERNAL_ERROR" }, - {KVM_EXIT_OSI ,"OSI" }, - {KVM_EXIT_PAPR_HCALL ,"PAPR_HCALL" }, - {KVM_EXIT_DIRTY_RING_FULL ,"DIRTY_RING_FULL" }, - {KVM_EXIT_X86_RDMSR ,"RDMSR" }, - {KVM_EXIT_X86_WRMSR ,"WRMSR" }, - {KVM_EXIT_XEN ,"XEN" }, +KVM_EXIT_STRING (UNKNOWN ), +KVM_EXIT_STRING (EXCEPTION ), +KVM_EXIT_STRING (IO ), +KVM_EXIT_STRING (HYPERCALL ), +KVM_EXIT_STRING (DEBUG ), +KVM_EXIT_STRING (HLT ), +KVM_EXIT_STRING (MMIO ), +KVM_EXIT_STRING (IRQ_WINDOW_OPEN ), +KVM_EXIT_STRING (SHUTDOWN ), +KVM_EXIT_STRING (FAIL_ENTRY ), +KVM_EXIT_STRING (INTR ), +KVM_EXIT_STRING (SET_TPR ), +KVM_EXIT_STRING (TPR_ACCESS ), +KVM_EXIT_STRING (S390_SIEIC ), +KVM_EXIT_STRING (S390_RESET ), +KVM_EXIT_STRING (DCR ), +KVM_EXIT_STRING (NMI ), +KVM_EXIT_STRING (INTERNAL_ERROR ), +KVM_EXIT_STRING (OSI ), +KVM_EXIT_STRING (PAPR_HCALL ), +KVM_EXIT_STRING (DIRTY_RING_FULL ), +KVM_EXIT_STRING (X86_RDMSR ), +KVM_EXIT_STRING (X86_WRMSR ), +KVM_EXIT_STRING (XEN ), #ifdef KVM_EXIT_MEMORY_NOT_PRESENT - {KVM_EXIT_MEMORY_NOT_PRESENT ,"MEMORY_NOT_PRESENT" }, +KVM_EXIT_STRING (MEMORY_NOT_PRESENT ), #endif };
Signature · 1 line
2.39.1.519.gcb327c4b5f-goog
Re: [Patch v2 3/4] KVM: selftests: Add macro to generate KVM exit reason strings
Quoted 82 lines · Vipin Sharma
From: Sean Christopherson <[email protected]>
Add and use a macro to generate the KVM exit reason strings array instead of relying on developers to correctly copy+paste+edit each string.
Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/lib/kvm_util.c | 52 +++++++++++----------- 1 file changed, 27 insertions(+), 25 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +27
-26@@ -1815,37 +1815,39 @@ void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)vcpu_dump (stream, vcpu, indent +2 ); } +#define KVM_EXIT_STRING (x) {KVM_EXIT_##x, #x} +/* Known KVM exit reasons */ static struct exit_reason {unsigned int reason;const char *name; } exit_reasons_known[] = { - {KVM_EXIT_UNKNOWN ,"UNKNOWN" }, - {KVM_EXIT_EXCEPTION ,"EXCEPTION" }, - {KVM_EXIT_IO ,"IO" }, - {KVM_EXIT_HYPERCALL ,"HYPERCALL" }, - {KVM_EXIT_DEBUG ,"DEBUG" }, - {KVM_EXIT_HLT ,"HLT" }, - {KVM_EXIT_MMIO ,"MMIO" }, - {KVM_EXIT_IRQ_WINDOW_OPEN ,"IRQ_WINDOW_OPEN" }, - {KVM_EXIT_SHUTDOWN ,"SHUTDOWN" }, - {KVM_EXIT_FAIL_ENTRY ,"FAIL_ENTRY" }, - {KVM_EXIT_INTR ,"INTR" }, - {KVM_EXIT_SET_TPR ,"SET_TPR" }, - {KVM_EXIT_TPR_ACCESS ,"TPR_ACCESS" }, - {KVM_EXIT_S390_SIEIC ,"S390_SIEIC" }, - {KVM_EXIT_S390_RESET ,"S390_RESET" }, - {KVM_EXIT_DCR ,"DCR" }, - {KVM_EXIT_NMI ,"NMI" }, - {KVM_EXIT_INTERNAL_ERROR ,"INTERNAL_ERROR" }, - {KVM_EXIT_OSI ,"OSI" }, - {KVM_EXIT_PAPR_HCALL ,"PAPR_HCALL" }, - {KVM_EXIT_DIRTY_RING_FULL ,"DIRTY_RING_FULL" }, - {KVM_EXIT_X86_RDMSR ,"RDMSR" }, - {KVM_EXIT_X86_WRMSR ,"WRMSR" }, - {KVM_EXIT_XEN ,"XEN" }, +KVM_EXIT_STRING (UNKNOWN ), +KVM_EXIT_STRING (EXCEPTION ), +KVM_EXIT_STRING (IO ), +KVM_EXIT_STRING (HYPERCALL ), +KVM_EXIT_STRING (DEBUG ), +KVM_EXIT_STRING (HLT ), +KVM_EXIT_STRING (MMIO ), +KVM_EXIT_STRING (IRQ_WINDOW_OPEN ), +KVM_EXIT_STRING (SHUTDOWN ), +KVM_EXIT_STRING (FAIL_ENTRY ), +KVM_EXIT_STRING (INTR ), +KVM_EXIT_STRING (SET_TPR ), +KVM_EXIT_STRING (TPR_ACCESS ), +KVM_EXIT_STRING (S390_SIEIC ), +KVM_EXIT_STRING (S390_RESET ), +KVM_EXIT_STRING (DCR ), +KVM_EXIT_STRING (NMI ), +KVM_EXIT_STRING (INTERNAL_ERROR ), +KVM_EXIT_STRING (OSI ), +KVM_EXIT_STRING (PAPR_HCALL ), +KVM_EXIT_STRING (DIRTY_RING_FULL ), +KVM_EXIT_STRING (X86_RDMSR ), +KVM_EXIT_STRING (X86_WRMSR ), +KVM_EXIT_STRING (XEN ), #ifdef KVM_EXIT_MEMORY_NOT_PRESENT - {KVM_EXIT_MEMORY_NOT_PRESENT ,"MEMORY_NOT_PRESENT" }, +KVM_EXIT_STRING (MEMORY_NOT_PRESENT ), #endif }; --
Quoted 2 lines
2.39.1.519.gcb327c4b5f-goog
Sean,
I had to manually create this commit in my tree, your patch in the email was complaining about some non-existent SHA.
https://lore.kernel.org/lkml/Y9r0q9cuK%[email protected]/
Only difference from your patch is that KVM_EXIT_STRING(HYPERV) is not present in the patch above. As this exit reason is not available in kvm/queue.
PATCH v2 4/4 KVM: selftests: Sync KVM exit reasons in selftests
In reply to Vipin SharmaAdd missing KVM_EXIT_* reasons in KVM selftests from include/uapi/linux/kvm.h
--- tools/testing/selftests/kvm/lib/kvm_util.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/kvm_util.c +15 -1
@@ -1842,10 +1842,24 @@ static struct exit_reason {KVM_EXIT_STRING (INTERNAL_ERROR ),KVM_EXIT_STRING (OSI ),KVM_EXIT_STRING (PAPR_HCALL ), -KVM_EXIT_STRING (DIRTY_RING_FULL ), +KVM_EXIT_STRING (S390_UCONTROL ), +KVM_EXIT_STRING (WATCHDOG ), +KVM_EXIT_STRING (S390_TSCH ), +KVM_EXIT_STRING (EPR ), +KVM_EXIT_STRING (SYSTEM_EVENT ), +KVM_EXIT_STRING (S390_STSI ), +KVM_EXIT_STRING (IOAPIC_EOI ), +KVM_EXIT_STRING (HYPERV ), +KVM_EXIT_STRING (ARM_NISV ),KVM_EXIT_STRING (X86_RDMSR ),KVM_EXIT_STRING (X86_WRMSR ), +KVM_EXIT_STRING (DIRTY_RING_FULL ), +KVM_EXIT_STRING (AP_RESET_HOLD ), +KVM_EXIT_STRING (X86_BUS_LOCK ),KVM_EXIT_STRING (XEN ), +KVM_EXIT_STRING (RISCV_SBI ), +KVM_EXIT_STRING (RISCV_CSR ), +KVM_EXIT_STRING (NOTIFY ), #ifdef KVM_EXIT_MEMORY_NOT_PRESENT KVM_EXIT_STRING(MEMORY_NOT_PRESENT), #endif
Signature · 1 line
2.39.1.519.gcb327c4b5f-goog
Quoted 30 lines · Vipin Sharma
Hi,
This patch seris is extracted from
https://lore.kernel.org/lkml/[email protected]/
series.Specifically, patch 12 is taken out from there and now expanded in to this series.
This patch series contains following changes:
Patch 1 & 2:
Make a macro to clean up all KVM exit reason test assertion.There are few places where explicit
run->exit_reasonare used but they cannot be replaced with current macro.I used following command KVM selftests directory and changed each occurrence:
grep "run->exit_reason" -nir ./Patch 3:
This is from Sean Christopherson. Adding a macro to generate KVM exit strings.Patch 4:
Sync KVM_EXIT_* reasons to sefltests. Many reasons are not present in selftest code.
Quoted 6 lines
v2:
- Improve test assert message.
- Add macro to generate KVM_EXIT_* reason strings.
- Update selftestsKVM_EXIT_reasons to latest version.
Any update/feedback on this series?
Queued, thanks.
Paolo