From 62eb233db1e2d4c9cddfbf4efac84c737336375e Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 28 May 2024 02:44:36 +0800 Subject: [PATCH] make swapper api generic for re-entrant kernel calls (alloc element) --- kernel/src/mem.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index 6d30862fd..ef0053799 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -404,13 +404,18 @@ impl MemoryManager { } } } - if !crate::swap::Swap::with_mut(|s| s.hard_oom_inline()) { - break; - } + crate::swap::Swap::with_mut(|s| { + s.swap_reentrant_syscall(xous_kernel::SysCall::SwapOp( + crate::swap::SwapAbi::HardOom as usize, + 0, + 0, + 0, + 0, + 0, + 0, + )) + }); } - // the call above actually diverges -- the final path will actually depend on how much memory - // could be freed by the swapper. - Err(xous_kernel::Error::OutOfMemory) } /// Find a virtual address in the current process that is big enough