saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-08 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make alloc_page_oomable re-entrant

Browse source 
This version of the OOM handler uses a syscall in a syscall
(previously forbidden) to make the OOM case deep in an alloc
situation oomable, but also have multiple exit paths.

this saves us from having to recode oodles of exit paths which
is complicated and error-prone.

I also think we should trim back some of the OOM handling paths
because it is bloating the swapper, but let's commit the current
working state before we trim stuff.
This commit is contained in:
bunnie 2024-05-25 00:01:22 +08:00
parent 010bdd0180
commit 081f2009e8
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
kernel/src/mem.rs
View file

@ -410,27 +410,29 @@ impl MemoryManager {
/// Similar to alloc_page(), but this implementation can only be called in one location because
/// we need to know where to resume from after the OOM is recovered.
pub fn alloc_page_oomable(&mut self, pid: PID, vaddr: usize) -> Result<usize, xous_kernel::Error> {
// Go through all RAM pages looking for a free page.
// println!("Allocating page for PID {}", pid);
unsafe {
let end_point = self.ram_size / PAGE_SIZE;
let starting_point = self.last_ram_page.max(end_point);
for (allocation, index) in MEMORY_ALLOCATIONS[starting_point..end_point]
.iter_mut()
.zip(starting_point..)
.chain(MEMORY_ALLOCATIONS[..starting_point].iter_mut().zip(0..))
{
if allocation.is_none() {
allocation.update(Some(pid), Some(vaddr));
self.last_ram_page = index + 1;
let page = index * PAGE_SIZE + self.ram_start;
return Ok(page);
loop {
// Go through all RAM pages looking for a free page.
// println!("Allocating page for PID {}", pid);
unsafe {
let end_point = self.ram_size / PAGE_SIZE;
let starting_point = self.last_ram_page.max(end_point);
for (allocation, index) in MEMORY_ALLOCATIONS[starting_point..end_point]
.iter_mut()
.zip(starting_point..)
.chain(MEMORY_ALLOCATIONS[..starting_point].iter_mut().zip(0..))
{
if allocation.is_none() {
allocation.update(Some(pid), Some(vaddr));
self.last_ram_page = index + 1;
let page = index * PAGE_SIZE + self.ram_start;
return Ok(page);
}
}
}
if !crate::swap::Swap::with_mut(|s| s.hard_oom_inline()) {
break;
}
}
crate::swap::Swap::with_mut(|s| {
s.hard_oom(vaddr);
});
// 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)
@ -553,9 +555,7 @@ impl MemoryManager {
#[cfg(not(feature = "swap"))]
let phys = self.alloc_page(pid)?;
#[cfg(feature = "swap")]
// this should not be OOMable because the callers for map_zeroed page are exclusively from kernel
// services (process creation, queue creation)
let phys = self.alloc_page(pid, Some(virt))?;
let phys = self.alloc_page_oomable(pid, virt)?;
// Actually perform the map. At this stage, every physical page should be owned by us.
if let Err(e) = crate::arch::mem::map_page_inner(