Commit af5b41b9 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: selftests: Convert ARM's hypercalls test to printf style GUEST_ASSERT 

Convert ARM's hypercalls test to use printf-based GUEST_ASSERT().
Opportunistically use GUEST_FAIL() to complain about an unexpected stage.

Link: https://lore.kernel.org/r/20230729003643.1053367-13-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent bac9aeec

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

+10 −10
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * hypercalls are properly masked or unmasked to the guest when disabled or

 * enabled from the KVM userspace, respectively.

 */

#define USE_GUEST_ASSERT_PRINTF 1



#include <errno.h>

#include <linux/arm-smccc.h>
@@ -105,15 +106,17 @@ static void guest_test_hvc(const struct test_hvc_info *hc_info) 
		switch (stage) {

		case TEST_STAGE_HVC_IFACE_FEAT_DISABLED:

		case TEST_STAGE_HVC_IFACE_FALSE_INFO:

			GUEST_ASSERT_3(res.a0 == SMCCC_RET_NOT_SUPPORTED,

					res.a0, hc_info->func_id, hc_info->arg1);

			__GUEST_ASSERT(res.a0 == SMCCC_RET_NOT_SUPPORTED,

				       "a0 = 0x%lx, func_id = 0x%x, arg1 = 0x%llx, stage = %u",

					res.a0, hc_info->func_id, hc_info->arg1, stage);

			break;

		case TEST_STAGE_HVC_IFACE_FEAT_ENABLED:

			GUEST_ASSERT_3(res.a0 != SMCCC_RET_NOT_SUPPORTED,

					res.a0, hc_info->func_id, hc_info->arg1);

			__GUEST_ASSERT(res.a0 != SMCCC_RET_NOT_SUPPORTED,

				       "a0 = 0x%lx, func_id = 0x%x, arg1 = 0x%llx, stage = %u",

					res.a0, hc_info->func_id, hc_info->arg1, stage);

			break;

		default:

			GUEST_ASSERT_1(0, stage);

			GUEST_FAIL("Unexpected stage = %u", stage);

		}

	}

}
@@ -132,7 +135,7 @@ static void guest_code(void) 
			guest_test_hvc(false_hvc_info);

			break;

		default:

			GUEST_ASSERT_1(0, stage);

			GUEST_FAIL("Unexpected stage = %u", stage);

		}



		GUEST_SYNC(stage);
@@ -290,10 +293,7 @@ static void test_run(void) 
			guest_done = true;

			break;

		case UCALL_ABORT:

			REPORT_GUEST_ASSERT_N(uc, "values: 0x%lx, 0x%lx; 0x%lx, stage: %u",

					      GUEST_ASSERT_ARG(uc, 0),

					      GUEST_ASSERT_ARG(uc, 1),

					      GUEST_ASSERT_ARG(uc, 2), stage);

			REPORT_GUEST_ASSERT(uc);

			break;

		default:

			TEST_FAIL("Unexpected guest exit\n");