From 96630a11ee61c7f0cf6827e2f6ba373f81763b15 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 19 Jun 2024 21:39:17 +0800 Subject: [PATCH] handle the case of a failed PTE allocation gracefully instead of hard crashing, we return an appropriate error. Also add some debug instrumentation. --- kernel/src/arch/riscv/mem.rs | 44 ++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 95d1b5d73..d85d38e57 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -922,7 +922,7 @@ pub fn ensure_page_exists_inner(address: usize) -> Result Result Result addr, + Err(e) => { + #[cfg(feature = "debug-swap")] + { + crate::arch::mem::MemoryMapping::current().print_map(); + let vpn1 = (vaddr >> 22) & ((1 << 10) - 1); + let l1_pt = unsafe { &(*(PAGE_TABLE_ROOT_OFFSET as *mut RootPageTable)) }; + let l1_pte = l1_pt.entries[vpn1]; + println!( + "evict_page_inner() PTE lookup error. vaddr in PID{}: {:x}, bad l1 pte: {:x}, err {:?}", + target_pid.get(), + vaddr, + l1_pte, + e + ); + } + let swapper_pid = PID::new(xous_kernel::SWAPPER_PID).unwrap(); + let swapper_map = system_services.get_process(swapper_pid).unwrap().mapping; + swapper_map.activate()?; + return Err(e); + } + }; let target_pte = unsafe { entry.read_volatile() }; let target_paddr = (target_pte >> 10) << 12; @@ -1147,6 +1176,17 @@ pub fn evict_page_inner(target_pid: PID, vaddr: usize) -> Result