From 1b0fc181a57af014975c9ac56a9b44b9eac86bdb Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 15 May 2024 02:41:15 +0800 Subject: [PATCH] ensure process state is correct on errors; remove excess mmu flushes --- kernel/src/arch/riscv/mem.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 6e0822dcc..822948fc8 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -934,7 +934,8 @@ pub fn ensure_page_exists_inner(address: usize) -> Result> 22) & ((1 << 12) - 1); @@ -1128,9 +1129,16 @@ pub fn evict_page_inner(target_pid: PID, vaddr: usize) -> Result Result Result { as usize; let _result = map_page_inner(mm, swapper_pid, paddr, payload_virt, MemoryFlags::R | MemoryFlags::W, true); - unsafe { flush_mmu() }; payload_virt }); Ok(payload_virt)