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

KVM: selftests: Report unhandled exceptions on x86 as regular guest asserts 

Now that selftests support printf() in the guest, report unexpected
exceptions via the regular assertion framework.  Exceptions were special
cased purely to provide a better error message.  Convert only x86 for now,
as it's low-hanging fruit (already formats the assertion in the guest),
and converting x86 will allow adding asserts in x86 library code without
needing to update multiple tests.

Once all other architectures are converted, this will allow moving the
reporting to common code, which will in turn allow adding asserts in
common library code, and will also allow removing UCALL_UNHANDLED.

Link: https://lore.kernel.org/r/20240719235107.3023592-6-seanjc@google.com


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

tools/testing/selftests/kvm/lib/x86_64/processor.c

+3 −5
Original line number Diff line number Diff line
@@ -566,9 +566,7 @@ void route_exception(struct ex_regs *regs) 
	if (kvm_fixup_exception(regs))

		return;



	ucall_assert(UCALL_UNHANDLED,

		     "Unhandled exception in guest", __FILE__, __LINE__,

		     "Unhandled exception '0x%lx' at guest RIP '0x%lx'",

	GUEST_FAIL("Unhandled exception '0x%lx' at guest RIP '0x%lx'",

		   regs->vector, regs->rip);

}
@@ -611,7 +609,7 @@ void assert_on_unhandled_exception(struct kvm_vcpu *vcpu) 
{

	struct ucall uc;



	if (get_ucall(vcpu, &uc) == UCALL_UNHANDLED)

	if (get_ucall(vcpu, &uc) == UCALL_ABORT)

		REPORT_GUEST_ASSERT(uc);

}