Debug info for nVHE hyp panics
Subsystems (3)
v3 cover Debug info for nVHE hyp panics
Panics from arm64's nVHE hyp mode are hard to interpret. This series adds some more debug info to help with diagnosis.
Using BUG() in nVHE hyp gives a meaningful address to locate invariants that fail to hold. The host can also look up the bug to provide the file and line, if the debug configs are enabled. Otherwise a kimg address is much more useful than a hyp VA since it can be looked up in vmlinux.
Applies on 5.12-rc3.
From v2 (https://lore.kernel.org/r/[email protected]/):
- Rebased
- An extra little refactor in bug.c for Steve
- Handling for the randomized offset
From v1 (https://lore.kernel.org/r/[email protected]/):
- keeping struct bug details in bug.c
- using SPSR to distinguish hyp from host
- inlined __hyp_panic_string
Andrew Scull (5):
bug: Remove redundant condition check in report_bug
bug: Factor out a getter for a bug's file line
bug: Assign values once in bug_get_file_line()
KVM: arm64: Use BUG and BUG_ON in nVHE hyp
KVM: arm64: Log source when panicking from nVHE hyp
arch/arm64/include/asm/kvm_hyp.h | 1 - arch/arm64/include/asm/kvm_mmu.h | 2 + arch/arm64/kernel/image-vars.h | 3 +- arch/arm64/kvm/handle_exit.c | 45 +++++++++++++++++++++ arch/arm64/kvm/hyp/include/hyp/switch.h | 2 - arch/arm64/kvm/hyp/nvhe/host.S | 18 ++++----- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 2 +- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 6 +-- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 2 - arch/arm64/kvm/hyp/vhe/switch.c | 4 +- include/linux/bug.h | 3 ++ lib/bug.c | 54 +++++++++++++------------ 12 files changed, 91 insertions(+), 51 deletions(-)
Signature · 6 lines
2.31.0.rc2.261.g7f71774620-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 1/5 bug: Remove redundant condition check in report_bug
report_bug() will return early if it cannot find a bug corresponding to the provided address. The subsequent test for the bug will always be true so remove it.
--- lib/bug.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
lib/bug.c +15 -18
@@ -155,30 +155,27 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) file =NULL ; line =0 ; - warning =0 ; -if (bug) {#ifdef CONFIG_DEBUG_BUGVERBOSE #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS - file = bug->file; + file = bug->file;#else - file = (const char *)bug + bug->file_disp; + file = (const char *)bug + bug->file_disp;#endif - line = bug->line; + line = bug->line;#endif - warning = (bug->flags &BUGFLAG_WARNING ) !=0 ; - once = (bug->flags &BUGFLAG_ONCE ) !=0 ; - done = (bug->flags &BUGFLAG_DONE ) !=0 ; - -if (warning && once) { -if (done) -return BUG_TRAP_TYPE_WARN ; - -/* -* Since this is the only store, concurrency is not an issue. -*/ - bug->flags |=BUGFLAG_DONE ; - } + warning = (bug->flags &BUGFLAG_WARNING ) !=0 ; + once = (bug->flags &BUGFLAG_ONCE ) !=0 ; + done = (bug->flags &BUGFLAG_DONE ) !=0 ; + +if (warning && once) { +if (done) +return BUG_TRAP_TYPE_WARN ; + +/* +* Since this is the only store, concurrency is not an issue. +*/ + bug->flags |=BUGFLAG_DONE ; }/*
Signature · 6 lines
2.31.0.rc2.261.g7f71774620-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 1/5] bug: Remove redundant condition check in report_bug
Hi Andrew,
Thanks for the patch.
Quoted 5 lines · Andrew Scull
report_bug()will return early if it cannot find a bug corresponding to the provided address. The subsequent test for the bug will always be true so remove it.Fixes 1b4cfe3c0a30d ("lib/bug.c: exclude non-BUG/WARN exceptions from report_bug()")
This is purely cosmetic, so I'm not sure this warrants a fixes tag (i.e. I wouldn't expect this change to be backported).
Quoted 7 lines
Signed-off-by Andrew Scull <[email protected]>Cc Peter Zijlstra <[email protected]>Cc "Steven Rostedt (VMware)" <[email protected]>Reviewed-by Steven Rostedt (VMware) <[email protected]>--- lib/bug.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
But the change looks good:
Will
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 2/5 bug: Factor out a getter for a bug's file line
In reply to Andrew ScullThere is some non-trivial config-based logic to get the file name and line number associated with a bug. Factor this out to a getter that can be resused.
--- include/linux/bug.h | 3 +++ lib/bug.c | 27 +++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-)
include/linux/bug.h +3 -0
@@ -36,6 +36,9 @@ static inline int is_warning_bug(const struct bug_entry *bug)return bug->flags &BUGFLAG_WARNING ; } +void bug_get_file_line (struct bug_entry *bug,const char **file, +unsigned int *line); +struct bug_entry *find_bug (unsigned long bugaddr);enum bug_trap_type report_bug (unsigned long bug_addr,struct pt_regs *regs);
lib/bug.c +17 -10
@@ -127,6 +127,22 @@ static inline struct bug_entry *module_find_bug(unsigned long bugaddr) }#endif +void bug_get_file_line (struct bug_entry *bug,const char **file, +unsigned int *line) +{ + *file =NULL ; + *line =0 ; + +#ifdef CONFIG_DEBUG_BUGVERBOSE +#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS + *file = bug->file; +#else + *file = (const char *)bug + bug->file_disp; +#endif + *line = bug->line; +#endif +} +struct bug_entry *find_bug (unsigned long bugaddr) {struct bug_entry *bug;
@@ -153,17 +169,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)disable_trace_on_warning (); - file =NULL ; - line =0 ; +bug_get_file_line (bug, &file, &line); -#ifdef CONFIG_DEBUG_BUGVERBOSE -#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS - file = bug->file; -#else - file = (const char *)bug + bug->file_disp; -#endif - line = bug->line; -#endif warning = (bug->flags &BUGFLAG_WARNING ) !=0 ; once = (bug->flags &BUGFLAG_ONCE ) !=0 ; done = (bug->flags &BUGFLAG_DONE ) !=0 ;
Signature · 6 lines
2.31.0.rc2.261.g7f71774620-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 2/5] bug: Factor out a getter for a bug's file line
Quoted 3 lines · Andrew Scull
There is some non-trivial config-based logic to get the file name and line number associated with a bug. Factor this out to a getter that can be resused.
typo: "resused"
Quoted 9 lines
Signed-off-by Andrew Scull <[email protected]>Cc Peter Zijlstra <[email protected]>Cc "Steven Rostedt (VMware)" <[email protected]>Reviewed-by Steven Rostedt (VMware) <[email protected]>--- include/linux/bug.h | 3 +++ lib/bug.c | 27 +++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-)
Patch looks fine:
Will
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 3/5 bug: Assign values once in bug_get_file_line()
In reply to Andrew ScullSet bug_get_file_line()'s output parameter values directly rather than first nullifying them and then conditionally setting new values.
--- lib/bug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/bug.c +3 -3
@@ -130,9 +130,6 @@ static inline struct bug_entry *module_find_bug(unsigned long bugaddr)void bug_get_file_line (struct bug_entry *bug,const char **file,unsigned int *line) { - *file =NULL ; - *line =0 ; -#ifdef CONFIG_DEBUG_BUGVERBOSE #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS *file = bug->file;
@@ -140,6 +137,9 @@ void bug_get_file_line(struct bug_entry *bug, const char **file, *file = (const char *)bug + bug->file_disp;#endif *line = bug->line; +#else + *file =NULL ; + *line =0 ;#endif }
Signature · 6 lines
2.31.0.rc2.261.g7f71774620-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 3/5] bug: Assign values once in bug_get_file_line()
Quoted 25 lines · Andrew Scull
Set bug_get_file_line()'s output parameter values directly rather than first nullifying them and then conditionally setting new values.
Signed-off-by Andrew Scull <[email protected]>Cc Peter Zijlstra <[email protected]>Cc "Steven Rostedt (VMware)" <[email protected]>--- lib/bug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)lib/bug.c +0
-3@@ -130,9 +130,6 @@ static inline struct bug_entry *module_find_bug(unsigned long bugaddr)void bug_get_file_line (struct bug_entry *bug,const char **file,unsigned int *line) { - *file =NULL ; - *line =0 ; -#ifdef CONFIG_DEBUG_BUGVERBOSE #ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS *file = bug->file;
lib/bug.c void bug_get_file_line(struct bug_entry *bug, const char **file, · line 142
Quoted 6 lines
lib/bug.c +3
-0@@ -140,6 +137,9 @@ void bug_get_file_line(struct bug_entry *bug, const char **file, *file = (const char *)bug + bug->file_disp;#endif *line = bug->line; +#else + *file =NULL ; + *line =0 ;
Will
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 4/5 KVM: arm64: Use BUG and BUG_ON in nVHE hyp
In reply to Andrew Scullhyp_panic() reports the address of the panic by using ELR_EL2, but this isn't a useful address when hyp_panic() is called directly. Replace such direct calls with BUG() and BUG_ON() which use BRK to trigger an exception that then goes to hyp_panic() with the correct address. Also remove the hyp_panic() declaration from the header file to avoid accidental misuse.
--- arch/arm64/include/asm/kvm_hyp.h | 1 - arch/arm64/kvm/hyp/nvhe/hyp-main.c | 2 +- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-)
arch/arm64/include/asm/kvm_hyp.h +0 -1
@@ -100,7 +100,6 @@ u64 __guest_enter(struct kvm_vcpu *vcpu);bool kvm_host_psci_handler (struct kvm_cpu_context *host_ctxt); -void __noreturn hyp_panic (void );#ifdef __KVM_NVHE_HYPERVISOR__void __noreturn __hyp_do_panic (struct kvm_cpu_context *host_ctxt,u64 spsr,u64 elr,u64 par);
arch/arm64/kvm/hyp/nvhe/hyp-main.c +1 -1
@@ -178,6 +178,6 @@ void handle_trap(struct kvm_cpu_context *host_ctxt)handle_host_smc (host_ctxt);break ;default : -hyp_panic (); +BUG (); } }
arch/arm64/kvm/hyp/nvhe/hyp-smp.c +2 -4
@@ -18,8 +18,7 @@ u64 __ro_after_init hyp_cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALIDu64 cpu_logical_map (unsigned int cpu) { -if (cpu >=ARRAY_SIZE (hyp_cpu_logical_map)) -hyp_panic (); +BUG_ON (cpu >=ARRAY_SIZE (hyp_cpu_logical_map));return hyp_cpu_logical_map[cpu]; }
@@ -30,8 +29,7 @@ unsigned long __hyp_per_cpu_offset(unsigned int cpu)unsigned long this_cpu_base;unsigned long elf_base; -if (cpu >=ARRAY_SIZE (kvm_arm_hyp_percpu_base)) -hyp_panic (); +BUG_ON (cpu >=ARRAY_SIZE (kvm_arm_hyp_percpu_base)); cpu_base_array = (unsigned long *)&kvm_arm_hyp_percpu_base; this_cpu_base =kern_hyp_va (cpu_base_array[cpu]);
Signature · 6 lines
2.31.0.rc2.261.g7f71774620-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 4/5] KVM: arm64: Use BUG and BUG_ON in nVHE hyp
Quoted 7 lines · Andrew Scull
hyp_panic()reports the address of the panic by usingELR_EL2, but this isn't a useful address whenhyp_panic()is called directly. Replace such direct calls withBUG()andBUG_ON()which use BRK to trigger an exception that then goes tohyp_panic()with the correct address. Also remove thehyp_panic()declaration from the header file to avoid accidental misuse.
Quoted 6 lines
Signed-off-by Andrew Scull <[email protected]>--- arch/arm64/include/asm/kvm_hyp.h | 1 - arch/arm64/kvm/hyp/nvhe/hyp-main.c | 2 +- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-)
Makes sense to me:
Will
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 5/5 KVM: arm64: Log source when panicking from nVHE hyp
In reply to Andrew ScullTo aid with debugging, add details of the source of a panic from nVHE hyp. This is done by having nVHE hyp exit to nvhe_hyp_panic_handler() rather than directly to panic(). The handler will then add the extra details for debugging before panicking the kernel.
If the panic was due to a BUG(), look up the metadata to log the file and line, if available, otherwise log an address that can be looked up in vmlinux. The hyp offset is also logged to allow other hyp VAs to be converted, similar to how the kernel offset is logged during a panic.
__hyp_panic_string is now inlined since it no longer needs to be referenced as a symbol and the message is free to diverge between VHE and nVHE.
The following is an example of the logs generated by a BUG in nVHE hyp.
[ 46.754840] kvm [307]: nVHE hyp BUG at: arch/arm64/kvm/hyp/nvhe/switch.c:242! [ 46.755357] kvm [307]: Hyp Offset: 0xfffea6c58e1e0000 [ 46.755824] Kernel panic - not syncing: HYP panic: [ 46.755824] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.755824] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.755824] VCPU:0000d93a880d0000 [ 46.756960] CPU: 3 PID: 307 Comm: kvm-vcpu-0 Not tainted 5.12.0-rc3-00005-gc572b99cf65b-dirty #133 [ 46.757459] Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 [ 46.758366] Call trace: [ 46.758601] dump_backtrace+0x0/0x1b0 [ 46.758856] show_stack+0x18/0x70 [ 46.759057] dump_stack+0xd0/0x12c [ 46.759236] panic+0x16c/0x334 [ 46.759426] arm64_kernel_unmapped_at_el0+0x0/0x30 [ 46.759661] kvm_arch_vcpu_ioctl_run+0x134/0x750 [ 46.759936] kvm_vcpu_ioctl+0x2f0/0x970 [ 46.760156] __arm64_sys_ioctl+0xa8/0xec [ 46.760379] el0_svc_common.constprop.0+0x60/0x120 [ 46.760627] do_el0_svc+0x24/0x90 [ 46.760766] el0_svc+0x2c/0x54 [ 46.760915] el0_sync_handler+0x1a4/0x1b0 [ 46.761146] el0_sync+0x170/0x180 [ 46.761889] SMP: stopping secondary CPUs [ 46.762786] Kernel Offset: 0x3e1cd2820000 from 0xffff800010000000 [ 46.763142] PHYS_OFFSET: 0xffffa9f680000000 [ 46.763359] CPU features: 0x00240022,61806008 [ 46.763651] Memory Limit: none [ 46.813867] ---[ end Kernel panic - not syncing: HYP panic: [ 46.813867] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.813867] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.813867] VCPU:0000d93a880d0000 ]---
--- arch/arm64/include/asm/kvm_mmu.h | 2 ++ arch/arm64/kernel/image-vars.h | 3 +- arch/arm64/kvm/handle_exit.c | 45 +++++++++++++++++++++++++ arch/arm64/kvm/hyp/include/hyp/switch.h | 2 -- arch/arm64/kvm/hyp/nvhe/host.S | 18 ++++------ arch/arm64/kvm/hyp/nvhe/psci-relay.c | 2 -- arch/arm64/kvm/hyp/vhe/switch.c | 4 +-- 7 files changed, 56 insertions(+), 20 deletions(-)
arch/arm64/include/asm/kvm_mmu.h +2 -0
@@ -121,6 +121,8 @@ void kvm_update_va_mask(struct alt_instr *alt,void kvm_compute_layout (void );void kvm_apply_hyp_relocations (void ); +#define __hyp_pa (x) (((phys_addr_t)(x)) + hyp_physvirt_offset) +static __always_inline unsigned long __kern_hyp_va (unsigned long v) { asm volatile(ALTERNATIVE_CB("and %0, %0, #1\n"
arch/arm64/kernel/image-vars.h +1 -2
@@ -70,8 +70,7 @@ KVM_NVHE_ALIAS(kvm_get_kimage_voffset);KVM_NVHE_ALIAS (kvm_vgic_global_state);/* Kernel symbols used to call panic() from nVHE hyp code (via ERET). */ -KVM_NVHE_ALIAS (__hyp_panic_string); -KVM_NVHE_ALIAS (panic); +KVM_NVHE_ALIAS (nvhe_hyp_panic_handler);/* Vectors installed by hyp-init on reset HVC. */ KVM_NVHE_ALIAS (__hyp_stub_vectors);
arch/arm64/kvm/handle_exit.c +45 -0
48 lines not on this page · raw message
arch/arm64/kvm/hyp/include/hyp/switch.h +0 -2
@@ -30,8 +30,6 @@#include <asm/processor.h> #include <asm/thread_info.h> -extern const char __hyp_panic_string[]; -extern struct exception_table_entry __start___kvm_ex_table;extern struct exception_table_entry __stop___kvm_ex_table;
arch/arm64/kvm/hyp/nvhe/host.S +7 -11
@@ -79,22 +79,18 @@ SYM_FUNC_START(__hyp_do_panic) mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ PSR_MODE_EL1h) msr spsr_el2, lr - ldr lr, =panic + ldr lr, =nvhe_hyp_panic_handler hyp_kimg_va lr, x6 msr elr_el2, lr mov x29, x0 - /* Load the format string into x0 and arguments into x1-7 */ - ldr x0, =__hyp_panic_string - hyp_kimg_va x0, x6 - - /* Load the format arguments into x1-7. */ - mov x6, x3 - get_vcpu_ptr x7, x3 - mrs x3, esr_el2 - mrs x4, far_el2 - mrs x5, hpfar_el2 + /* Load the panic arguments into x0-7 */ + mrs x0, esr_el2 + get_vcpu_ptr x4, x5 + mrs x5, far_el2 + mrs x6, hpfar_el2 + mov x7, xzr // Unused argument /* Enter the host, conditionally restoring the host context. */ cbz x29, __host_enter_without_restoring
arch/arm64/kvm/hyp/nvhe/psci-relay.c +0 -2
@@ -22,8 +22,6 @@ void __noreturn __host_enter(struct kvm_cpu_context *host_ctxt);struct kvm_host_psci_config __ro_after_init kvm_host_psci_config;s64 __ro_after_init hyp_physvirt_offset; -#define __hyp_pa (x) ((phys_addr_t)((x)) + hyp_physvirt_offset) -#define INVALID_CPU_ID UINT_MAXstruct psci_boot_args {
arch/arm64/kvm/hyp/vhe/switch.c +1 -3
@@ -27,8 +27,6 @@#include <asm/processor.h> #include <asm/thread_info.h> -const char __hyp_panic_string[] ="HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n" ; -/* VHE specific context */ DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data); DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
@@ -207,7 +205,7 @@ static void __hyp_call_panic(u64 spsr, u64 elr, u64 par)__deactivate_traps (vcpu);sysreg_restore_host_state_vhe (host_ctxt); -panic (__hyp_panic_string, +panic ("HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%p\n" , spsr, elr,read_sysreg_el2 (SYS_ESR ),read_sysreg_el2 (SYS_FAR ),read_sysreg (hpfar_el2), par, vcpu);
Signature · 6 lines
2.31.0.rc2.261.g7f71774620-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Will Deacon
maintainerRe: [PATCH v3 5/5] KVM: arm64: Log source when panicking from nVHE hyp
Quoted 35 lines · Andrew Scull
To aid with debugging, add details of the source of a panic from nVHE hyp. This is done by having nVHE hyp exit to
nvhe_hyp_panic_handler()rather than directly topanic(). The handler will then add the extra details for debugging before panicking the kernel.If the panic was due to a
BUG(), look up the metadata to log the file and line, if available, otherwise log an address that can be looked up in vmlinux. The hyp offset is also logged to allow other hyp VAs to be converted, similar to how the kernel offset is logged during a panic.
__hyp_panic_stringis now inlined since it no longer needs to be referenced as a symbol and the message is free to diverge between VHE and nVHE.The following is an example of the logs generated by a BUG in nVHE hyp.
[ 46.754840] kvm [307]: nVHE hyp BUG at: arch/arm64/kvm/hyp/nvhe/switch.c:242! [ 46.755357] kvm [307]: Hyp Offset: 0xfffea6c58e1e0000 [ 46.755824] Kernel panic - not syncing: HYP panic: [ 46.755824] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.755824] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.755824] VCPU:0000d93a880d0000 [ 46.756960] CPU: 3 PID: 307 Comm: kvm-vcpu-0 Not tainted 5.12.0-rc3-00005-gc572b99cf65b-dirty #133 [ 46.757459] Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 [ 46.758366] Call trace: [ 46.758601] dump_backtrace+0x0/0x1b0 [ 46.758856] show_stack+0x18/0x70 [ 46.759057] dump_stack+0xd0/0x12c [ 46.759236] panic+0x16c/0x334 [ 46.759426] arm64_kernel_unmapped_at_el0+0x0/0x30 [ 46.759661] kvm_arch_vcpu_ioctl_run+0x134/0x750 [ 46.759936] kvm_vcpu_ioctl+0x2f0/0x970 [ 46.760156] __arm64_sys_ioctl+0xa8/0xec [ 46.760379] el0_svc_common.constprop.0+0x60/0x120 [ 46.760627] do_el0_svc+0x24/0x90
Quoted 8 lines
[ 46.760766] el0_svc+0x2c/0x54 [ 46.760915] el0_sync_handler+0x1a4/0x1b0 [ 46.761146] el0_sync+0x170/0x180 [ 46.761889] SMP: stopping secondary CPUs [ 46.762786] Kernel Offset: 0x3e1cd2820000 from 0xffff800010000000 [ 46.763142] PHYS_OFFSET: 0xffffa9f680000000 [ 46.763359] CPU features: 0x00240022,61806008 [ 46.763651] Memory Limit: none
Nice!
Quoted 4 lines
[ 46.813867] ---[ end Kernel panic - not syncing: HYP panic: [ 46.813867] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.813867] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.813867] VCPU:0000d93a880d0000 ]---
Why did these last three lines get printed twice?
Quoted 16 lines
Signed-off-by Andrew Scull <[email protected]>--- arch/arm64/include/asm/kvm_mmu.h | 2 ++ arch/arm64/kernel/image-vars.h | 3 +- arch/arm64/kvm/handle_exit.c | 45 +++++++++++++++++++++++++ arch/arm64/kvm/hyp/include/hyp/switch.h | 2 -- arch/arm64/kvm/hyp/nvhe/host.S | 18 ++++------ arch/arm64/kvm/hyp/nvhe/psci-relay.c | 2 -- arch/arm64/kvm/hyp/vhe/switch.c | 4 +-- 7 files changed, 56 insertions(+), 20 deletions(-)arch/arm64/include/asm/kvm_mmu.h +0
-0
arch/arm64/include/asm/kvm_mmu.h void kvm_update_va_mask(struct alt_instr *alt, · line 124
Quoted 4 lines
arch/arm64/include/asm/kvm_mmu.h +1
-0@@ -121,6 +121,8 @@ void kvm_update_va_mask(struct alt_instr *alt,void kvm_compute_layout (void );void kvm_apply_hyp_relocations (void ); +#define __hyp_pa (x) (((phys_addr_t)(x)) + hyp_physvirt_offset)
Just a heads up: but Quentin's series moves this same macro, but to a different header (arch/arm64/kvm/hyp/include/nvhe/memory.h)
Quoted 22 lines
arch/arm64/include/asm/kvm_mmu.h +0
-0static __always_inline unsigned long __kern_hyp_va (unsigned long v) { asm volatile(ALTERNATIVE_CB("and %0, %0, #1\n"arch/arm64/kernel/image-vars.h +1
-2@@ -70,8 +70,7 @@ KVM_NVHE_ALIAS(kvm_get_kimage_voffset);KVM_NVHE_ALIAS (kvm_vgic_global_state);/* Kernel symbols used to call panic() from nVHE hyp code (via ERET). */ -KVM_NVHE_ALIAS (__hyp_panic_string); -KVM_NVHE_ALIAS (panic); +KVM_NVHE_ALIAS (nvhe_hyp_panic_handler);/* Vectors installed by hyp-init on reset HVC. */ KVM_NVHE_ALIAS (__hyp_stub_vectors);arch/arm64/kvm/handle_exit.c +0
-0
arch/arm64/kvm/handle_exit.c void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index) · line 297
Quoted 7 lines
arch/arm64/kvm/handle_exit.c +4
-0@@ -291,3 +291,48 @@ void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index)if (exception_index ==ARM_EXCEPTION_EL1_SERROR )kvm_handle_guest_serror (vcpu,kvm_vcpu_get_esr (vcpu)); } + +void __noreturn __cold nvhe_hyp_panic_handler (u64 esr,u64 spsr,u64 elr, +u64 par,uintptr_t vcpu, +u64 far,u64 hpfar) {
Interesting, I don't think I've seen __cold used in arch/arm64 before. Does it make any difference to the generated code?
Quoted 30 lines
arch/arm64/kvm/handle_exit.c +30
-0+u64 elr_in_kimg =__phys_to_kimg (__hyp_pa (elr)); +u64 hyp_offset = elr_in_kimg -kaslr_offset () - elr; +u64 mode = spsr &PSR_MODE_MASK ; + +/* +* The nVHE hyp symbols are not included by kallsyms to avoid issues +* with aliasing. That means that the symbols cannot be printed with the +* "%pS" format specifier, so fall back to the vmlinux address if +* there's no better option. +*/ +if (mode != PSR_MODE_EL2t && mode != PSR_MODE_EL2h) { +kvm_err ("Invalid host exception to nVHE hyp!\n" ); + }else if (ESR_ELx_EC (esr) == ESR_ELx_EC_BRK64 && + (esr & ESR_ELx_BRK64_ISS_COMMENT_MASK) ==BUG_BRK_IMM ) { +struct bug_entry *bug =find_bug (elr_in_kimg); +const char *file =NULL ; +unsigned int line =0 ; + +/* All hyp bugs, including warnings, are treated as fatal. */ +if (bug) +bug_get_file_line (bug, &file, &line); + +if (file) +kvm_err ("nVHE hyp BUG at: %s:%u!\n" , file, line); +else +kvm_err ("nVHE hyp BUG at: %016llx!\n" , elr + hyp_offset); + }else { +kvm_err ("nVHE hyp panic at: %016llx!\n" , elr + hyp_offset); + } +
arch/arm64/kvm/handle_exit.c void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index) · line 337
Quoted 10 lines
arch/arm64/kvm/handle_exit.c +10
-0+/* +* Hyp has panicked and we're going to handle that by panicking the +* kernel. The kernel offset will be revealed in the panic so we're +* also safe to reveal the hyp offset as a debugging aid for translating +* hyp VAs to vmlinux addresses. +*/ +kvm_err ("Hyp Offset: 0x%llx\n" , hyp_offset); + +panic ("HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%016lx\n" , + spsr, elr, esr, far, hpfar, par, vcpu);
Is %016lx the right conversion specifier for uintptr_t?
Quoted 35 lines
arch/arm64/kvm/handle_exit.c +1
-0+}arch/arm64/kvm/hyp/include/hyp/switch.h +0
-2@@ -30,8 +30,6 @@#include <asm/processor.h> #include <asm/thread_info.h> -extern const char __hyp_panic_string[]; -extern struct exception_table_entry __start___kvm_ex_table;extern struct exception_table_entry __stop___kvm_ex_table;arch/arm64/kvm/hyp/nvhe/host.S +1
-7@@ -79,22 +79,18 @@ SYM_FUNC_START(__hyp_do_panic) mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ PSR_MODE_EL1h) msr spsr_el2, lr - ldr lr, =panic + ldr lr, =nvhe_hyp_panic_handler hyp_kimg_va lr, x6 msr elr_el2, lr mov x29, x0 - /* Load the format string into x0 and arguments into x1-7 */ - ldr x0, =__hyp_panic_string - hyp_kimg_va x0, x6 - - /* Load the format arguments into x1-7. */ - mov x6, x3
arch/arm64/kvm/hyp/nvhe/host.S SYM_FUNC_START(__hyp_do_panic) · line 93
Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/host.S +6
-4- get_vcpu_ptr x7, x3 - mrs x3, esr_el2 - mrs x4, far_el2 - mrs x5, hpfar_el2 + /* Load the panic arguments into x0-7 */ + mrs x0, esr_el2 + get_vcpu_ptr x4, x5 + mrs x5, far_el2 + mrs x6, hpfar_el2 + mov x7, xzr // Unused argument
Why do you need to clear x7 if it's unused?
Will
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v3 5/5] KVM: arm64: Log source when panicking from nVHE hyp
Quoted 46 lines · Will Deacon
Quoted 35 lines · Andrew Scull
To aid with debugging, add details of the source of a panic from nVHE hyp. This is done by having nVHE hyp exit to
nvhe_hyp_panic_handler()rather than directly topanic(). The handler will then add the extra details for debugging before panicking the kernel.If the panic was due to a
BUG(), look up the metadata to log the file and line, if available, otherwise log an address that can be looked up in vmlinux. The hyp offset is also logged to allow other hyp VAs to be converted, similar to how the kernel offset is logged during a panic.
__hyp_panic_stringis now inlined since it no longer needs to be referenced as a symbol and the message is free to diverge between VHE and nVHE.The following is an example of the logs generated by a BUG in nVHE hyp.
[ 46.754840] kvm [307]: nVHE hyp BUG at: arch/arm64/kvm/hyp/nvhe/switch.c:242! [ 46.755357] kvm [307]: Hyp Offset: 0xfffea6c58e1e0000 [ 46.755824] Kernel panic - not syncing: HYP panic: [ 46.755824] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.755824] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.755824] VCPU:0000d93a880d0000 [ 46.756960] CPU: 3 PID: 307 Comm: kvm-vcpu-0 Not tainted 5.12.0-rc3-00005-gc572b99cf65b-dirty #133 [ 46.757459] Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 [ 46.758366] Call trace: [ 46.758601] dump_backtrace+0x0/0x1b0 [ 46.758856] show_stack+0x18/0x70 [ 46.759057] dump_stack+0xd0/0x12c [ 46.759236] panic+0x16c/0x334 [ 46.759426] arm64_kernel_unmapped_at_el0+0x0/0x30 [ 46.759661] kvm_arch_vcpu_ioctl_run+0x134/0x750 [ 46.759936] kvm_vcpu_ioctl+0x2f0/0x970 [ 46.760156] __arm64_sys_ioctl+0xa8/0xec [ 46.760379] el0_svc_common.constprop.0+0x60/0x120 [ 46.760627] do_el0_svc+0x24/0x90Quoted 8 lines
[ 46.760766] el0_svc+0x2c/0x54 [ 46.760915] el0_sync_handler+0x1a4/0x1b0 [ 46.761146] el0_sync+0x170/0x180 [ 46.761889] SMP: stopping secondary CPUs [ 46.762786] Kernel Offset: 0x3e1cd2820000 from 0xffff800010000000 [ 46.763142] PHYS_OFFSET: 0xffffa9f680000000 [ 46.763359] CPU features: 0x00240022,61806008 [ 46.763651] Memory Limit: none
Quoted 8 lines
Nice!
Quoted 4 lines
[ 46.813867] ---[ end Kernel panic - not syncing: HYP panic: [ 46.813867] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.813867] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.813867] VCPU:0000d93a880d0000 ]---Why did these last three lines get printed twice?
That's the panic string that gets repeated, a standard "feature" of the panic code:
root@tiger-roach:~# echo -n 'c' > /proc/sysrq-trigger [250622.941867] sysrq: Trigger a crash [250622.941903] Kernel panic - not syncing: sysrq triggered crash [250622.945515] CPU: 0 PID: 4890 Comm: bash Tainted: G E 5.11.0 #3124 [250622.952930] Hardware name: , BIOS 2021.01-rc2-00012-gde865f7ee1 11/16/2020 [250622.959917] Call trace: [250622.962417] dump_backtrace+0x0/0x1e4 [250622.966126] show_stack+0x24/0x80 [250622.969490] dump_stack+0xc8/0x120 [250622.972940] panic+0x178/0x38c [250622.976045] sysrq_handle_crash+0x28/0x30 [250622.980098] __handle_sysrq+0x98/0x1a4 [250622.983893] write_sysrq_trigger+0x94/0x12c [250622.988120] proc_reg_write+0xb4/0xf0 [250622.991828] vfs_write+0xfc/0x29c [250622.995192] ksys_write+0x74/0x100 [250622.998642] __arm64_sys_write+0x28/0x3c [250623.002610] el0_svc_common.constprop.0+0x80/0x1c0 [250623.007440] do_el0_svc+0x30/0xa0 [250623.010803] el0_svc+0x28/0x70 [250623.013908] el0_sync_handler+0x1a8/0x1ac [250623.017962] el0_sync+0x174/0x180 [250623.021331] SMP: stopping secondary CPUs [250623.025301] Kernel Offset: 0x435917bf0000 from 0xffff800010000000 [250623.031417] PHYS_OFFSET: 0xffff9bc5c0000000 [250623.035643] CPU features: 0x08240022,2aa0a830 [250623.040042] Memory Limit: none [250623.043153] ---[ end Kernel panic - not syncing: sysrq triggered crash ]---
KVM just happens to have a fairly large, multi line panic string.
M.
Signature · 5 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 5/5] KVM: arm64: Log source when panicking from nVHE hyp
In reply to Will DeaconQuoted 74 lines · Will Deacon
Quoted 35 lines · Andrew Scull
To aid with debugging, add details of the source of a panic from nVHE hyp. This is done by having nVHE hyp exit to
nvhe_hyp_panic_handler()rather than directly topanic(). The handler will then add the extra details for debugging before panicking the kernel.If the panic was due to a
BUG(), look up the metadata to log the file and line, if available, otherwise log an address that can be looked up in vmlinux. The hyp offset is also logged to allow other hyp VAs to be converted, similar to how the kernel offset is logged during a panic.
__hyp_panic_stringis now inlined since it no longer needs to be referenced as a symbol and the message is free to diverge between VHE and nVHE.The following is an example of the logs generated by a BUG in nVHE hyp.
[ 46.754840] kvm [307]: nVHE hyp BUG at: arch/arm64/kvm/hyp/nvhe/switch.c:242! [ 46.755357] kvm [307]: Hyp Offset: 0xfffea6c58e1e0000 [ 46.755824] Kernel panic - not syncing: HYP panic: [ 46.755824] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.755824] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.755824] VCPU:0000d93a880d0000 [ 46.756960] CPU: 3 PID: 307 Comm: kvm-vcpu-0 Not tainted 5.12.0-rc3-00005-gc572b99cf65b-dirty #133 [ 46.757459] Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 [ 46.758366] Call trace: [ 46.758601] dump_backtrace+0x0/0x1b0 [ 46.758856] show_stack+0x18/0x70 [ 46.759057] dump_stack+0xd0/0x12c [ 46.759236] panic+0x16c/0x334 [ 46.759426] arm64_kernel_unmapped_at_el0+0x0/0x30 [ 46.759661] kvm_arch_vcpu_ioctl_run+0x134/0x750 [ 46.759936] kvm_vcpu_ioctl+0x2f0/0x970 [ 46.760156] __arm64_sys_ioctl+0xa8/0xec [ 46.760379] el0_svc_common.constprop.0+0x60/0x120 [ 46.760627] do_el0_svc+0x24/0x90Quoted 8 lines
[ 46.760766] el0_svc+0x2c/0x54 [ 46.760915] el0_sync_handler+0x1a4/0x1b0 [ 46.761146] el0_sync+0x170/0x180 [ 46.761889] SMP: stopping secondary CPUs [ 46.762786] Kernel Offset: 0x3e1cd2820000 from 0xffff800010000000 [ 46.763142] PHYS_OFFSET: 0xffffa9f680000000 [ 46.763359] CPU features: 0x00240022,61806008 [ 46.763651] Memory Limit: noneNice!
Quoted 4 lines
[ 46.813867] ---[ end Kernel panic - not syncing: HYP panic: [ 46.813867] PS:400003c9 PC:0000d93a82c705ac ESR:f2000800 [ 46.813867] FAR:0000000080080000 HPFAR:0000000000800800 PAR:0000000000000000 [ 46.813867] VCPU:0000d93a880d0000 ]---Why did these last three lines get printed twice?
Quoted 19 lines
Signed-off-by Andrew Scull <[email protected]>--- arch/arm64/include/asm/kvm_mmu.h | 2 ++ arch/arm64/kernel/image-vars.h | 3 +- arch/arm64/kvm/handle_exit.c | 45 +++++++++++++++++++++++++ arch/arm64/kvm/hyp/include/hyp/switch.h | 2 -- arch/arm64/kvm/hyp/nvhe/host.S | 18 ++++------ arch/arm64/kvm/hyp/nvhe/psci-relay.c | 2 -- arch/arm64/kvm/hyp/vhe/switch.c | 4 +-- 7 files changed, 56 insertions(+), 20 deletions(-)arch/arm64/include/asm/kvm_mmu.h +0
-0@@ -121,6 +121,8 @@ void kvm_update_va_mask(struct alt_instr *alt,void kvm_compute_layout (void );void kvm_apply_hyp_relocations (void );
Quoted 4 lines
arch/arm64/include/asm/kvm_mmu.h void kvm_update_va_mask(struct alt_instr *alt, · line 124
Quoted 1 line
arch/arm64/include/asm/kvm_mmu.h +1
-0+#define __hyp_pa (x) (((phys_addr_t)(x)) + hyp_physvirt_offset)Just a heads up: but Quentin's series moves this same macro, but to a different header (
arch/arm64/kvm/hyp/include/nvhe/memory.h)
I can make sure we're putting it in the same header to ease the merge.
Quoted 24 lines
Quoted 24 lines
arch/arm64/include/asm/kvm_mmu.h +0
-0static __always_inline unsigned long __kern_hyp_va (unsigned long v) { asm volatile(ALTERNATIVE_CB("and %0, %0, #1\n"arch/arm64/kernel/image-vars.h +1
-2@@ -70,8 +70,7 @@ KVM_NVHE_ALIAS(kvm_get_kimage_voffset);KVM_NVHE_ALIAS (kvm_vgic_global_state);/* Kernel symbols used to call panic() from nVHE hyp code (via ERET). */ -KVM_NVHE_ALIAS (__hyp_panic_string); -KVM_NVHE_ALIAS (panic); +KVM_NVHE_ALIAS (nvhe_hyp_panic_handler);/* Vectors installed by hyp-init on reset HVC. */ KVM_NVHE_ALIAS (__hyp_stub_vectors);arch/arm64/kvm/handle_exit.c +0
-0@@ -291,3 +291,48 @@ void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index)if (exception_index ==ARM_EXCEPTION_EL1_SERROR )kvm_handle_guest_serror (vcpu,kvm_vcpu_get_esr (vcpu));
Quoted 8 lines
arch/arm64/kvm/handle_exit.c void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index) · line 297
Quoted 5 lines
arch/arm64/kvm/handle_exit.c +4
-0} + +void __noreturn __cold nvhe_hyp_panic_handler (u64 esr,u64 spsr,u64 elr, +u64 par,uintptr_t vcpu, +u64 far,u64 hpfar) {Interesting, I don't think I've seen
__coldused inarch/arm64before. Does it make any difference to the generated code?
Honestly, I just copied the signature of panic. There was no good reason for it so I'll drop it if it stands out as odd.
Quoted 34 lines
Quoted 34 lines
arch/arm64/kvm/handle_exit.c +34
-0+u64 elr_in_kimg =__phys_to_kimg (__hyp_pa (elr)); +u64 hyp_offset = elr_in_kimg -kaslr_offset () - elr; +u64 mode = spsr &PSR_MODE_MASK ; + +/* +* The nVHE hyp symbols are not included by kallsyms to avoid issues +* with aliasing. That means that the symbols cannot be printed with the +* "%pS" format specifier, so fall back to the vmlinux address if +* there's no better option. +*/ +if (mode != PSR_MODE_EL2t && mode != PSR_MODE_EL2h) { +kvm_err ("Invalid host exception to nVHE hyp!\n" ); + }else if (ESR_ELx_EC (esr) == ESR_ELx_EC_BRK64 && + (esr & ESR_ELx_BRK64_ISS_COMMENT_MASK) ==BUG_BRK_IMM ) { +struct bug_entry *bug =find_bug (elr_in_kimg); +const char *file =NULL ; +unsigned int line =0 ; + +/* All hyp bugs, including warnings, are treated as fatal. */ +if (bug) +bug_get_file_line (bug, &file, &line); + +if (file) +kvm_err ("nVHE hyp BUG at: %s:%u!\n" , file, line); +else +kvm_err ("nVHE hyp BUG at: %016llx!\n" , elr + hyp_offset); + }else { +kvm_err ("nVHE hyp panic at: %016llx!\n" , elr + hyp_offset); + } + +/* +* Hyp has panicked and we're going to handle that by panicking the +* kernel. The kernel offset will be revealed in the panic so we're +* also safe to reveal the hyp offset as a debugging aid for translating
Quoted 8 lines
arch/arm64/kvm/handle_exit.c void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index) · line 337
Quoted 6 lines
arch/arm64/kvm/handle_exit.c +6
-0+* hyp VAs to vmlinux addresses. +*/ +kvm_err ("Hyp Offset: 0x%llx\n" , hyp_offset); + +panic ("HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%016lx\n" , + spsr, elr, esr, far, hpfar, par, vcpu);Is %016lx the right conversion specifier for
uintptr_t?
PRIxPTR looks to be the right specifier in the standards, but that's not in the kernel. uintptr_t looks to be defined as unsigned long in types.h which would make %lx the right specifier, IIUC.
Quoted 39 lines
Quoted 39 lines
arch/arm64/kvm/handle_exit.c +1
-0+}arch/arm64/kvm/hyp/include/hyp/switch.h +0
-2@@ -30,8 +30,6 @@#include <asm/processor.h> #include <asm/thread_info.h> -extern const char __hyp_panic_string[]; -extern struct exception_table_entry __start___kvm_ex_table;extern struct exception_table_entry __stop___kvm_ex_table;arch/arm64/kvm/hyp/nvhe/host.S +1
-11@@ -79,22 +79,18 @@ SYM_FUNC_START(__hyp_do_panic) mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ PSR_MODE_EL1h) msr spsr_el2, lr - ldr lr, =panic + ldr lr, =nvhe_hyp_panic_handler hyp_kimg_va lr, x6 msr elr_el2, lr mov x29, x0 - /* Load the format string into x0 and arguments into x1-7 */ - ldr x0, =__hyp_panic_string - hyp_kimg_va x0, x6 - - /* Load the format arguments into x1-7. */ - mov x6, x3 - get_vcpu_ptr x7, x3 - mrs x3, esr_el2 - mrs x4, far_el2 - mrs x5, hpfar_el2
Quoted 8 lines
arch/arm64/kvm/hyp/nvhe/host.S SYM_FUNC_START(__hyp_do_panic) · line 93
Quoted 6 lines
arch/arm64/kvm/hyp/nvhe/host.S +6
-0+ /* Load the panic arguments into x0-7 */ + mrs x0, esr_el2 + get_vcpu_ptr x4, x5 + mrs x5, far_el2 + mrs x6, hpfar_el2 + mov x7, xzr // Unused argumentWhy do you need to clear x7 if it's unused?
x7 is one of the registers that's preserved by __host_enter_for_panic so I was probably thinking that __host_enter_for_panic takes arguments x0-7, so let's initialize x7.
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 5/5] KVM: arm64: Log source when panicking from nVHE hyp
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm64/include/asm/kvm_mmu.h +0
-0@@ -121,6 +121,8 @@ void kvm_update_va_mask(struct alt_instr *alt,void kvm_compute_layout (void );void kvm_apply_hyp_relocations (void );
Quoted 6 lines
Quoted 4 lines
arch/arm64/include/asm/kvm_mmu.h void kvm_update_va_mask(struct alt_instr *alt, · line 124
Quoted 1 line
arch/arm64/include/asm/kvm_mmu.h +1
-0+#define __hyp_pa (x) (((phys_addr_t)(x)) + hyp_physvirt_offset)Just a heads up: but Quentin's series moves this same macro, but to a different header (
arch/arm64/kvm/hyp/include/nvhe/memory.h)I can make sure we're putting it in the same header to ease the merge.
Seems I was too optimistic since nvhe/memory.h can only be used from nVHE hyp. I could rebase no top of Quentin to move the macro somewhere that can be used from here, but that would add a series dependency that you usually seem to try and avoid so I'm not going to change this, unless you'd prefer that I do.
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v3 5/5] KVM: arm64: Log source when panicking from nVHE hyp
Quoted 13 lines · Andrew Scull
Quoted 13 lines
Quoted 12 lines
arch/arm64/include/asm/kvm_mmu.h void kvm_update_va_mask(struct alt_instr *alt, · line 124
Quoted 9 lines
arch/arm64/include/asm/kvm_mmu.h +1
-0@@ -121,6 +121,8 @@ void kvm_update_va_mask(struct alt_instr *alt,void kvm_compute_layout (void );void kvm_apply_hyp_relocations (void ); +#define __hyp_pa (x) (((phys_addr_t)(x)) + hyp_physvirt_offset)Just a heads up: but Quentin's series moves this same macro, but to a different header (
arch/arm64/kvm/hyp/include/nvhe/memory.h)
Quoted 7 lines
Quoted 1 line
I can make sure we're putting it in the same header to ease the merge.
Seems I was too optimistic since
nvhe/memory.hcan only be used from nVHE hyp. I could rebase no top of Quentin to move the macro somewhere that can be used from here, but that would add a series dependency that you usually seem to try and avoid so I'm not going to change this, unless you'd prefer that I do.
I can deal with this at merge time.
M.
Signature · 5 lines
Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 9 lines · Andrew Scull
Panics from arm64's nVHE hyp mode are hard to interpret. This series adds some more debug info to help with diagnosis.
Using
BUG()in nVHE hyp gives a meaningful address to locate invariants that fail to hold. The host can also look up the bug to provide the file and line, if the debug configs are enabled. Otherwise a kimg address is much more useful than a hyp VA since it can be looked up in vmlinux.[...]
Applied to kvm-arm64/nvhe-panic-info, thanks!
[1/5] bug: Remove redundant condition check in report_bug
commit: 3ad1a6cb0abc63d036fc866bd7c2c5983516dec5
[2/5] bug: Factor out a getter for a bug's file line
commit: 26dbc7e299c7ebbb6a95e2c620b21b5280b37c57
[3/5] bug: Assign values once in bug_get_file_line()
commit: 5b8be5d875a996776708ba174fcd08c8bcd721a5
[4/5] KVM: arm64: Use BUG and BUG_ON in nVHE hyp
commit: f79e616f27ab6cd74deb0995a8eead3d1c9d65af
[5/5] KVM: arm64: Log source when panicking from nVHE hyp
commit: aec0fae62e47050019474936248a311a0ab08705Cheers,
M.
Signature · 7 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm