tool: Support vspace and cnode extra cap maps

Signed-off-by: Krishnan Winter <krishnan.winter@unsw.edu.au>

Author: Kswin01

tool/microkit/src/capdl/builder.rs

@@ -580,11 +580,14 @@ pub fn build_capdl_spec(
         let pd_vspace_obj_id = capdl_util_get_vspace_id_from_tcb_id(&spec_container, pd_tcb_obj_id);
 
         let pd_tcb_obj = capdl_util_make_tcb_cap(pd_tcb_obj_id);
+        let pd_vspace_obj = capdl_util_make_page_table_cap(pd_vspace_obj_id);
 
         pd_shadow_cspace
             .entry(pd_global_idx)
             .or_insert_with(|| vec![None; CapMapType::__Len as usize])[CapMapType::Tcb as usize] =
             Some(pd_tcb_obj.clone());
+        pd_shadow_cspace.get_mut(&pd_global_idx).unwrap()[CapMapType::Vspace as usize] =
+            Some(pd_vspace_obj.clone());
 
         // In the benchmark configuration, we allow PDs to access their own TCB.
         // This is necessary for accessing kernel's benchmark API.
@@ -596,7 +599,7 @@ pub fn build_capdl_spec(
         // Allow PD to access their own VSpace for ops such as cache cleaning on ARM.
         caps_to_insert_to_pd_cspace.push(capdl_util_make_cte(
             PD_VSPACE_CAP_IDX as u32,
-            capdl_util_make_page_table_cap(pd_vspace_obj_id),
+            pd_vspace_obj,
         ));
 
         // Step 3-2: Map in all Memory Regions
@@ -995,6 +998,8 @@ pub fn build_capdl_spec(
         );
         let pd_guard_size = kernel_config.cap_address_bits - PD_CAP_BITS as u64;
         let pd_cnode_cap = capdl_util_make_cnode_cap(pd_cnode_obj_id, 0, pd_guard_size as u8);
+        pd_shadow_cspace.get_mut(&pd_global_idx).unwrap()[CapMapType::Cnode as usize] =
+            Some(pd_cnode_cap.clone());
         caps_to_bind_to_tcb.push(capdl_util_make_cte(
             TcbBoundSlot::CSpace as u32,
             pd_cnode_cap,

tool/microkit/src/sdf.rs

@@ -280,6 +280,8 @@ pub struct ProtectionDomain {
 pub enum CapMapType {
     Tcb = 0,
     Sc,
+    Vspace,
+    Cnode,
     __Len,
 }
 
@@ -1241,6 +1243,8 @@ impl CapMap {
         let cap_type = match checked_lookup(xml_sdf, node, "type")? {
             "tcb" => CapMapType::Tcb,
             "sc" => CapMapType::Sc,
+            "vspace" => CapMapType::Vspace,
+            "cnode" => CapMapType::Cnode,
             _ => {
                 return Err(value_error(
                     xml_sdf,
@@ -1952,6 +1956,8 @@ pub fn parse(filename: &str, xml: &str, config: &Config) -> Result<SystemDescrip
         let mut user_cap_slots = Vec::new();
         let mut user_tcb_names = Vec::new();
         let mut user_sc_names = Vec::new();
+        let mut user_vspace_names = Vec::new();
+        let mut user_cnode_names = Vec::new();
 
         for cap_map in pd.cap_maps.iter() {
             if user_cap_slots.contains(&cap_map.dest_cspace_slot) {
@@ -1981,6 +1987,24 @@ pub fn parse(filename: &str, xml: &str, config: &Config) -> Result<SystemDescrip
                 } else {
                     user_sc_names.push(cap_map.pd_name.clone());
                 }
+            } else if cap_map.cap_type == CapMapType::Vspace {
+                if user_vspace_names.contains(&cap_map.pd_name) {
+                    return Err(format!(
+                        "Error: Duplicate vspace cap mapping. Src PD: '{}', dest PD: '{}'",
+                        cap_map.pd_name, pd.name
+                    ));
+                } else {
+                    user_vspace_names.push(cap_map.pd_name.clone());
+                }
+            } else if cap_map.cap_type == CapMapType::Cnode {
+                if user_cnode_names.contains(&cap_map.pd_name) {
+                    return Err(format!(
+                        "Error: Duplicate cnode cap mapping. Src PD: '{}', dest PD: '{}'",
+                        cap_map.pd_name, pd.name
+                    ));
+                } else {
+                    user_cnode_names.push(cap_map.pd_name.clone());
+                }
             }
         }
     }