diff options
author | Andrew Turner <andrew@FreeBSD.org> | 2019-10-23 13:21:15 +0000 |
---|---|---|
committer | Andrew Turner <andrew@FreeBSD.org> | 2019-10-23 13:21:15 +0000 |
commit | 9d0a6b83ca8917392b7a2a90446b4c86a9995d38 (patch) | |
tree | b89e69d78b41b666da469ab6fcdb463ee11585ce | |
parent | a601368040cc2137435893973243b2d91d2a659b (diff) | |
download | src-9d0a6b83ca8917392b7a2a90446b4c86a9995d38.tar.gz src-9d0a6b83ca8917392b7a2a90446b4c86a9995d38.zip |
Stop enabling interrupts when reentering kdb on arm64
When we raise a data abort from the kernel we need to enable interrupts,
however we shouldn't be doing this when in the kernel debugger. In this
case interrupts can lead to a further panic as they don't expect to be
run from such a context.
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=353920
-rw-r--r-- | sys/arm64/arm64/trap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 9e57dbc1f683..ce6dd265543c 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -179,6 +179,8 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, if (lower) map = &p->p_vmspace->vm_map; else { + intr_enable(); + /* The top bit tells us which range to use */ if (far >= VM_MAXUSER_ADDRESS) { map = kernel_map; @@ -316,7 +318,6 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) case EXCP_INSN_ABORT: case EXCP_DATA_ABORT: far = READ_SPECIALREG(far_el1); - intr_enable(); data_abort(td, frame, esr, far, 0, exception == EXCP_INSN_ABORT); break; |