[guest,host,common] removed uneeded entrypoint arg

Removed an uneeded entrypoint argument for the size of the PEB structure, which was a re-use of the ops argument
in dev that is also unused.

+ cleaned up some TODOs (better error messages for unwraps and uneeded host fxn details section).

Signed-off-by: danbugs <[email protected]>

Author: danbugs

src/hyperlight_common/src/outb.rs

@@ -59,8 +59,5 @@ pub fn outb(port: u16, value: u8) {
                 panic!("Tried to call outb in invalid runmode");
             }
         }
-
-        // TODO(danbugs:297): bring back
-        // check_for_host_error();
     }
 }

src/hyperlight_guest/src/entrypoint.rs

@@ -73,13 +73,7 @@ static INIT: Once = Once::new();
 // Note: entrypoint cannot currently have a stackframe >4KB, as that will invoke __chkstk on msvc
 //       target without first having setup global `RUNNING_MODE` variable, which __chkstk relies on.
 #[no_mangle]
-pub extern "win64" fn entrypoint(
-    peb_address: u64,
-    // TODO(danbugs:297): remove the extra arg
-    _: u64,
-    seed: u64,
-    max_log_level: u64,
-) {
+pub extern "win64" fn entrypoint(peb_address: u64, seed: u64, max_log_level: u64) {
     INIT.call_once(|| unsafe {
         PEB = peb_address as *mut HyperlightPEB;
         RUNNING_MODE = (*PEB).clone().run_mode;

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -461,7 +461,6 @@ impl Hypervisor for HypervLinuxDriver {
     fn initialise(
         &mut self,
         hyperlight_peb_guest_memory_region_address: u64,
-        hyperlight_peb_guest_memory_region_size: u64,
         seed: u64,
         outb_hdl: OutBHandlerWrapper,
         mem_access_hdl: MemAccessHandlerWrapper,
@@ -481,9 +480,8 @@ impl Hypervisor for HypervLinuxDriver {
 
             // function args
             rcx: hyperlight_peb_guest_memory_region_address,
-            rdx: hyperlight_peb_guest_memory_region_size,
-            r8: seed,
-            r9: max_guest_log_level,
+            rdx: seed,
+            r8: max_guest_log_level,
 
             ..Default::default()
         };

src/hyperlight_host/src/hypervisor/hypervisor_handler.rs

@@ -182,7 +182,6 @@ struct HvHandlerCommChannels {
 #[derive(Clone)]
 pub(crate) struct HvHandlerConfig {
     pub(crate) hyperlight_peb_guest_memory_region_address: u64,
-    pub(crate) hyperlight_peb_guest_memory_region_size: u64,
     pub(crate) seed: u64,
     pub(crate) max_init_time: Duration,
     pub(crate) max_exec_time: Duration,
@@ -353,7 +352,6 @@ impl HypervisorHandler {
 
                                 let res = hv.initialise(
                                     configuration.hyperlight_peb_guest_memory_region_address,
-                                    configuration.hyperlight_peb_guest_memory_region_size,
                                     configuration.seed,
                                     configuration.outb_handler.clone(),
                                     configuration.mem_access_handler.clone(),
@@ -844,9 +842,10 @@ fn set_up_hypervisor_partition(
 
     let rsp_ptr = GuestPtr::try_from(RawPtr::from(mgr.init_rsp))?;
 
-    // TODO(danbugs:297): change unwrap to proper error handling informing paging isn't set up.
     let pml4_ptr = GuestPtr::try_from(Offset::from(
-        mgr.memory_sections.get_paging_structures_offset().unwrap() as u64,
+        mgr.memory_sections
+            .get_paging_structures_offset()
+            .ok_or("PML4 offset not found")? as u64,
     ))?;
     let entrypoint_ptr = {
         let entrypoint_total_offset = mgr.load_addr.clone() + mgr.entrypoint_offset;

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -404,7 +404,6 @@ impl Hypervisor for KVMDriver {
     fn initialise(
         &mut self,
         hyperlight_peb_guest_memory_region_address: u64,
-        hyperlight_peb_guest_memory_region_size: u64,
         seed: u64,
         outb_hdl: OutBHandlerWrapper,
         mem_access_hdl: MemAccessHandlerWrapper,
@@ -423,9 +422,8 @@ impl Hypervisor for KVMDriver {
 
             // function args
             rcx: hyperlight_peb_guest_memory_region_address,
-            rdx: hyperlight_peb_guest_memory_region_size,
-            r8: seed,
-            r9: max_guest_log_level,
+            rdx: seed,
+            r8: max_guest_log_level,
 
             ..Default::default()
         };

src/hyperlight_host/src/hypervisor/mod.rs

@@ -127,7 +127,6 @@ pub(crate) trait Hypervisor: Debug + Sync + Send {
     fn initialise(
         &mut self,
         hyperlight_peb_guest_memory_region_address: u64,
-        hyperlight_peb_guest_memory_region_size: u64,
         seed: u64,
         outb_hdl: OutBHandlerWrapper,
         mem_access_fn: MemAccessHandlerWrapper,

src/hyperlight_host/src/mem/mgr.rs

@@ -139,8 +139,10 @@ where
         let memory_sections = self.memory_sections.clone();
 
         self.shared_mem.with_exclusivity(|shared_mem| {
-            // TODO(danbugs:297): improve error message removing unwrap
-            let pml4_offset = self.memory_sections.get_paging_structures_offset().unwrap();
+            let pml4_offset = self
+                .memory_sections
+                .get_paging_structures_offset()
+                .ok_or("PML4 offset not found")?;
             let pdpt_offset = pml4_offset + PDPT_OFFSET;
             let pd_offset = pml4_offset + PD_OFFSET;
             let pt_offset = pml4_offset + PT_OFFSET;

src/hyperlight_host/src/sandbox/host_funcs.rs

@@ -143,17 +143,6 @@ fn register_host_function_helper(
         .get_host_func_details_mut()
         .sort_host_functions_by_name();
 
-    // TODO(danbugs:297): host function details section is now determined in the guest, so
-    // we can't write these details to memory at this point in time. Regardless, writing this
-    // stuff to memory is pretty pointless, so we can remove this logic.
-    // let buffer: Vec<u8> = self_.get_host_func_details().try_into().map_err(|e| {
-    //     new_error!(
-    //         "Error serializing host function details to flatbuffer: {}",
-    //         e
-    //     )
-    // })?;
-    // mgr.write_buffer_host_function_details(&buffer)?;
-
     Ok(())
 }
 

src/hyperlight_host/src/sandbox/sandbox_builder.rs

@@ -85,13 +85,6 @@ impl SandboxMemorySections {
             .map(|(_, section)| section.host_address.unwrap())
     }
 
-    pub(crate) fn get_hyperlight_peb_size(&self) -> Option<usize> {
-        self.sections
-            .iter()
-            .find(|(_, section)| section.name == DEFAULT_HYPERLIGHT_PEB_SECTION_NAME)
-            .map(|(_, section)| section.page_aligned_size)
-    }
-
     pub(crate) fn get_tmp_stack_section_offset(&self) -> Option<usize> {
         self.sections
             .iter()

src/hyperlight_host/src/sandbox/uninitialized.rs

@@ -84,7 +84,6 @@ impl UninitializedSandbox {
         config: SandboxConfiguration,
         #[cfg(gdb)] debug_info: Option<DebugInfo>,
     ) -> Self {
-        // TODO(danbugs:297): add registering writer function to SandboxBuilder w/ syscalls and whatnot
         Self {
             host_funcs: Arc::new(Mutex::new(HostFuncsWrapper::default())),
             mem_mgr,