Merge branch 'fs' into dev

Author: sabtf

Cargo.lock

@@ -39,6 +39,7 @@ intrusive-collections.workspace = true
 log = { workspace = true, features = [] }
 packit.workspace = true
 libmstpm = { workspace = true, optional = true }
+num_enum =  { version="0.7.3", default-features = false }
 
 [target."x86_64-unknown-none".dev-dependencies]
 test.workspace = true

kernel/Cargo.toml

@@ -20,6 +20,7 @@ use crate::process_manager::process_memory::allocate_page;
 use crate::process_manager::allocation::AllocationRange;
 use crate::process_manager::process_paging::ProcessPageTableRef;
 use crate::process_manager::process_paging::ProcessPageFlags;
+use crate::process_runtime::runtime::MmapManager;
 use crate::protocols::errors::SvsmReqError;
 use crate::protocols::RequestParams;
 use crate::sev::RMPFlags;
@@ -80,8 +81,8 @@ impl TrustedProcessStore {
         ptr.push(process);
     }
     pub fn init(&self, size: u32){
-        let empty_process = TrustedProcess::empty();
         for _ in 0..size  {
+            let empty_process = TrustedProcess::empty();
             self.push(empty_process);
         }
     }
@@ -121,7 +122,7 @@ impl ProcessData {
 #[derive(Clone,Copy,Debug, Default)]
 pub struct ProcessID(pub usize);
 
-#[derive(Clone,Copy,Debug)]
+#[derive(Clone,Debug)]
 pub struct TrustedProcess {
     pub process_type: TrustedProcessType,
     pub id: u64,
@@ -130,7 +131,8 @@ pub struct TrustedProcess {
     pub measurements: ProcessMeasurements,
     #[allow(dead_code)]
     pub context: ProcessContext,
-    //pub channel: MemoryChannel,
+    pub mmap_manager: MmapManager,
+    pub pf_target_vaddr: u64,
 }
 
 impl TrustedProcess {
@@ -179,6 +181,8 @@ impl TrustedProcess {
             base,
             measurements,
             context: ProcessContext::default(),
+            mmap_manager: MmapManager::new(),
+            pf_target_vaddr: 0,
         }
     }
 
@@ -196,6 +200,8 @@ impl TrustedProcess {
             base,
             measurements,
             context,
+            mmap_manager: MmapManager::new(),
+            pf_target_vaddr: 0,
         }
 
     }
@@ -226,6 +232,8 @@ impl TrustedProcess {
             base: ProcessBaseContext::default(),
             measurements: ProcessMeasurements::default(),
             context: ProcessContext::default(),
+            mmap_manager: MmapManager::new(),
+            pf_target_vaddr: 0,
         }
     }
 

kernel/src/process_manager/process.rs

@@ -53,6 +53,9 @@ bitflags! {
         const COPY_ON_WRITE =   1 << 9; // Use this field to mark CoW pages
 
         const NO_EXECUTE =      1 << 63;
+
+        // Special value that indicates to use the flag in the existing entry
+        const FLAG_REUSE = 1 << 10;
     }
 }
 
@@ -572,7 +575,14 @@ impl ProcessPageTableRef {
                 ProcessTableLevelMapping::PTE(table_phys, index) => {
                     let (pte_mapping, pte_table) = paddr_as_table!(table_phys);
                     rmp_adjust(pte_mapping.virt_addr(), RMPFlags::VMPL1 | RMPFlags::RWX , PageSize::Regular).unwrap();
-                    pte_table[index].set(addr, flags);
+                    if flags.contains(ProcessPageFlags::FLAG_REUSE){
+                        // Use the same flags as the existing entry (used for lazy page allocation in the mmaped region)
+                        assert!(flags == ProcessPageFlags::FLAG_REUSE);
+                        let orig_flag = pte_table[index].flags();
+                        pte_table[index].set(addr, orig_flag | ProcessPageFlags::PRESENT);
+                    } else {
+                        pte_table[index].set(addr, flags);
+                    }
                     finished = true;
                 },
                 ProcessTableLevelMapping::PMD(table_phys, index) =>  {