Hi Ricardo,
It may be nicer to introduce UCALL_UNHANDLED with this patch and have it
come fist in the series.
Thanks,
drew
On Thu, Apr 22, 2021 at 09:03:51PM -0700, Ricardo Koller wrote:
> x86 reports unhandled vectors using port IO at a specific port number,
> which is replicating what ucall already does for x86. Aarch64, on the
> other hand, reports unhandled vector exceptions with a ucall using a
> recently added UCALL_UNHANDLED ucall type.
>
> Replace the x86 unhandled vector exception handling to use ucall
> UCALL_UNHANDLED instead of port IO.
>
> 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: Ricardo Koller <ricarkol@xxxxxxxxxx>
> ---
> .../selftests/kvm/include/x86_64/processor.h | 2 --
> .../testing/selftests/kvm/lib/x86_64/processor.c | 15 ++++++---------
> 2 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
> index 0b30b4e15c38..379f12cbdc06 100644
> --- a/tools/testing/selftests/kvm/include/x86_64/processor.h
> +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
> @@ -53,8 +53,6 @@
> #define CPUID_PKU (1ul << 3)
> #define CPUID_LA57 (1ul << 16)
>
> -#define UNEXPECTED_VECTOR_PORT 0xfff0u
> -
> /* General Registers in 64-Bit Mode */
> struct gpr64_regs {
> u64 rax;
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> index a8906e60a108..284d26a25cd3 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> @@ -1207,7 +1207,7 @@ static void set_idt_entry(struct kvm_vm *vm, int vector, unsigned long addr,
>
> 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)
> @@ -1260,16 +1260,13 @@ void vm_handle_exception(struct kvm_vm *vm, int vector,
>
> void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid)
> {
> - if (vcpu_state(vm, vcpuid)->exit_reason == KVM_EXIT_IO
> - && vcpu_state(vm, vcpuid)->io.port == UNEXPECTED_VECTOR_PORT
> - && vcpu_state(vm, vcpuid)->io.size == 4) {
> - /* Grab pointer to io data */
> - uint32_t *data = (void *)vcpu_state(vm, vcpuid)
> - + vcpu_state(vm, vcpuid)->io.data_offset;
> + struct ucall uc;
>
> + if (get_ucall(vm, vcpuid, &uc) == UCALL_UNHANDLED) {
> + uint64_t vector = uc.args[0];
> TEST_ASSERT(false,
> - "Unexpected vectored event in guest (vector:0x%x)",
> - *data);
> + "Unexpected vectored event in guest (vector:0x%lx)",
> + vector);
> }
> }
>
> --
> 2.31.1.498.g6c1eba8ee3d-goog
>
