Fix issues with using CreateMapViewOfFile with inprocess feature

Also extends timeouts for failing tests

Signed-off-by: Simon Davies <[email protected]>

Author: simongdavies

src/hyperlight_host/src/hypervisor/hypervisor_handler.rs

@@ -871,7 +871,7 @@ fn set_up_hypervisor_partition(
                     leaked_outb_wrapper,
                 })?;
                 Ok(Box::new(hv))
-            } else if #[cfg(feature = "inprocess")]{
+            } else if #[cfg(inprocess)]{
                 // in-process feature, but not debug build
                 log_then_return!("In-process mode is only available on debug-builds");
             } else if #[cfg(debug_assertions)] {
@@ -937,7 +937,7 @@ mod tests {
     use hyperlight_common::flatbuffer_wrappers::function_types::{ParameterValue, ReturnType};
     use hyperlight_testing::simple_guest_as_string;
 
-    use crate::sandbox::WrapperGetter;
+    use crate::sandbox::{SandboxConfiguration, WrapperGetter};
     use crate::sandbox_state::sandbox::EvolvableSandbox;
     use crate::sandbox_state::transition::Noop;
     use crate::HyperlightError::HypervisorHandlerExecutionCancelAttemptOnFinishedExecution;
@@ -950,9 +950,14 @@ mod tests {
         if !is_hypervisor_present() {
             panic!("Panic on create_multi_use_sandbox because no hypervisor is present");
         }
+
+        let mut cfg = SandboxConfiguration::default();
+        cfg.set_max_initialization_time(std::time::Duration::from_secs(5));
+        cfg.set_max_execution_time(std::time::Duration::from_secs(5));
+
         let usbox = UninitializedSandbox::new(
             GuestBinary::FilePath(simple_guest_as_string().expect("Guest Binary Missing")),
-            None,
+            Some(cfg),
             None,
             None,
         )

src/hyperlight_host/src/mem/shared_mem.rs

@@ -27,12 +27,18 @@ use tracing::{instrument, Span};
 use windows::core::PCSTR;
 #[cfg(target_os = "windows")]
 use windows::Win32::Foundation::{CloseHandle, HANDLE, INVALID_HANDLE_VALUE};
+#[cfg(all(target_os = "windows", inprocess))]
+use windows::Win32::System::Memory::FILE_MAP_EXECUTE;
+#[cfg(all(target_os = "windows", not(inprocess)))]
+use windows::Win32::System::Memory::PAGE_READWRITE;
 #[cfg(target_os = "windows")]
 use windows::Win32::System::Memory::{
     CreateFileMappingA, MapViewOfFile, UnmapViewOfFile, VirtualProtect, FILE_MAP_ALL_ACCESS,
-    MEMORY_MAPPED_VIEW_ADDRESS, PAGE_EXECUTE_READWRITE, PAGE_PROTECTION_FLAGS, PAGE_READWRITE,
+    MEMORY_MAPPED_VIEW_ADDRESS, PAGE_EXECUTE_READWRITE, PAGE_NOACCESS, PAGE_PROTECTION_FLAGS,
 };
 
+#[cfg(target_os = "windows")]
+use crate::HyperlightError::MemoryAllocationFailed;
 #[cfg(target_os = "windows")]
 use crate::HyperlightError::{MemoryRequestTooBig, WindowsAPIError};
 use crate::{log_then_return, new_error, Result};
@@ -388,12 +394,6 @@ impl ExclusiveSharedMemory {
     #[cfg(target_os = "windows")]
     #[instrument(skip_all, parent = Span::current(), level= "Trace")]
     pub fn new(min_size_bytes: usize) -> Result<Self> {
-        #[cfg(inprocess)]
-        use windows::Win32::System::Memory::FILE_MAP_EXECUTE;
-        use windows::Win32::System::Memory::{PAGE_NOACCESS, PAGE_PROTECTION_FLAGS};
-
-        use crate::HyperlightError::MemoryAllocationFailed;
-
         if min_size_bytes == 0 {
             return Err(new_error!("Cannot create shared memory with size 0"));
         }
@@ -425,6 +425,7 @@ impl ExclusiveSharedMemory {
 
         // Allocate the memory use CreateFileMapping instead of VirtualAlloc
         // This allows us to map the memory into the surrogate process using MapViewOfFile2
+        #[cfg(not(inprocess))]
         let handle = unsafe {
             CreateFileMappingA(
                 INVALID_HANDLE_VALUE,
@@ -437,10 +438,24 @@ impl ExclusiveSharedMemory {
         };
 
         #[cfg(inprocess)]
-        let addr =
-            unsafe { MapViewOfFile(handle, FILE_MAP_ALL_ACCESS | FILE_MAP_EXECUTE, 0, 0, 0) };
+        let handle = unsafe {
+            CreateFileMappingA(
+                INVALID_HANDLE_VALUE,
+                None,
+                PAGE_EXECUTE_READWRITE,
+                dwmaximumsizehigh,
+                dwmaximumsizelow,
+                PCSTR::null(),
+            )?
+        };
+
         #[cfg(not(inprocess))]
         let addr = unsafe { MapViewOfFile(handle, FILE_MAP_ALL_ACCESS, 0, 0, 0) };
+
+        #[cfg(inprocess)]
+        let addr =
+            unsafe { MapViewOfFile(handle, FILE_MAP_ALL_ACCESS | FILE_MAP_EXECUTE, 0, 0, 0) };
+
         if addr.Value.is_null() {
             log_then_return!(MemoryAllocationFailed(
                 Error::last_os_error().raw_os_error()