pass the masked address to alloc_page

was accidentally passing the whole address before, which was
causing the LSB's that are assumed to be empty to muck up
some page table computations.

Also make sure old PTE entries are properly masked when recycling
flags.
This commit is contained in:
bunnie 2024-05-21 01:10:23 +08:00
parent d7a8671e7e
commit b684420d28

View file

@ -934,8 +934,7 @@ pub fn ensure_page_exists_inner(address: usize) -> Result<usize, xous_kernel::Er
});
#[cfg(feature = "swap")]
let new_page = MemoryManager::with_mut(|mm| {
mm.alloc_page_oomable(crate::arch::process::current_pid(), Some(address))
.expect("Couldn't allocate new page")
mm.alloc_page_oomable(crate::arch::process::current_pid(), virt).expect("Couldn't allocate new page")
});
let ppn1 = (new_page >> 22) & ((1 << 12) - 1);
@ -1129,7 +1128,8 @@ pub fn evict_page_inner(target_pid: PID, vaddr: usize) -> Result<usize, xous_ker
#[cfg(feature = "debug-swap")]
println!(
"-- evict: {:08x} -> {:08x} (flags: {:?}), count {}",
"-- evict[{}]: {:08x} -> {:08x} (flags: {:?}), count {}",
target_pid.get(),
vaddr,
target_paddr,
MMUFlags::from_bits(target_pte & 0x3ff).unwrap(),
@ -1162,8 +1162,8 @@ pub fn evict_page_inner(target_pid: PID, vaddr: usize) -> Result<usize, xous_ker
return Err(xous_kernel::Error::ShareViolation);
}
// clear the valid bit, mark as swapped, preserve all other flags
let new_pte = (target_pte & !MMUFlags::VALID.bits()) | MMUFlags::P.bits();
// clear the valid bit, mark as swapped, preserve all other flags, remove physical address
let new_pte = (target_pte & !MMUFlags::VALID.bits() & 0x3FFusize) | MMUFlags::P.bits();
unsafe { entry.write_volatile(new_pte) };
// switch into the swapper memory space