mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
add option to dump kernel pages in panic dumps
This commit is contained in:
parent
735c4bfedd
commit
b3de92aabc
2 changed files with 21 additions and 2 deletions
|
|
@ -58,6 +58,7 @@ renode = ["utralib/renode"]
|
||||||
debug-print = []
|
debug-print = []
|
||||||
gdb-stub = ["gdbstub", "gdbstub_arch"]
|
gdb-stub = ["gdbstub", "gdbstub_arch"]
|
||||||
print-panics = []
|
print-panics = []
|
||||||
|
dump-kernel-pages = [] # include kernel pages in panic dumps
|
||||||
report-memory = ["stats_alloc"]
|
report-memory = ["stats_alloc"]
|
||||||
wrap-print = []
|
wrap-print = []
|
||||||
big-heap = [] # Cause heaps to start at 12 MM instead of 512 kB
|
big-heap = [] # Cause heaps to start at 12 MM instead of 512 kB
|
||||||
|
|
|
||||||
|
|
@ -301,6 +301,9 @@ impl MemoryMapping {
|
||||||
println!("Process isn't allocated!");
|
println!("Process isn't allocated!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#[cfg(feature = "dump-kernel-pages")]
|
||||||
|
// stash the current process space so we know where to return to after dumping kernel pages
|
||||||
|
let pid = self.get_pid().map(|v| v.get()).unwrap_or(0);
|
||||||
println!("Memory Maps for PID {}:", self.get_pid().map(|v| v.get()).unwrap_or(0));
|
println!("Memory Maps for PID {}:", self.get_pid().map(|v| v.get()).unwrap_or(0));
|
||||||
let l1_pt = unsafe { &mut (*(PAGE_TABLE_ROOT_OFFSET as *mut RootPageTable)) };
|
let l1_pt = unsafe { &mut (*(PAGE_TABLE_ROOT_OFFSET as *mut RootPageTable)) };
|
||||||
for (i, l1_entry) in l1_pt.entries.iter().enumerate() {
|
for (i, l1_entry) in l1_pt.entries.iter().enumerate() {
|
||||||
|
|
@ -324,9 +327,17 @@ impl MemoryMapping {
|
||||||
|
|
||||||
// Page 1023 is only available to PID1
|
// Page 1023 is only available to PID1
|
||||||
if i == 1023 && !self.is_kernel() {
|
if i == 1023 && !self.is_kernel() {
|
||||||
|
// switch to kernel space if kernel dumps are requested
|
||||||
|
#[cfg(feature = "dump-kernel-pages")]
|
||||||
|
crate::services::SystemServices::with(|ss| {
|
||||||
|
ss.get_process(PID::new(1).unwrap()).unwrap().mapping.activate().unwrap();
|
||||||
|
});
|
||||||
|
#[cfg(not(feature = "dump-kernel-pages"))]
|
||||||
|
{
|
||||||
println!(" <unavailable>");
|
println!(" <unavailable>");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// let l0_pt_addr = ((l1_entry >> 10) << 12) as *const u32;
|
// let l0_pt_addr = ((l1_entry >> 10) << 12) as *const u32;
|
||||||
let l0_pt = unsafe { &mut (*((PAGE_TABLE_OFFSET + i * 4096) as *mut LeafPageTable)) };
|
let l0_pt = unsafe { &mut (*((PAGE_TABLE_OFFSET + i * 4096) as *mut LeafPageTable)) };
|
||||||
for (j, l0_entry) in l0_pt.entries.iter().enumerate() {
|
for (j, l0_entry) in l0_pt.entries.iter().enumerate() {
|
||||||
|
|
@ -342,6 +353,13 @@ impl MemoryMapping {
|
||||||
MMUFlags::from_bits(l0_entry & 0x3ff).unwrap()
|
MMUFlags::from_bits(l0_entry & 0x3ff).unwrap()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
// return to the original process space from kernel space
|
||||||
|
#[cfg(feature = "dump-kernel-pages")]
|
||||||
|
if i == 1023 && pid != 1 {
|
||||||
|
crate::services::SystemServices::with(|ss| {
|
||||||
|
ss.get_process(PID::new(pid).unwrap()).unwrap().mapping.activate().unwrap();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
println!("End of map");
|
println!("End of map");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue