Remove Sandbox trait

Signed-off-by: Jorge Prendes <[email protected]>

Author: jprendes

src/hyperlight_host/src/lib.rs

@@ -58,9 +58,6 @@ pub mod metrics;
 /// outside this file. Types from this module needed for public consumption are
 /// re-exported below.
 pub mod sandbox;
-/// `trait`s and other functionality for dealing with defining sandbox
-/// states and moving between them
-pub mod sandbox_state;
 #[cfg(all(feature = "seccomp", target_os = "linux"))]
 pub(crate) mod seccomp;
 /// Signal handling for Linux

src/hyperlight_host/src/sandbox/initialized_multi_use.rs

@@ -42,7 +42,6 @@ use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::mem::ptr::RawPtr;
 use crate::mem::shared_mem::HostSharedMemory;
 use crate::metrics::maybe_time_and_emit_guest_call;
-use crate::sandbox_state::sandbox::Sandbox;
 use crate::{HyperlightError, Result, log_then_return};
 
 /// A sandbox that supports being used Multiple times.
@@ -241,7 +240,7 @@ impl MultiUseSandbox {
                 self.dbg_mem_access_fn.clone(),
             )?;
 
-            self.check_stack_guard()?;
+            self.mem_mgr.check_stack_guard()?;
             check_for_guest_error(self.get_mgr_wrapper_mut())?;
 
             self.get_mgr_wrapper_mut()
@@ -277,12 +276,6 @@ impl WrapperGetter for MultiUseSandbox {
     }
 }
 
-impl Sandbox for MultiUseSandbox {
-    fn check_stack_guard(&self) -> Result<bool> {
-        self.mem_mgr.check_stack_guard()
-    }
-}
-
 impl std::fmt::Debug for MultiUseSandbox {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("MultiUseSandbox")

src/hyperlight_host/src/sandbox/uninitialized.rs

@@ -34,7 +34,7 @@ use crate::mem::memory_region::{DEFAULT_GUEST_BLOB_MEM_FLAGS, MemoryRegionFlags}
 use crate::mem::mgr::{STACK_COOKIE_LEN, SandboxMemoryManager};
 use crate::mem::shared_mem::ExclusiveSharedMemory;
 use crate::sandbox::SandboxConfiguration;
-use crate::{MultiUseSandbox, Result, log_then_return, new_error};
+use crate::{MultiUseSandbox, Result, new_error};
 
 #[cfg(all(target_os = "linux", feature = "seccomp"))]
 const EXTRA_ALLOWED_SYSCALLS_FOR_WRITER_FUNC: &[super::ExtraAllowedSyscall] = &[
@@ -80,18 +80,6 @@ pub struct UninitializedSandbox {
     pub(crate) rt_cfg: SandboxRuntimeConfig,
 }
 
-impl crate::sandbox_state::sandbox::UninitializedSandbox for UninitializedSandbox {
-    #[instrument(skip_all, parent = Span::current(), level = "Trace")]
-    fn get_uninitialized_sandbox(&self) -> &crate::sandbox::UninitializedSandbox {
-        self
-    }
-
-    #[instrument(skip_all, parent = Span::current(), level = "Trace")]
-    fn get_uninitialized_sandbox_mut(&mut self) -> &mut crate::sandbox::UninitializedSandbox {
-        self
-    }
-}
-
 impl Debug for UninitializedSandbox {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("UninitializedSandbox")
@@ -100,14 +88,6 @@ impl Debug for UninitializedSandbox {
     }
 }
 
-impl crate::sandbox_state::sandbox::Sandbox for UninitializedSandbox {
-    fn check_stack_guard(&self) -> Result<bool> {
-        log_then_return!(
-            "Checking the stack cookie before the sandbox is initialized is unsupported"
-        );
-    }
-}
-
 impl UninitializedSandbox {
     /// Evolve `self` to a `MultiUseSandbox` without any additional metadata.
     #[instrument(err(Debug), skip_all, parent = Span::current(), level = "Trace")]

src/hyperlight_host/src/sandbox/uninitialized_evolve.rs

@@ -41,7 +41,6 @@ use crate::sandbox::host_funcs::FunctionRegistry;
 use crate::sandbox::mem_access::mem_access_handler_wrapper;
 use crate::sandbox::outb::outb_handler_wrapper;
 use crate::sandbox::{HostSharedMemory, MemMgrWrapper};
-use crate::sandbox_state::sandbox::Sandbox;
 #[cfg(target_os = "linux")]
 use crate::signal_handlers::setup_signal_handlers;
 use crate::{MultiUseSandbox, Result, UninitializedSandbox, log_then_return, new_error};
@@ -58,7 +57,7 @@ use crate::{MultiUseSandbox, Result, UninitializedSandbox, log_then_return, new_
 /// If this doesn't make sense, and you want to change this type,
 /// please reach out to a Hyperlight developer before making the change.
 #[instrument(err(Debug), skip_all, , parent = Span::current(), level = "Trace")]
-fn evolve_impl<TransformFunc, ResSandbox: Sandbox>(
+fn evolve_impl<TransformFunc, ResSandbox>(
     u_sbox: UninitializedSandbox,
     transform: TransformFunc,
 ) -> Result<ResSandbox>