[hyperlight_host/exe] Allow load() to consume the exe_info

This will be useful in the near future, when it will allow
transforming the exe_info into unwind information without an extra
copy.

Signed-off-by: Lucy Menon <[email protected]>

Author: syntactically

src/hyperlight_host/src/mem/elf.rs

@@ -73,7 +73,7 @@ impl ElfInfo {
             .unwrap();
         (max_phdr.p_vaddr + max_phdr.p_memsz - self.get_base_va()) as usize
     }
-    pub(crate) fn load_at(&self, load_addr: usize, target: &mut [u8]) -> Result<()> {
+    pub(crate) fn load_at(&mut self, load_addr: usize, target: &mut [u8]) -> Result<()> {
         let base_va = self.get_base_va();
         for phdr in self.phdrs.iter().filter(|phdr| phdr.p_type == PT_LOAD) {
             let start_va = (phdr.p_vaddr - base_va) as usize;

src/hyperlight_host/src/mem/exe.rs

@@ -71,9 +71,9 @@ impl ExeInfo {
     // copying into target, but the PE loader chooses to apply
     // relocations in its owned representation of the PE contents,
     // which requires it to be &mut.
-    pub fn load(&mut self, load_addr: usize, target: &mut [u8]) -> Result<()> {
+    pub fn load(self, load_addr: usize, target: &mut [u8]) -> Result<()> {
         match self {
-            ExeInfo::Elf(elf) => {
+            ExeInfo::Elf(mut elf) => {
                 elf.load_at(load_addr, target)?;
             }
         }

src/hyperlight_host/src/mem/mgr.rs

@@ -311,7 +311,7 @@ impl SandboxMemoryManager<ExclusiveSharedMemory> {
     #[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
     pub(crate) fn load_guest_binary_into_memory(
         cfg: SandboxConfiguration,
-        exe_info: &mut ExeInfo,
+        exe_info: ExeInfo,
         guest_blob: Option<&GuestBlob>,
     ) -> Result<Self> {
         let guest_blob_size = guest_blob.map(|b| b.data.len()).unwrap_or(0);
@@ -320,8 +320,8 @@ impl SandboxMemoryManager<ExclusiveSharedMemory> {
         let layout = SandboxMemoryLayout::new(
             cfg,
             exe_info.loaded_size(),
-            usize::try_from(cfg.get_stack_size(exe_info))?,
-            usize::try_from(cfg.get_heap_size(exe_info))?,
+            usize::try_from(cfg.get_stack_size(&exe_info))?,
+            usize::try_from(cfg.get_heap_size(&exe_info))?,
             guest_blob_size,
             guest_blob_mem_flags,
         )?;

src/hyperlight_host/src/sandbox/outb.rs

@@ -246,13 +246,10 @@ mod tests {
         let sandbox_cfg = SandboxConfiguration::default();
 
         let new_mgr = || {
-            let mut exe_info = simple_guest_exe_info().unwrap();
-            let mut mgr = SandboxMemoryManager::load_guest_binary_into_memory(
-                sandbox_cfg,
-                &mut exe_info,
-                None,
-            )
-            .unwrap();
+            let exe_info = simple_guest_exe_info().unwrap();
+            let mut mgr =
+                SandboxMemoryManager::load_guest_binary_into_memory(sandbox_cfg, exe_info, None)
+                    .unwrap();
             let mem_size = mgr.get_shared_mem_mut().mem_size();
             let layout = mgr.layout;
             let shared_mem = mgr.get_shared_mem_mut();
@@ -361,10 +358,10 @@ mod tests {
         let sandbox_cfg = SandboxConfiguration::default();
         tracing::subscriber::with_default(subscriber.clone(), || {
             let new_mgr = || {
-                let mut exe_info = simple_guest_exe_info().unwrap();
+                let exe_info = simple_guest_exe_info().unwrap();
                 let mut mgr = SandboxMemoryManager::load_guest_binary_into_memory(
                     sandbox_cfg,
-                    &mut exe_info,
+                    exe_info,
                     None,
                 )
                 .unwrap();

src/hyperlight_host/src/sandbox/uninitialized.rs

@@ -281,12 +281,12 @@ impl UninitializedSandbox {
         guest_binary: &GuestBinary,
         guest_blob: Option<&GuestBlob>,
     ) -> Result<SandboxMemoryManager<ExclusiveSharedMemory>> {
-        let mut exe_info = match guest_binary {
+        let exe_info = match guest_binary {
             GuestBinary::FilePath(bin_path_str) => ExeInfo::from_file(bin_path_str)?,
             GuestBinary::Buffer(buffer) => ExeInfo::from_buf(buffer)?,
         };
 
-        SandboxMemoryManager::load_guest_binary_into_memory(cfg, &mut exe_info, guest_blob)
+        SandboxMemoryManager::load_guest_binary_into_memory(cfg, exe_info, guest_blob)
     }
 
     /// Set the max log level to be used by the guest.