Commit c96f57b0 authored by Vipin Sharma's avatar Vipin Sharma Committed by Paolo Bonzini
Browse files

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.

Signed-off-by: default avatarVipin Sharma <vipinsh@google.com>
Reviewed-by: default avatarDavid Matlack <dmatlack@google.com>
Message-Id: <20230204014547.583711-2-vipinsh@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e6239a4e

tools/testing/selftests/kvm/aarch64/psci_test.c

+1 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}