KVM: selftests: arm64 exception handling and debug test
v3 cover KVM: selftests: arm64 exception handling and debug test
Hi,
These patches add a debug exception test in aarch64 KVM selftests while also adding basic exception handling support.
The structure of the exception handling is based on its x86 counterpart. Tests use the same calls to initialize exception handling and both architectures allow tests to override the handler for a particular vector, or (vector, ec) for synchronous exceptions in the arm64 case.
The debug test is similar to x86_64/debug_regs, except that the x86 one controls the debugging from outside the VM. This proposed arm64 test controls and handles debug exceptions from the inside.
Thanks,
Ricardo
v2 -> v3:
Addressed comments from Andrew and Marc (thanks again). Also, many thanks for the reviews and tests from Eric and Zenghui.
- add missing ISBs after writing into debug registers.
- not store/restore of sp_el0 on exceptions.
- add default handlers for Error and FIQ.
- change multiple TEST_ASSERT(false, ...) to TEST_FAIL.
- use Andrew's suggestion regarding __GUEST_ASSERT modifications in order to easier implement GUEST_ASSERT_EQ (Thanks Andrew).
v1 -> v2:
Addressed comments from Andrew and Marc (thank you very much):
- rename vm_handle_exception in all tests.
- introduce UCALL_UNHANDLED in x86 first.
- move GUEST_ASSERT_EQ to common utils header.
- handle sync and other exceptions separately: use two tables (like kvm-unit-tests).
- add two separate functions for installing sync versus other exceptions
- changes in handlers.S: use the same layout as user_pt_regs, treat the EL1t vectors as invalid, refactor the vector table creation to not use manual numbering, add comments, remove LR from the stored registers.
- changes in debug-exceptions.c: remove unused headers, use the common GUEST_ASSERT_EQ, use vcpu_run instead of _vcpu_run.
- changes in processor.h: write_sysreg with support for xzr, replace EL1 with current in macro names, define ESR_EC_MASK as ESR_EC_NUM-1.
Ricardo Koller (5):
KVM: selftests: Rename vm_handle_exception
KVM: selftests: Introduce UCALL_UNHANDLED for unhandled vector
reporting
KVM: selftests: Move GUEST_ASSERT_EQ to utils header
KVM: selftests: Add exception handling support for aarch64
KVM: selftests: Add aarch64/debug-exceptions test
tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 3 +- .../selftests/kvm/aarch64/debug-exceptions.c | 250 ++++++++++++++++++ .../selftests/kvm/include/aarch64/processor.h | 83 +++++- .../testing/selftests/kvm/include/kvm_util.h | 23 +- .../selftests/kvm/include/x86_64/processor.h | 4 +- .../selftests/kvm/lib/aarch64/handlers.S | 124 +++++++++ .../selftests/kvm/lib/aarch64/processor.c | 131 +++++++++ .../selftests/kvm/lib/x86_64/processor.c | 22 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 2 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 9 - .../kvm/x86_64/userspace_msr_exit_test.c | 8 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 2 +- 13 files changed, 615 insertions(+), 47 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/debug-exceptions.c create mode 100644 tools/testing/selftests/kvm/lib/aarch64/handlers.S
Signature · 6 lines
2.31.1.607.g51e8a6a459-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 1/5 KVM: selftests: Rename vm_handle_exception
Rename the vm_handle_exception function to a name that indicates more clearly that it installs something: vm_install_vector_handler.
--- tools/testing/selftests/kvm/include/x86_64/processor.h | 2 +- tools/testing/selftests/kvm/lib/x86_64/processor.c | 4 ++-- tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 2 +- .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 8 ++++---- tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -1
@@ -391,7 +391,7 @@ struct ex_regs {void vm_init_descriptor_tables (struct kvm_vm *vm);void vcpu_init_descriptor_tables (struct kvm_vm *vm,uint32_t vcpuid); -void vm_handle_exception (struct kvm_vm *vm,int vector, +void vm_install_vector_handler (struct kvm_vm *vm,int vector,void (*handler)(struct ex_regs *));/*
tools/testing/selftests/kvm/lib/x86_64/processor.c +2 -2
@@ -1250,8 +1250,8 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid) *(vm_vaddr_t *)addr_gva2hva (vm, (vm_vaddr_t)(&exception_handlers)) = vm->handlers; } -void vm_handle_exception (struct kvm_vm *vm,int vector, -void (*handler)(struct ex_regs *)) +void vm_install_vector_handler (struct kvm_vm *vm,int vector, +void (*handler)(struct ex_regs *)) {vm_vaddr_t *handlers = (vm_vaddr_t *)addr_gva2hva (vm, vm->handlers);
tools/testing/selftests/kvm/x86_64/kvm_pv_test.c +1 -1
@@ -227,7 +227,7 @@ int main(void)vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vm,VCPU_ID ); -vm_handle_exception (vm,GP_VECTOR , guest_gp_handler); +vm_install_vector_handler (vm,GP_VECTOR , guest_gp_handler);enter_guest (vm);kvm_vm_free (vm);
tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c +4 -4
@@ -574,7 +574,7 @@ static void test_msr_filter_allow(void) {vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vm,VCPU_ID ); -vm_handle_exception (vm,GP_VECTOR , guest_gp_handler); +vm_install_vector_handler (vm,GP_VECTOR , guest_gp_handler);/* Process guest code userspace exits. */ run_guest_then_process_rdmsr (vm,MSR_IA32_XSS );
@@ -588,12 +588,12 @@ static void test_msr_filter_allow(void) {run_guest_then_process_wrmsr (vm,MSR_NON_EXISTENT );run_guest_then_process_rdmsr (vm,MSR_NON_EXISTENT ); -vm_handle_exception (vm,UD_VECTOR , guest_ud_handler); +vm_install_vector_handler (vm,UD_VECTOR , guest_ud_handler);run_guest (vm); -vm_handle_exception (vm,UD_VECTOR ,NULL ); +vm_install_vector_handler (vm,UD_VECTOR ,NULL );if (process_ucall (vm) !=UCALL_DONE ) { -vm_handle_exception (vm,GP_VECTOR , guest_fep_gp_handler); +vm_install_vector_handler (vm,GP_VECTOR , guest_fep_gp_handler);/* Process emulated rdmsr and wrmsr instructions. */ run_guest_then_process_rdmsr (vm,MSR_IA32_XSS );
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +1 -1
@@ -462,7 +462,7 @@ int main(int argc, char *argv[])vm_init_descriptor_tables (vm);vcpu_init_descriptor_tables (vm,HALTER_VCPU_ID ); -vm_handle_exception (vm,IPI_VECTOR , guest_ipi_handler); +vm_install_vector_handler (vm,IPI_VECTOR , guest_ipi_handler);virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA ,0 );
Signature · 6 lines
2.31.1.607.g51e8a6a459-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 2/5 KVM: selftests: Introduce UCALL_UNHANDLED for unhandled vector reporting
In reply to Ricardo Kollerx86, 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)
--- tools/testing/selftests/kvm/include/kvm_util.h | 1 + .../selftests/kvm/include/x86_64/processor.h | 2 -- .../selftests/kvm/lib/x86_64/processor.c | 18 +++++++----------- 3 files changed, 8 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/include/kvm_util.h +1 -0
@@ -347,6 +347,7 @@ enum {UCALL_SYNC ,UCALL_ABORT ,UCALL_DONE , + UCALL_UNHANDLED, };#define UCALL_MAX_ARGS 6
tools/testing/selftests/kvm/include/x86_64/processor.h +0 -2
@@ -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;
tools/testing/selftests/kvm/lib/x86_64/processor.c +7 -11
@@ -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,12 @@ void vm_install_vector_handler(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; - -TEST_ASSERT (false, -"Unexpected vectored event in guest (vector:0x%x)" , - *data); +struct ucall uc; + +if (get_ucall (vm, vcpuid, &uc) ==UCALL_UNHANDLED ) { +uint64_t vector = uc.args[0 ]; +TEST_FAIL ("Unexpected vectored event in guest (vector:0x%lx)" , + vector); } }
Signature · 6 lines
2.31.1.607.g51e8a6a459-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 3/5 KVM: selftests: Move GUEST_ASSERT_EQ to utils header
In reply to Ricardo KollerMove GUEST_ASSERT_EQ to a common header, kvm_util.h, for other architectures and tests to use. Also modify __GUEST_ASSERT so it can be reused to implement GUEST_ASSERT_EQ.
--- .../testing/selftests/kvm/include/kvm_util.h | 22 ++++++++++--------- .../selftests/kvm/x86_64/tsc_msrs_test.c | 9 -------- 2 files changed, 12 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/include/kvm_util.h +12 -10
@@ -366,26 +366,28 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)#define GUEST_SYNC (stage) ucall(UCALL_SYNC, 2, "hello", stage)#define GUEST_DONE () ucall(UCALL_DONE, 0) -#define __GUEST_ASSERT(_condition, _nargs, _args...) do { \ - if (!(_condition)) \ - ucall(UCALL_ABORT, 2 + _nargs, \ - "Failed guest assert: " \ - #_condition, __LINE__, _args); \ +#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do { \ + if (!(_condition)) \ + ucall(UCALL_ABORT, 2 + _nargs, \ + "Failed guest assert: " \ + _condstr, __LINE__, _args); \ } while (0)#define GUEST_ASSERT (_condition) \ - __GUEST_ASSERT((_condition), 0, 0) + __GUEST_ASSERT(_condition, #_condition, 0, 0)#define GUEST_ASSERT_1 (_condition, arg1) \ - __GUEST_ASSERT((_condition), 1, (arg1)) + __GUEST_ASSERT(_condition, #_condition, 1, (arg1))#define GUEST_ASSERT_2 (_condition, arg1, arg2) \ - __GUEST_ASSERT((_condition), 2, (arg1), (arg2)) + __GUEST_ASSERT(_condition, #_condition, 2, (arg1), (arg2))#define GUEST_ASSERT_3 (_condition, arg1, arg2, arg3) \ - __GUEST_ASSERT((_condition), 3, (arg1), (arg2), (arg3)) + __GUEST_ASSERT(_condition, #_condition, 3, (arg1), (arg2), (arg3))#define GUEST_ASSERT_4 (_condition, arg1, arg2, arg3, arg4) \ - __GUEST_ASSERT((_condition), 4, (arg1), (arg2), (arg3), (arg4)) + __GUEST_ASSERT(_condition, #_condition, 4, (arg1), (arg2), (arg3), (arg4)) + +#define GUEST_ASSERT_EQ (a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b)#endif /* SELFTEST_KVM_UTIL_H */
tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c +0 -9
@@ -18,15 +18,6 @@#define rounded_rdmsr (x) ROUND(rdmsr(x))#define rounded_host_rdmsr (x) ROUND(vcpu_get_msr(vm, 0, x)) -#define GUEST_ASSERT_EQ (a, b) do { \ - __typeof(a) _a = (a); \ - __typeof(b) _b = (b); \ - if (_a != _b) \ - ucall(UCALL_ABORT, 4, \ - "Failed guest assert: " \ - #a " == " #b, __LINE__, _a, _b); \ - } while(0) -static void guest_code (void ) {u64 val =0 ;
Signature · 6 lines
2.31.1.607.g51e8a6a459-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 3/5] KVM: selftests: Move GUEST_ASSERT_EQ to utils header
Quoted 10 lines · Ricardo Koller
Move
GUEST_ASSERT_EQto a common header,kvm_util.h, for other architectures and tests to use. Also modify__GUEST_ASSERTso it can be reused to implementGUEST_ASSERT_EQ.Signed-off-by Ricardo Koller <[email protected]>--- .../testing/selftests/kvm/include/kvm_util.h | 22 ++++++++++--------- .../selftests/kvm/x86_64/tsc_msrs_test.c | 9 -------- 2 files changed, 12 insertions(+), 19 deletions(-)
Re: [PATCH v3 3/5] KVM: selftests: Move GUEST_ASSERT_EQ to utils header
In reply to Ricardo KollerHi Ricardo,
Quoted 5 lines · Ricardo Koller
Move
GUEST_ASSERT_EQto a common header,kvm_util.h, for other architectures and tests to use. Also modify__GUEST_ASSERTso it can be reused to implementGUEST_ASSERT_EQ.Signed-off-by Ricardo Koller <[email protected]>
Thanks
Eric
Quoted 69 lines
--- .../testing/selftests/kvm/include/kvm_util.h | 22 ++++++++++--------- .../selftests/kvm/x86_64/tsc_msrs_test.c | 9 -------- 2 files changed, 12 insertions(+), 19 deletions(-)tools/testing/selftests/kvm/include/kvm_util.h +12
-10@@ -366,26 +366,28 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4)#define GUEST_SYNC (stage) ucall(UCALL_SYNC, 2, "hello", stage)#define GUEST_DONE () ucall(UCALL_DONE, 0) -#define __GUEST_ASSERT(_condition, _nargs, _args...) do { \ - if (!(_condition)) \ - ucall(UCALL_ABORT, 2 + _nargs, \ - "Failed guest assert: " \ - #_condition, __LINE__, _args); \ +#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do { \ + if (!(_condition)) \ + ucall(UCALL_ABORT, 2 + _nargs, \ + "Failed guest assert: " \ + _condstr, __LINE__, _args); \ } while (0)#define GUEST_ASSERT (_condition) \ - __GUEST_ASSERT((_condition), 0, 0) + __GUEST_ASSERT(_condition, #_condition, 0, 0)#define GUEST_ASSERT_1 (_condition, arg1) \ - __GUEST_ASSERT((_condition), 1, (arg1)) + __GUEST_ASSERT(_condition, #_condition, 1, (arg1))#define GUEST_ASSERT_2 (_condition, arg1, arg2) \ - __GUEST_ASSERT((_condition), 2, (arg1), (arg2)) + __GUEST_ASSERT(_condition, #_condition, 2, (arg1), (arg2))#define GUEST_ASSERT_3 (_condition, arg1, arg2, arg3) \ - __GUEST_ASSERT((_condition), 3, (arg1), (arg2), (arg3)) + __GUEST_ASSERT(_condition, #_condition, 3, (arg1), (arg2), (arg3))#define GUEST_ASSERT_4 (_condition, arg1, arg2, arg3, arg4) \ - __GUEST_ASSERT((_condition), 4, (arg1), (arg2), (arg3), (arg4)) + __GUEST_ASSERT(_condition, #_condition, 4, (arg1), (arg2), (arg3), (arg4)) + +#define GUEST_ASSERT_EQ (a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b)#endif /* SELFTEST_KVM_UTIL_H */ tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c +0
-9@@ -18,15 +18,6 @@#define rounded_rdmsr (x) ROUND(rdmsr(x))#define rounded_host_rdmsr (x) ROUND(vcpu_get_msr(vm, 0, x)) -#define GUEST_ASSERT_EQ (a, b) do { \ - __typeof(a) _a = (a); \ - __typeof(b) _b = (b); \ - if (_a != _b) \ - ucall(UCALL_ABORT, 4, \ - "Failed guest assert: " \ - #a " == " #b, __LINE__, _a, _b); \ - } while(0) -static void guest_code (void ) {u64 val =0 ;
PATCH v3 4/5 KVM: selftests: Add exception handling support for aarch64
In reply to Ricardo KollerAdd the infrastructure needed to enable exception handling in aarch64 selftests. The exception handling defaults to an unhandled-exception handler which aborts the test, just like x86. These handlers can be overridden by calling vm_install_vector_handler(vector) or vm_install_exception_handler(vector, ec). The unhandled exception reporting from the guest is done using the ucall type introduced in a previous commit, UCALL_UNHANDLED.
The exception handling code is heavily inspired on kvm-unit-tests.
--- tools/testing/selftests/kvm/Makefile | 2 +- .../selftests/kvm/include/aarch64/processor.h | 63 +++++++++ .../selftests/kvm/lib/aarch64/handlers.S | 124 +++++++++++++++++ .../selftests/kvm/lib/aarch64/processor.c | 131 ++++++++++++++++++ 4 files changed, 319 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kvm/lib/aarch64/handlers.S
tools/testing/selftests/kvm/Makefile +1 -1
@@ -35,7 +35,7 @@ endif LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/sparsebit.c lib/test_util.c lib/guest_modes.c lib/perf_test_util.c LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c lib/x86_64/svm.c lib/x86_64/ucall.c lib/x86_64/handlers.S -LIBKVM_aarch64 = lib/aarch64/processor.c lib/aarch64/ucall.c +LIBKVM_aarch64 = lib/aarch64/processor.c lib/aarch64/ucall.c lib/aarch64/handlers.S LIBKVM_s390x = lib/s390x/processor.c lib/s390x/ucall.c lib/s390x/diag318_test_handler.c TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
tools/testing/selftests/kvm/include/aarch64/processor.h +63 -0
79 lines not on this page · raw message
tools/testing/selftests/kvm/lib/aarch64/handlers.S new file +124 -0
124 lines not on this page · raw message
tools/testing/selftests/kvm/lib/aarch64/processor.c +131 -0
149 lines not on this page · raw message
Signature · 6 lines
2.31.1.607.g51e8a6a459-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 4/5] KVM: selftests: Add exception handling support for aarch64
Quoted 10 lines · Ricardo Koller
Add the infrastructure needed to enable exception handling in aarch64 selftests. The exception handling defaults to an unhandled-exception handler which aborts the test, just like x86. These handlers can be overridden by calling
vm_install_vector_handler(vector)orvm_install_exception_handler(vector, ec). The unhandled exception reporting from the guest is done using the ucall type introduced in a previous commit,UCALL_UNHANDLED.The exception handling code is heavily inspired on kvm-unit-tests.
Quoted 9 lines
Signed-off-by Ricardo Koller <[email protected]>--- tools/testing/selftests/kvm/Makefile | 2 +- .../selftests/kvm/include/aarch64/processor.h | 63 +++++++++ .../selftests/kvm/lib/aarch64/handlers.S | 124 +++++++++++++++++ .../selftests/kvm/lib/aarch64/processor.c | 131 ++++++++++++++++++ 4 files changed, 319 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kvm/lib/aarch64/handlers.S
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 5/5 KVM: selftests: Add aarch64/debug-exceptions test
In reply to Ricardo KollerCovers fundamental tests for debug exceptions. The guest installs and handle its debug exceptions itself, without KVM_SET_GUEST_DEBUG.
--- tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/aarch64/debug-exceptions.c | 250 ++++++++++++++++++ .../selftests/kvm/include/aarch64/processor.h | 22 +- 4 files changed, 268 insertions(+), 6 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/debug-exceptions.c
tools/testing/selftests/kvm/.gitignore +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +/aarch64/debug-exceptions /aarch64/get-reg-list /aarch64/get-reg-list-sve /aarch64/vgic_init
tools/testing/selftests/kvm/Makefile +1 -0
@@ -73,6 +73,7 @@ TEST_GEN_PROGS_x86_64 += memslot_modification_stress_test TEST_GEN_PROGS_x86_64 += set_memory_region_test TEST_GEN_PROGS_x86_64 += steal_time +TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve TEST_GEN_PROGS_aarch64 += aarch64/vgic_init
tools/testing/selftests/kvm/aarch64/debug-exceptions.c new file +250 -0
250 lines not on this page · raw message
tools/testing/selftests/kvm/include/aarch64/processor.h +16 -6
@@ -14,12 +14,14 @@#define ARM64_CORE_REG (x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ KVM_REG_ARM_CORE | KVM_REG_ARM_CORE_REG(x)) -#define CPACR_EL1 3, 0, 1, 0, 2 -#define TCR_EL1 3, 0, 2, 0, 2 -#define MAIR_EL1 3, 0, 10, 2, 0 -#define TTBR0_EL1 3, 0, 2, 0, 0 -#define SCTLR_EL1 3, 0, 1, 0, 0 -#define VBAR_EL1 3, 0, 12, 0, 0 +#define CPACR_EL1 3, 0, 1, 0, 2 +#define TCR_EL1 3, 0, 2, 0, 2 +#define MAIR_EL1 3, 0, 10, 2, 0 +#define TTBR0_EL1 3, 0, 2, 0, 0 +#define SCTLR_EL1 3, 0, 1, 0, 0 +#define VBAR_EL1 3, 0, 12, 0, 0 + +#define ID_AA64DFR0_EL1 3, 0, 0, 5, 0/* * Default MAIR
@@ -98,6 +100,12 @@ enum {#define ESR_EC_SHIFT 26#define ESR_EC_MASK (ESR_EC_NUM - 1) +#define ESR_EC_SVC64 0x15 +#define ESR_EC_HW_BP_CURRENT 0x31 +#define ESR_EC_SSTEP_CURRENT 0x33 +#define ESR_EC_WP_CURRENT 0x35 +#define ESR_EC_BRK_INS 0x3c +void vm_init_descriptor_tables (struct kvm_vm *vm);void vcpu_init_descriptor_tables (struct kvm_vm *vm,uint32_t vcpuid);
@@ -119,4 +127,6 @@ void vm_install_vector_handler(struct kvm_vm *vm, val; \ }) +#define isb () asm volatile("isb" : : : "memory") +#endif /* SELFTEST_KVM_PROCESSOR_H */
Signature · 6 lines
2.31.1.607.g51e8a6a459-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Hi Ricardo,
Quoted 14 lines · Ricardo Koller
Hi,
These patches add a debug exception test in aarch64 KVM selftests while also adding basic exception handling support.
The structure of the exception handling is based on its x86 counterpart. Tests use the same calls to initialize exception handling and both architectures allow tests to override the handler for a particular vector, or (vector, ec) for synchronous exceptions in the arm64 case.
The debug test is similar to x86_64/debug_regs, except that the x86 one controls the debugging from outside the VM. This proposed arm64 test controls and handles debug exceptions from the inside.
Quoted 7 lines
Thanks,
Ricardov2 -> v3:
Addressed comments from Andrew and Marc (thanks again). Also, many thanks for the reviews and tests from Eric and Zenghui.
You are welcome. This version does not fail anymore on Cavium Sabre so this looks to fix the previously reported issue.
Thanks
Eric
Quoted 49 lines
- add missing ISBs after writing into debug registers.
- not store/restore ofsp_el0on exceptions.
- add default handlers for Error and FIQ.
- change multipleTEST_ASSERT(false, ...)toTEST_FAIL.
- use Andrew's suggestion regarding__GUEST_ASSERTmodifications in order to easier implementGUEST_ASSERT_EQ(Thanks Andrew).v1 -> v2:
Addressed comments from Andrew and Marc (thank you very much):
- renamevm_handle_exceptionin all tests.
- introduceUCALL_UNHANDLEDin x86 first.
- moveGUEST_ASSERT_EQto common utils header.
- handle sync and other exceptions separately: use two tables (like kvm-unit-tests).
- add two separate functions for installing sync versus other exceptions
- changes inhandlers.S: use the same layout asuser_pt_regs, treat the EL1t vectors as invalid, refactor the vector table creation to not use manual numbering, add comments, remove LR from the stored registers.
- changes indebug-exceptions.c: remove unused headers, use the commonGUEST_ASSERT_EQ, usevcpu_runinstead of_vcpu_run.
- changes inprocessor.h:write_sysregwith support for xzr, replace EL1 with current in macro names, defineESR_EC_MASKas ESR_EC_NUM-1.Ricardo Koller (5):
KVM: selftests: Renamevm_handle_exception
KVM: selftests: IntroduceUCALL_UNHANDLEDfor unhandled vector
reporting
KVM: selftests: MoveGUEST_ASSERT_EQto utils header
KVM: selftests: Add exception handling support for aarch64
KVM: selftests: Add aarch64/debug-exceptions testtools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 3 +- .../selftests/kvm/aarch64/debug-exceptions.c | 250 ++++++++++++++++++ .../selftests/kvm/include/aarch64/processor.h | 83 +++++- .../testing/selftests/kvm/include/kvm_util.h | 23 +- .../selftests/kvm/include/x86_64/processor.h | 4 +- .../selftests/kvm/lib/aarch64/handlers.S | 124 +++++++++ .../selftests/kvm/lib/aarch64/processor.c | 131 +++++++++ .../selftests/kvm/lib/x86_64/processor.c | 22 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 2 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 9 - .../kvm/x86_64/userspace_msr_exit_test.c | 8 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 2 +- 13 files changed, 615 insertions(+), 47 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/debug-exceptions.c create mode 100644 tools/testing/selftests/kvm/lib/aarch64/handlers.S
Quoted 20 lines · Auger Eric
Hi Ricardo,
Quoted 17 lines · Ricardo Koller
Hi,
These patches add a debug exception test in aarch64 KVM selftests while also adding basic exception handling support.
The structure of the exception handling is based on its x86 counterpart. Tests use the same calls to initialize exception handling and both architectures allow tests to override the handler for a particular vector, or (vector, ec) for synchronous exceptions in the arm64 case.
The debug test is similar to x86_64/debug_regs, except that the x86 one controls the debugging from outside the VM. This proposed arm64 test controls and handles debug exceptions from the inside.
Thanks,
Ricardo
Quoted 8 lines
Quoted 4 lines
v2 -> v3:
Addressed comments from Andrew and Marc (thanks again). Also, many thanks for the reviews and tests from Eric and Zenghui.
You are welcome. This version does not fail anymore on Cavium Sabre so this looks to fix the previously reported issue.
Thanks
Great, thanks Eric. The issue was that writing to mdscr needed ISBs afterward (discovered by Zenghui).
Quoted 52 lines
Eric
Quoted 49 lines
- add missing ISBs after writing into debug registers.
- not store/restore ofsp_el0on exceptions.
- add default handlers for Error and FIQ.
- change multipleTEST_ASSERT(false, ...)toTEST_FAIL.
- use Andrew's suggestion regarding__GUEST_ASSERTmodifications in order to easier implementGUEST_ASSERT_EQ(Thanks Andrew).v1 -> v2:
Addressed comments from Andrew and Marc (thank you very much):
- renamevm_handle_exceptionin all tests.
- introduceUCALL_UNHANDLEDin x86 first.
- moveGUEST_ASSERT_EQto common utils header.
- handle sync and other exceptions separately: use two tables (like kvm-unit-tests).
- add two separate functions for installing sync versus other exceptions
- changes inhandlers.S: use the same layout asuser_pt_regs, treat the EL1t vectors as invalid, refactor the vector table creation to not use manual numbering, add comments, remove LR from the stored registers.
- changes indebug-exceptions.c: remove unused headers, use the commonGUEST_ASSERT_EQ, usevcpu_runinstead of_vcpu_run.
- changes inprocessor.h:write_sysregwith support for xzr, replace EL1 with current in macro names, defineESR_EC_MASKas ESR_EC_NUM-1.Ricardo Koller (5):
KVM: selftests: Renamevm_handle_exception
KVM: selftests: IntroduceUCALL_UNHANDLEDfor unhandled vector
reporting
KVM: selftests: MoveGUEST_ASSERT_EQto utils header
KVM: selftests: Add exception handling support for aarch64
KVM: selftests: Add aarch64/debug-exceptions testtools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 3 +- .../selftests/kvm/aarch64/debug-exceptions.c | 250 ++++++++++++++++++ .../selftests/kvm/include/aarch64/processor.h | 83 +++++- .../testing/selftests/kvm/include/kvm_util.h | 23 +- .../selftests/kvm/include/x86_64/processor.h | 4 +- .../selftests/kvm/lib/aarch64/handlers.S | 124 +++++++++ .../selftests/kvm/lib/aarch64/processor.c | 131 +++++++++ .../selftests/kvm/lib/x86_64/processor.c | 22 +- .../selftests/kvm/x86_64/kvm_pv_test.c | 2 +- .../selftests/kvm/x86_64/tsc_msrs_test.c | 9 - .../kvm/x86_64/userspace_msr_exit_test.c | 8 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 2 +- 13 files changed, 615 insertions(+), 47 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/debug-exceptions.c create mode 100644 tools/testing/selftests/kvm/lib/aarch64/handlers.S
Quoted 9 lines · Ricardo Koller
These patches add a debug exception test in aarch64 KVM selftests while also adding basic exception handling support.
The structure of the exception handling is based on its x86 counterpart. Tests use the same calls to initialize exception handling and both architectures allow tests to override the handler for a particular vector, or (vector, ec) for synchronous exceptions in the arm64 case.
[...]
Applied to next, thanks!
[1/5] KVM: selftests: Rename vm_handle_exception
commit: a2bad6a990a4a7493cf5cae2f91e6b8643d2ed84
[2/5] KVM: selftests: Introduce UCALL_UNHANDLED for unhandled vector reporting
commit: 8c4680c968180739e3facd9a65e8f7939a3bdc6d
[3/5] KVM: selftests: Move GUEST_ASSERT_EQ to utils header
commit: 124d7bb43462d1b4eaee2463fcbc7e9e41cac20f
[4/5] KVM: selftests: Add exception handling support for aarch64
commit: cc968fa1dd8212557c588f348d37d907008117e8
[5/5] KVM: selftests: Add aarch64/debug-exceptions test
commit: 9c066f39c5fb96bad7533de7e96a85040c7a00a0Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.