mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
kernel: riscv: suspend or terminate processes that fail
If a process fails for some reason (e.g. by performing a fault) and there is no exception handler, either terminate the process or (if gdbserver is enabled) have it suspend the process. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
e407e77b4f
commit
1cb86078d5
1 changed files with 26 additions and 3 deletions
|
|
@ -299,13 +299,14 @@ pub extern "C" fn trap_handler(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let is_kernel_failure = sstatus::read().spp() == sstatus::SPP::Supervisor;
|
||||||
// The exception was not handled. We should terminate the program here.
|
// The exception was not handled. We should terminate the program here.
|
||||||
// For now, let's halt the whole system instead so that it becomes
|
// For now, let's halt the whole system instead so that it becomes
|
||||||
// immediately obvious that we screwed up. On harware this will trigger
|
// immediately obvious that we screwed up. On harware this will trigger
|
||||||
// a watchdog reset.
|
// a watchdog reset.
|
||||||
println!(
|
println!(
|
||||||
"{}: CPU Exception on PID {}: {}",
|
"{}: CPU Exception on PID {}: {}",
|
||||||
if sstatus::read().spp() == sstatus::SPP::Supervisor {
|
if is_kernel_failure {
|
||||||
"!!! KERNEL FAILURE !!!"
|
"!!! KERNEL FAILURE !!!"
|
||||||
} else {
|
} else {
|
||||||
"PROGRAM HALT"
|
"PROGRAM HALT"
|
||||||
|
|
@ -317,9 +318,31 @@ pub extern "C" fn trap_handler(
|
||||||
println!("Current thread {}:", process.current_tid());
|
println!("Current thread {}:", process.current_tid());
|
||||||
process.print_current_thread();
|
process.print_current_thread();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// If this is a failure in the kernel, go into an infinite loop
|
||||||
MemoryMapping::current().print_map();
|
MemoryMapping::current().print_map();
|
||||||
#[allow(clippy::empty_loop)]
|
if is_kernel_failure {
|
||||||
loop {}
|
#[allow(clippy::empty_loop)]
|
||||||
|
loop {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If it's not a failure in the kernel, terminate or debug the current process.
|
||||||
|
SystemServices::with_mut(|ss| {
|
||||||
|
if cfg!(feature = "gdbserver") {
|
||||||
|
ss.suspend_process(pid)
|
||||||
|
.expect("couldn't debug current process");
|
||||||
|
println!("Program suspended. You may inspect it using gdb.");
|
||||||
|
} else {
|
||||||
|
ss.terminate_process(pid)
|
||||||
|
.expect("couldn't terminate current process");
|
||||||
|
};
|
||||||
|
crate::syscall::reset_switchto_caller();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Resume the parent process.
|
||||||
|
ArchProcess::with_current_mut(|process| {
|
||||||
|
crate::arch::syscall::resume(current_pid().get() == 1, process.current_thread())
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
let irqs_pending = sip::read();
|
let irqs_pending = sip::read();
|
||||||
// println!("irqs: {:x}", irqs_pending);
|
// println!("irqs: {:x}", irqs_pending);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue