Page MenuHomeFreeBSD
Files F146622222

D18561.id52021.diff
No OneTemporary
Actions

D18561.id52021.diff
View Options

Index: sys/riscv/riscv/trap.c
===================================================================
--- sys/riscv/riscv/trap.c
+++ sys/riscv/riscv/trap.c
@@ -167,7 +167,7 @@
}
static void
-data_abort(struct trapframe *frame, int lower)
+data_abort(struct trapframe *frame, int usermode)
{
struct vm_map *map;
uint64_t sbadaddr;
@@ -176,9 +176,7 @@
vm_prot_t ftype;
vm_offset_t va;
struct proc *p;
- int ucode;
- int error;
- int sig;
+ int error, sig, ucode;
#ifdef KDB
if (kdb_active) {
@@ -188,19 +186,23 @@
#endif
td = curthread;
+ p = td->td_proc;
pcb = td->td_pcb;
sbadaddr = frame->tf_sbadaddr;
- p = td->td_proc;
+ if (td->td_critnest != 0 || td->td_intr_nesting_level != 0 ||
+ WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL,
+ "Kernel page fault") != 0)
+ goto fatal;
- if (lower)
+ if (usermode)
map = &td->td_proc->p_vmspace->vm_map;
+ else if (sbadaddr >= VM_MAX_USER_ADDRESS)
+ map = kernel_map;
else {
- /* The top bit tells us which range to use */
- if ((sbadaddr >> 63) == 1)
- map = kernel_map;
- else
- map = &td->td_proc->p_vmspace->vm_map;
+ if (pcb->pcb_onfault == 0)
+ goto fatal;
+ map = &td->td_proc->p_vmspace->vm_map;
}
va = trunc_page(sbadaddr);
@@ -241,7 +243,7 @@
}
if (error != KERN_SUCCESS) {
- if (lower) {
+ if (usermode) {
sig = SIGSEGV;
if (error == KERN_PROTECTION_FAILURE)
ucode = SEGV_ACCERR;
@@ -249,21 +251,23 @@
ucode = SEGV_MAPERR;
call_trapsignal(td, sig, ucode, (void *)sbadaddr);
} else {
- if (td->td_intr_nesting_level == 0 &&
- pcb->pcb_onfault != 0) {
+ if (pcb->pcb_onfault != 0) {
frame->tf_a[0] = error;
frame->tf_sepc = pcb->pcb_onfault;
return;
}
- dump_regs(frame);
- panic("vm_fault failed: %lx, va 0x%016lx",
- frame->tf_sepc, sbadaddr);
+ goto fatal;
}
}
done:
- if (lower)
+ if (usermode)
userret(td, frame);
+ return;
+
+fatal:
+ dump_regs(frame);
+ panic("Fatal page fault at %#lx: %#016lx", frame->tf_sepc, sbadaddr);
}
void

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 5, 4:45 AM (22 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29271643
Default Alt Text
D18561.id52021.diff (1 KB)

Event Timeline