Build the foundation for TLB shootdown.

src/syscall/fs.rs

@@ -433,7 +433,7 @@ pub fn funmap(virtual_address: usize, length: usize) -> Result<usize> {
     let span = PageSpan::validate_nonempty(VirtualAddress::new(virtual_address), length_aligned)
         .ok_or(Error::new(EINVAL))?;
     let unpin = false;
-    let notify = addr_space.inner.write().munmap(span, unpin)?;
+    let notify = addr_space.munmap(span, unpin)?;
 
     for map in notify {
         let _ = map.unmap();
@@ -483,6 +483,7 @@ pub fn mremap(
     let mut guard = addr_space.inner.write();
 
     let base = AddrSpace::r#move(
+        &addr_space,
         &mut *guard,
         None,
         src_span,

src/syscall/mod.rs

@@ -200,7 +200,7 @@ pub fn syscall(
                 SYS_GETGID => getgid(),
                 SYS_GETNS => getns(),
                 SYS_GETUID => getuid(),
-                SYS_MPROTECT => mprotect(b, c, MapFlags::from_bits_truncate(d)),
+                SYS_MPROTECT => mprotect(b, c, MapFlags::from_bits_truncate(d)).map(|()| 0),
                 SYS_MKNS => mkns(UserSlice::ro(
                     b,
                     c.checked_mul(core::mem::size_of::<[usize; 2]>())

src/syscall/process.rs

@@ -254,17 +254,13 @@ pub fn kill(pid: ContextId, sig: usize) -> Result<usize> {
     }
 }
 
-pub fn mprotect(address: usize, size: usize, flags: MapFlags) -> Result<usize> {
+pub fn mprotect(address: usize, size: usize, flags: MapFlags) -> Result<()> {
     // println!("mprotect {:#X}, {}, {:#X}", address, size, flags);
 
     let span = PageSpan::validate_nonempty(VirtualAddress::new(address), size)
         .ok_or(Error::new(EINVAL))?;
 
-    AddrSpace::current()?
-        .inner
-        .write()
-        .mprotect(span, flags)
-        .map(|()| 0)
+    AddrSpace::current()?.mprotect(span, flags)
 }
 
 pub fn setpgid(pid: ContextId, pgid: ContextId) -> Result<usize> {
@@ -591,7 +587,7 @@ pub unsafe fn usermode_bootstrap(bootstrap: &Bootstrap) -> ! {
         let page_count = NonZeroUsize::new(bootstrap.page_count)
             .expect("bootstrap contained no pages!");
 
-        let _base_page = addr_space.inner.write().mmap(Some(base), page_count, flags, &mut Vec::new(), |page, flags, mapper, flusher| {
+        let _base_page = addr_space.inner.write().mmap(&addr_space, Some(base), page_count, flags, &mut Vec::new(), |page, flags, mapper, flusher| {
             let shared = false;
             Ok(Grant::zeroed(PageSpan::new(page, bootstrap.page_count), flags, mapper, flusher, shared)?)
         });