mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
cleanup dirty-bit attempt to track pages
This commit is contained in:
parent
3f3f64788c
commit
788efb3056
1 changed files with 3 additions and 40 deletions
|
|
@ -389,40 +389,6 @@ impl MemoryManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(baremetal)]
|
|
||||||
#[cfg(feature = "swap")]
|
|
||||||
pub fn mark_rpt_dirty(&mut self, paddr: usize) -> Result<(), xous_kernel::Error> {
|
|
||||||
unsafe {
|
|
||||||
let offset = (paddr - self.ram_start) / PAGE_SIZE;
|
|
||||||
if MEMORY_ALLOCATIONS[offset].is_none() {
|
|
||||||
Err(xous_kernel::Error::BadAddress)
|
|
||||||
} else {
|
|
||||||
MEMORY_ALLOCATIONS[offset].set_dirty();
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(baremetal)]
|
|
||||||
#[cfg(feature = "swap")]
|
|
||||||
pub fn mark_rpt_clean(&mut self, paddr: usize) -> Result<(), xous_kernel::Error> {
|
|
||||||
unsafe {
|
|
||||||
let offset = (paddr - self.ram_start) / PAGE_SIZE;
|
|
||||||
if MEMORY_ALLOCATIONS[offset].is_none() {
|
|
||||||
Err(xous_kernel::Error::BadAddress)
|
|
||||||
} else {
|
|
||||||
MEMORY_ALLOCATIONS[offset].clear_dirty();
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(baremetal)]
|
|
||||||
#[cfg(feature = "swap")]
|
|
||||||
pub fn rpt_is_dirty(&self, paddr: usize) -> bool {
|
|
||||||
unsafe { MEMORY_ALLOCATIONS[(paddr - self.ram_start) / PAGE_SIZE].is_dirty() }
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(baremetal)]
|
#[cfg(baremetal)]
|
||||||
#[cfg(feature = "swap")]
|
#[cfg(feature = "swap")]
|
||||||
/// Similar to alloc_page(), but this implementation takes the vaddr being allocated so we
|
/// Similar to alloc_page(), but this implementation takes the vaddr being allocated so we
|
||||||
|
|
@ -665,13 +631,10 @@ impl MemoryManager {
|
||||||
// round up to the nearest page boundary
|
// round up to the nearest page boundary
|
||||||
let end = (virt_ptr as usize + size + PAGE_SIZE - 1) & !(PAGE_SIZE - 1);
|
let end = (virt_ptr as usize + size + PAGE_SIZE - 1) & !(PAGE_SIZE - 1);
|
||||||
for virt in (start..end).step_by(PAGE_SIZE) {
|
for virt in (start..end).step_by(PAGE_SIZE) {
|
||||||
// read/write is provisionally allowed - this allows us to cache writeable
|
// Pages are read-only. Writes take a special call to ensure atomicity of write
|
||||||
// data using the swap mechanism and only do built write-outs when the page is
|
// updates (and subsequent page unmap). Valid is not set, because it's not
|
||||||
// retired. However this is somewhat dangerous because it means we could lose
|
|
||||||
// data on power-down or if we screw up the tracking of dirty pages (dirty bit is
|
|
||||||
// not automatically set on write/update). Valid is not set, because it's not
|
|
||||||
// wired into memory, and "P" (swap) is set to indicate this is a swapper managed page.
|
// wired into memory, and "P" (swap) is set to indicate this is a swapper managed page.
|
||||||
mm.reserve_address(self, virt, MemoryFlags::R | MemoryFlags::W | MemoryFlags::P)?;
|
mm.reserve_address(self, virt, MemoryFlags::R | MemoryFlags::P)?;
|
||||||
|
|
||||||
// now mark the page as USER
|
// now mark the page as USER
|
||||||
let pte = pagetable_entry(virt)?;
|
let pte = pagetable_entry(virt)?;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue