Commit 75275d7f authored by Ricardo Koller's avatar Ricardo Koller Committed by Marc Zyngier

KVM: selftests: Introduce UCALL_UNHANDLED for unhandled vector reporting

x86, the only arch implementing exception handling, reports unhandled
vectors using port IO at a specific port number. This replicates what
ucall already does.

Introduce a new ucall type, UCALL_UNHANDLED, for guests to report
unhandled exceptions. Then replace the x86 unhandled vector exception
reporting to use it instead of port IO.  This new ucall type will be
used in the next commits by arm64 to report unhandled vectors as well.

Tested: Forcing a page fault in the ./x86_64/xapic_ipi_test
	halter_guest_code() shows this:

	$ ./x86_64/xapic_ipi_test
	...
	  Unexpected vectored event in guest (vector:0xe)
Signed-off-by: default avatarRicardo Koller <ricarkol@google.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210611011020.3420067-4-ricarkol@google.com
parent b7326c01
...@@ -349,6 +349,7 @@ enum { ...@@ -349,6 +349,7 @@ enum {
UCALL_SYNC, UCALL_SYNC,
UCALL_ABORT, UCALL_ABORT,
UCALL_DONE, UCALL_DONE,
UCALL_UNHANDLED,
}; };
#define UCALL_MAX_ARGS 6 #define UCALL_MAX_ARGS 6
......
...@@ -53,8 +53,6 @@ ...@@ -53,8 +53,6 @@
#define CPUID_PKU (1ul << 3) #define CPUID_PKU (1ul << 3)
#define CPUID_LA57 (1ul << 16) #define CPUID_LA57 (1ul << 16)
#define UNEXPECTED_VECTOR_PORT 0xfff0u
/* General Registers in 64-Bit Mode */ /* General Registers in 64-Bit Mode */
struct gpr64_regs { struct gpr64_regs {
u64 rax; u64 rax;
......
...@@ -1201,7 +1201,7 @@ static void set_idt_entry(struct kvm_vm *vm, int vector, unsigned long addr, ...@@ -1201,7 +1201,7 @@ static void set_idt_entry(struct kvm_vm *vm, int vector, unsigned long addr,
void kvm_exit_unexpected_vector(uint32_t value) void kvm_exit_unexpected_vector(uint32_t value)
{ {
outl(UNEXPECTED_VECTOR_PORT, value); ucall(UCALL_UNHANDLED, 1, value);
} }
void route_exception(struct ex_regs *regs) void route_exception(struct ex_regs *regs)
...@@ -1254,16 +1254,13 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector, ...@@ -1254,16 +1254,13 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector,
void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid) void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid)
{ {
if (vcpu_state(vm, vcpuid)->exit_reason == KVM_EXIT_IO struct ucall uc;
&& vcpu_state(vm, vcpuid)->io.port == UNEXPECTED_VECTOR_PORT
&& vcpu_state(vm, vcpuid)->io.size == 4) { if (get_ucall(vm, vcpuid, &uc) == UCALL_UNHANDLED) {
/* Grab pointer to io data */ uint64_t vector = uc.args[0];
uint32_t *data = (void *)vcpu_state(vm, vcpuid)
+ vcpu_state(vm, vcpuid)->io.data_offset; TEST_FAIL("Unexpected vectored event in guest (vector:0x%lx)",
vector);
TEST_ASSERT(false,
"Unexpected vectored event in guest (vector:0x%x)",
*data);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment