Porting VMMAP to RawPOSIX [REVIEW for comments]

Cargo.toml

@@ -24,6 +24,8 @@ ringbuf = "0.2.6"
 dashmap = { version = "5.1", features=["serde"] }
 parking_lot = "0.12"
 bit-set = "0.5"
+nodit = "0.9.2" # Used for VMMAP
+quick_cache = "0.6.9"
 
 [dependencies.lazy_static]
 version = "1.0"

src/interface/mod.rs

@@ -1,7 +1,3 @@
-// Author: Nicholas Renner
-//
-// Module definitions for the SafePOSIX Rust interface
-// this interface limits kernel access from Rust to the popular paths as defined in Lock-in-Pop
 
 mod comm;
 pub mod errnos;

src/safeposix/cage.rs

@@ -2,80 +2,25 @@
 use crate::interface;
 //going to get the datatypes and errnos from the cage file from now on
 pub use crate::interface::errnos::{syscall_error, Errno};
-// pub use crate::interface::types::{
-//     Arg, EpollEvent, FSData, IoctlPtrUnion, PipeArray, PollStruct, Rlimit, ShmidsStruct, StatData,
-// };
 
 pub use crate::interface::types::{
     Arg, EpollEvent, IoctlPtrUnion, PipeArray, PollStruct,
 };
 
 use super::filesystem::normpath;
-// use super::net::SocketHandle;
 pub use super::syscalls::fs_constants::*;
 pub use super::syscalls::net_constants::*;
 pub use super::syscalls::sys_constants::*;
+pub use super::vmmap::*;
+pub use super::vmmap_constants::*;
 
 pub use crate::interface::CAGE_TABLE;
 
-// #[derive(Debug, Clone)]
-// pub enum FileDescriptor {
-//     File(FileDesc),
-//     Stream(StreamDesc),
-//     Socket(SocketDesc),
-//     Pipe(PipeDesc),
-//     Epoll(EpollDesc),
-// }
-
-// #[derive(Debug, Clone)]
-// pub struct FileDesc {
-//     pub position: usize,
-//     pub inode: usize,
-//     pub flags: i32,
-//     pub advlock: interface::RustRfc<interface::AdvisoryLock>,
-// }
-
-// #[derive(Debug, Clone)]
-// pub struct StreamDesc {
-//     pub position: usize,
-//     pub stream: i32, //0 for stdin, 1 for stdout, 2 for stderr
-//     pub flags: i32,
-//     pub advlock: interface::RustRfc<interface::AdvisoryLock>,
-// }
-
-// #[derive(Debug, Clone)]
-// pub struct SocketDesc {
-//     pub flags: i32,
-//     pub domain: i32,
-//     pub rawfd: i32,
-//     pub handle: interface::RustRfc<interface::RustLock<SocketHandle>>,
-//     pub advlock: interface::RustRfc<interface::AdvisoryLock>,
-// }
-
-// #[derive(Debug, Clone)]
-// pub struct PipeDesc {
-//     pub pipe: interface::RustRfc<interface::EmulatedPipe>,
-//     pub flags: i32,
-//     pub advlock: interface::RustRfc<interface::AdvisoryLock>,
-// }
-
-// #[derive(Debug, Clone)]
-// pub struct EpollDesc {
-//     pub mode: i32,
-//     pub registered_fds: interface::RustHashMap<i32, EpollEvent>,
-//     pub advlock: interface::RustRfc<interface::AdvisoryLock>,
-//     pub errno: i32,
-//     pub flags: i32,
-// }
-
-// pub type FdTable = Vec<interface::RustRfc<interface::RustLock<Option<FileDescriptor>>>>;
-
 #[derive(Debug)]
 pub struct Cage {
     pub cageid: u64,
     pub cwd: interface::RustLock<interface::RustRfc<interface::RustPathBuf>>,
     pub parent: u64,
-    // pub filedescriptortable: FdTable,
     pub cancelstatus: interface::RustAtomicBool,
     pub getgid: interface::RustAtomicI32,
     pub getuid: interface::RustAtomicI32,
@@ -91,41 +36,10 @@ pub struct Cage {
     pub pendingsigset: interface::RustHashMap<u64, interface::RustAtomicU64>,
     pub main_threadid: interface::RustAtomicU64,
     pub interval_timer: interface::IntervalTimer,
+    pub vmmap:  Vmmap,
 }
 
 impl Cage {
-    // pub fn get_next_fd(
-    //     &self,
-    //     startfd: Option<i32>,
-    // ) -> (
-    //     i32,
-    //     Option<interface::RustLockWriteGuard<Option<FileDescriptor>>>,
-    // ) {
-    //     let start = match startfd {
-    //         Some(startfd) => startfd,
-    //         None => STARTINGFD,
-    //     };
-
-    //     // let's get the next available fd number. The standard says we need to return the lowest open fd number.
-    //     for fd in start..MAXFD {
-    //         let fdguard = self.filedescriptortable[fd as usize].try_write();
-    //         if let Some(ref fdopt) = fdguard {
-    //             // we grab the lock here and if there is no occupied cage, we return the fdno and guard while keeping the fd slot locked
-    //             if fdopt.is_none() {
-    //                 return (fd, fdguard);
-    //             }
-    //         }
-    //     }
-    //     return (
-    //         syscall_error(
-    //             Errno::ENFILE,
-    //             "get_next_fd",
-    //             "no available file descriptor number could be found",
-    //         ),
-    //         None,
-    //     );
-    // }
-
     pub fn changedir(&self, newdir: interface::RustPathBuf) {
         let newwd = interface::RustRfc::new(normpath(newdir, self));
         let mut cwdbox = self.cwd.write();
@@ -152,61 +66,4 @@ impl Cage {
         }
     }
 
-    // pub fn get_filedescriptor(
-    //     &self,
-    //     fd: i32,
-    // ) -> Result<interface::RustRfc<interface::RustLock<Option<FileDescriptor>>>, ()> {
-    //     if (fd < 0) || (fd >= MAXFD) {
-    //         Err(())
-    //     } else {
-    //         Ok(self.filedescriptortable[fd as usize].clone())
-    //     }
-    // }
 }
-
-// pub fn init_fdtable() -> FdTable {
-//     let mut fdtable = Vec::new();
-//     // load lower handle stubs
-//     let stdin = interface::RustRfc::new(interface::RustLock::new(Some(FileDescriptor::Stream(
-//         StreamDesc {
-//             position: 0,
-//             stream: 0,
-//             flags: O_RDONLY,
-//             advlock: interface::RustRfc::new(interface::AdvisoryLock::new()),
-//         },
-//     ))));
-//     let stdout = interface::RustRfc::new(interface::RustLock::new(Some(FileDescriptor::Stream(
-//         StreamDesc {
-//             position: 0,
-//             stream: 1,
-//             flags: O_WRONLY,
-//             advlock: interface::RustRfc::new(interface::AdvisoryLock::new()),
-//         },
-//     ))));
-//     let stderr = interface::RustRfc::new(interface::RustLock::new(Some(FileDescriptor::Stream(
-//         StreamDesc {
-//             position: 0,
-//             stream: 2,
-//             flags: O_WRONLY,
-//             advlock: interface::RustRfc::new(interface::AdvisoryLock::new()),
-//         },
-//     ))));
-//     fdtable.push(stdin);
-//     fdtable.push(stdout);
-//     fdtable.push(stderr);
-
-//     for _fd in 3..MAXFD as usize {
-//         fdtable.push(interface::RustRfc::new(interface::RustLock::new(None)));
-//     }
-//     fdtable
-// }
-
-// pub fn create_unix_sockpipes() -> (
-//     interface::RustRfc<interface::EmulatedPipe>,
-//     interface::RustRfc<interface::EmulatedPipe>,
-// ) {
-//     let pipe1 = interface::RustRfc::new(interface::new_pipe(UDSOCK_CAPACITY));
-//     let pipe2 = interface::RustRfc::new(interface::new_pipe(UDSOCK_CAPACITY));
-
-//     (pipe1, pipe2)
-// }

src/safeposix/mod.rs

@@ -4,3 +4,5 @@ pub mod filesystem;
 pub mod net;
 pub mod shm;
 pub mod syscalls;
+pub mod vmmap;
+pub mod vmmap_constants;