diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2020-07-14 18:50:48 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2020-07-14 18:50:48 +0000 |
| commit | a7f1b0cac972c5eba2e9602835e065b647f8a01f (patch) | |
| tree | 8f4685073daf46197bc130658d9854c45533e5b0 | |
| parent | 1791cad0a99ffa1cba463ac97e4fde7cb78869e0 (diff) | |
| download | src-a7f1b0cac972c5eba2e9602835e065b647f8a01f.tar.gz src-a7f1b0cac972c5eba2e9602835e065b647f8a01f.zip | |
Print the arm64 registers in more exception handling panics
It can be useful to get a dump of all registers when investigating why we
received an exception that we are unable to handle. In these cases we
already call panic, however we don't always print the registers.
Add calls to print_registers and print esr and far when applicable.
Sponsored by: Innovate UK
Notes
Notes:
svn path=/head/; revision=363191
| -rw-r--r-- | sys/arm64/arm64/trap.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 9391e8ee0698..4e5f9e32b804 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -170,8 +170,12 @@ static void align_abort(struct thread *td, struct trapframe *frame, uint64_t esr, uint64_t far, int lower) { - if (!lower) + if (!lower) { + print_registers(frame); + printf(" far: %16lx\n", far); + printf(" esr: %.8lx\n", esr); panic("Misaligned access from kernel space!"); + } call_trapsignal(td, SIGBUS, BUS_ADRALN, (void *)frame->tf_elr); userret(td, frame); @@ -361,6 +365,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) } else { print_registers(frame); printf(" far: %16lx\n", far); + printf(" esr: %.8lx\n", esr); panic("Unhandled EL1 %s abort: %x", exception == EXCP_INSN_ABORT ? "instruction" : "data", dfsc); @@ -397,6 +402,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) /* FALLTHROUGH */ default: print_registers(frame); + printf(" far: %16lx\n", READ_SPECIALREG(far_el1)); panic("Unknown kernel exception %x esr_el1 %lx\n", exception, esr); } @@ -466,10 +472,14 @@ do_el0_sync(struct thread *td, struct trapframe *frame) if (dfsc < nitems(abort_handlers) && abort_handlers[dfsc] != NULL) abort_handlers[dfsc](td, frame, esr, far, 1); - else + else { + print_registers(frame); + printf(" far: %16lx\n", far); + printf(" esr: %.8lx\n", esr); panic("Unhandled EL0 %s abort: %x", exception == EXCP_INSN_ABORT_L ? "instruction" : "data", dfsc); + } break; case EXCP_UNKNOWN: if (!undef_insn(0, frame)) |