kernel: move memory owner when a Move occurs

When moving memory between processes, update the owner of that page to
match the new PID. Otherwise, memory can never be released.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2021-03-26 17:05:53 +08:00
parent f58f82a40d
commit af5598d2dc
2 changed files with 39 additions and 16 deletions

View file

@ -11,9 +11,10 @@ use crate::arch::process::Process;
use xous_kernel::{MemoryFlags, MemoryRange, PID}; use xous_kernel::{MemoryFlags, MemoryRange, PID};
#[derive(Debug)] #[derive(Debug)]
enum ClaimOrRelease { enum ClaimReleaseMove {
Claim, Claim,
Release, Release,
Move(PID /* from */),
} }
#[repr(C)] #[repr(C)]
@ -487,12 +488,14 @@ impl MemoryManager {
#[allow(dead_code)] #[allow(dead_code)]
pub fn move_page( pub fn move_page(
&mut self, &mut self,
src_pid: PID,
src_mapping: &MemoryMapping, src_mapping: &MemoryMapping,
src_addr: *mut u8, src_addr: *mut u8,
dest_pid: PID, dest_pid: PID,
dest_mapping: &MemoryMapping, dest_mapping: &MemoryMapping,
dest_addr: *mut u8, dest_addr: *mut u8,
) -> Result<(), xous_kernel::Error> { ) -> Result<(), xous_kernel::Error> {
let phys_addr = crate::arch::mem::virt_to_phys(src_addr as usize)?;
crate::arch::mem::move_page_inner( crate::arch::mem::move_page_inner(
self, self,
&src_mapping, &src_mapping,
@ -500,6 +503,11 @@ impl MemoryManager {
dest_pid, dest_pid,
&dest_mapping, &dest_mapping,
dest_addr, dest_addr,
)?;
self.claim_release_move(
phys_addr as *mut usize,
dest_pid,
ClaimReleaseMove::Move(src_pid),
) )
} }
@ -557,40 +565,54 @@ impl MemoryManager {
/// Claim the given memory for the given process, or release the memory /// Claim the given memory for the given process, or release the memory
/// back to the free pool. /// back to the free pool.
#[cfg(not(baremetal))] #[cfg(not(baremetal))]
fn claim_or_release( fn claim_release_move(
&mut self, &mut self,
_addr: *mut usize, _addr: *mut usize,
_pid: PID, _pid: PID,
_action: ClaimOrRelease, _action: ClaimReleaseMove,
) -> Result<(), xous_kernel::Error> { ) -> Result<(), xous_kernel::Error> {
Ok(()) Ok(())
} }
#[cfg(baremetal)] #[cfg(baremetal)]
fn claim_or_release( fn claim_release_move(
&mut self, &mut self,
addr: *mut usize, addr: *mut usize,
pid: PID, pid: PID,
action: ClaimOrRelease, action: ClaimReleaseMove,
) -> Result<(), xous_kernel::Error> { ) -> Result<(), xous_kernel::Error> {
/// Modify the memory tracking table to note which process owns /// Modify the memory tracking table to note which process owns
/// the specified address. /// the specified address.
fn action_inner( fn action_inner(
addr: &mut Option<PID>, owner_addr: &mut Option<PID>,
pid: PID, pid: PID,
action: ClaimOrRelease, action: ClaimReleaseMove,
) -> Result<(), xous_kernel::Error> { ) -> Result<(), xous_kernel::Error> {
if let Some(current_pid) = *addr { if let Some(current_pid) = *owner_addr {
if current_pid != pid { if current_pid != pid {
return Err(xous_kernel::Error::MemoryInUse); // println!(
// "In claim_or_release({}, {}, {:?}) -- addr is owned by {} not {}",
// owner_addr.map(|v| v.get()).unwrap_or_default(),
// pid,
// action,
// current_pid,
// pid
// );
if let ClaimReleaseMove::Move(existing_pid) = action {
if existing_pid != current_pid {
return Err(xous_kernel::Error::MemoryInUse);
}
} else {
return Err(xous_kernel::Error::MemoryInUse);
}
} }
} }
match action { match action {
ClaimOrRelease::Claim => { ClaimReleaseMove::Claim | ClaimReleaseMove::Move(_) => {
*addr = Some(pid); *owner_addr = Some(pid);
} }
ClaimOrRelease::Release => { ClaimReleaseMove::Release => {
*addr = None; *owner_addr = None;
} }
} }
Ok(()) Ok(())
@ -632,11 +654,11 @@ impl MemoryManager {
/// Mark a given address as being owned by the specified process ID /// Mark a given address as being owned by the specified process ID
fn claim_page(&mut self, addr: *mut usize, pid: PID) -> Result<(), xous_kernel::Error> { fn claim_page(&mut self, addr: *mut usize, pid: PID) -> Result<(), xous_kernel::Error> {
self.claim_or_release(addr, pid, ClaimOrRelease::Claim) self.claim_release_move(addr, pid, ClaimReleaseMove::Claim)
} }
/// Mark a given address as no longer being owned by the specified process ID /// Mark a given address as no longer being owned by the specified process ID
fn release_page(&mut self, addr: *mut usize, pid: PID) -> Result<(), xous_kernel::Error> { fn release_page(&mut self, addr: *mut usize, pid: PID) -> Result<(), xous_kernel::Error> {
self.claim_or_release(addr, pid, ClaimOrRelease::Release) self.claim_release_move(addr, pid, ClaimReleaseMove::Release)
} }
} }

View file

@ -1064,11 +1064,12 @@ impl SystemServices {
let mut error = None; let mut error = None;
// Lend each subsequent page. // Move each subsequent page.
for offset in (0..(len / core::mem::size_of::<usize>())) for offset in (0..(len / core::mem::size_of::<usize>()))
.step_by(crate::mem::PAGE_SIZE / core::mem::size_of::<usize>()) .step_by(crate::mem::PAGE_SIZE / core::mem::size_of::<usize>())
{ {
mm.move_page( mm.move_page(
current_pid,
&src_mapping, &src_mapping,
src_virt.wrapping_add(offset), src_virt.wrapping_add(offset),
dest_pid, dest_pid,