crashdump: add SandboxMetadata field that store relevant data about the sandbox

- only store the binary path for now

Signed-off-by: Doru Blânzeanu <[email protected]>

Author: dblnz

src/hyperlight_host/src/hypervisor/crashdump.rs

@@ -47,6 +47,8 @@ pub(crate) struct CrashDumpContext<'a> {
     regs: [u64; 27],
     xsave: Vec<u8>,
     entry: u64,
+    binary: Option<String>,
+    filename: Option<String>,
 }
 
 impl<'a> CrashDumpContext<'a> {
@@ -55,12 +57,16 @@ impl<'a> CrashDumpContext<'a> {
         regs: [u64; 27],
         xsave: Vec<u8>,
         entry: u64,
+        binary: Option<String>,
+        filename: Option<String>,
     ) -> Self {
         Self {
             regions,
             regs,
             xsave,
             entry,
+            binary,
+            filename,
         }
     }
 }
@@ -94,6 +100,17 @@ impl GuestView {
             })
             .collect();
 
+        // The filename and command line are set to null-terminated strings
+        let filename = ctx
+            .filename
+            .clone()
+            .map_or_else(|| "\0".to_string(), |s| format!("{}\0", s));
+
+        let cmd = ctx
+            .binary
+            .clone()
+            .map_or_else(|| "\0".to_string(), |s| format!("{}\0", s));
+
         // The xsave state is checked as it can be empty
         let mut components = vec![];
         if !ctx.xsave.is_empty() {
@@ -113,7 +130,7 @@ impl GuestView {
             tid: 1,
             uid: 0, // User ID
             gid: 0, // Group ID
-            comm: "\0".to_string(),
+            comm: filename,
             ppid: 0,    // Parent PID
             pgrp: 0,    // Process group ID
             nice: 0,    // Nice value
@@ -126,7 +143,7 @@ impl GuestView {
             session: 0, // Session ID of the process
             sighold: 0, // Blocked signal
             sigpend: 0, // Pending signal
-            cmd_line: "\0".to_string(),
+            cmd_line: cmd,
 
             arch_state: Box::new(ArchState {
                 gpr_state: ctx.regs.to_vec(),

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -48,9 +48,9 @@ use mshv_bindings::{
 };
 use mshv_ioctls::{Mshv, VcpuFd, VmFd};
 use tracing::{instrument, Span};
-
 #[cfg(crashdump)]
-use super::crashdump;
+use {super::crashdump, crate::sandbox::uninitialized::SandboxMetadata, std::path::Path};
+
 use super::fpu::{FP_CONTROL_WORD_DEFAULT, FP_TAG_WORD_DEFAULT, MXCSR_DEFAULT};
 #[cfg(gdb)]
 use super::gdb::{DebugCommChannel, DebugMsg, DebugResponse, GuestDebug, MshvDebug};
@@ -300,6 +300,8 @@ pub(super) struct HypervLinuxDriver {
     debug: Option<MshvDebug>,
     #[cfg(gdb)]
     gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
+    #[cfg(crashdump)]
+    metadata: SandboxMetadata,
 }
 
 impl HypervLinuxDriver {
@@ -318,6 +320,7 @@ impl HypervLinuxDriver {
         rsp_ptr: GuestPtr,
         pml4_ptr: GuestPtr,
         #[cfg(gdb)] gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
+        #[cfg(crashdump)] metadata: SandboxMetadata,
     ) -> Result<Self> {
         let mshv = Mshv::new()?;
         let pr = Default::default();
@@ -397,6 +400,8 @@ impl HypervLinuxDriver {
             debug,
             #[cfg(gdb)]
             gdb_conn,
+            #[cfg(crashdump)]
+            metadata,
         })
     }
 
@@ -717,11 +722,20 @@ impl Hypervisor for HypervLinuxDriver {
         regs[25] = sregs.fs.selector as u64; // fs
         regs[26] = sregs.gs.selector as u64; // gs
 
+        // Get the filename from the binary path
+        let filename = self.metadata.binary_path.clone().and_then(|path| {
+            Path::new(&path)
+                .file_name()
+                .and_then(|name| name.to_os_string().into_string().ok())
+        });
+
         Ok(crashdump::CrashDumpContext::new(
             &self.mem_regions,
             regs,
             xsave.buffer.to_vec(),
             self.entrypoint,
+            self.metadata.binary_path.clone(),
+            filename,
         ))
     }
 
@@ -842,6 +856,8 @@ mod tests {
             pml4_ptr,
             #[cfg(gdb)]
             None,
+            #[cfg(crashdump)]
+            SandboxMetadata { binary_path: None },
         )
         .unwrap();
     }

src/hyperlight_host/src/hypervisor/hyperv_windows.rs

@@ -27,9 +27,9 @@ use windows::Win32::System::Hypervisor::{
     WHV_MEMORY_ACCESS_TYPE, WHV_PARTITION_HANDLE, WHV_REGISTER_VALUE, WHV_RUN_VP_EXIT_CONTEXT,
     WHV_RUN_VP_EXIT_REASON, WHV_X64_SEGMENT_REGISTER, WHV_X64_SEGMENT_REGISTER_0,
 };
-
 #[cfg(crashdump)]
-use super::crashdump;
+use {super::crashdump, crate::sandbox::uninitialized::SandboxMetadata, std::path::Path};
+
 use super::fpu::{FP_TAG_WORD_DEFAULT, MXCSR_DEFAULT};
 #[cfg(gdb)]
 use super::handlers::DbgMemAccessHandlerWrapper;
@@ -58,6 +58,8 @@ pub(crate) struct HypervWindowsDriver {
     entrypoint: u64,
     orig_rsp: GuestPtr,
     mem_regions: Vec<MemoryRegion>,
+    #[cfg(crashdump)]
+    metadata: SandboxMetadata,
 }
 /* This does not automatically impl Send/Sync because the host
  * address of the shared memory region is a raw pointer, which are
@@ -68,6 +70,7 @@ unsafe impl Send for HypervWindowsDriver {}
 unsafe impl Sync for HypervWindowsDriver {}
 
 impl HypervWindowsDriver {
+    #[allow(clippy::too_many_arguments)]
     #[instrument(err(Debug), skip_all, parent = Span::current(), level = "Trace")]
     pub(crate) fn new(
         mem_regions: Vec<MemoryRegion>,
@@ -77,6 +80,7 @@ impl HypervWindowsDriver {
         entrypoint: u64,
         rsp: u64,
         mmap_file_handle: HandleWrapper,
+        #[cfg(crashdump)] metadata: SandboxMetadata,
     ) -> Result<Self> {
         // create and setup hypervisor partition
         let mut partition = VMPartition::new(1)?;
@@ -104,6 +108,8 @@ impl HypervWindowsDriver {
             entrypoint,
             orig_rsp: GuestPtr::try_from(RawPtr::from(rsp))?,
             mem_regions,
+            #[cfg(crashdump)]
+            metadata,
         })
     }
 
@@ -529,11 +535,20 @@ impl Hypervisor for HypervWindowsDriver {
         regs[25] = unsafe { sregs.fs.Segment.Selector } as u64; // fs
         regs[26] = unsafe { sregs.gs.Segment.Selector } as u64; // gs
 
+        // Get the filename from the metadata
+        let filename = self.metadata.binary_path.clone().and_then(|path| {
+            Path::new(&path)
+                .file_name()
+                .and_then(|name| name.to_os_string().into_string().ok())
+        });
+
         Ok(crashdump::CrashDumpContext::new(
             &self.mem_regions,
             regs,
             xsave,
             self.entrypoint,
+            self.metadata.binary_path.clone(),
+            filename,
         ))
     }
 }

src/hyperlight_host/src/hypervisor/hypervisor_handler.rs

@@ -51,6 +51,8 @@ use crate::mem::shared_mem::{GuestSharedMemory, HostSharedMemory, SharedMemory};
 #[cfg(gdb)]
 use crate::sandbox::config::DebugInfo;
 use crate::sandbox::hypervisor::{get_available_hypervisor, HypervisorType};
+#[cfg(crashdump)]
+use crate::sandbox::uninitialized::SandboxMetadata;
 #[cfg(target_os = "linux")]
 use crate::signal_handlers::setup_signal_handlers;
 use crate::HyperlightError::{
@@ -238,6 +240,7 @@ impl HypervisorHandler {
         &mut self,
         sandbox_memory_manager: SandboxMemoryManager<GuestSharedMemory>,
         #[cfg(gdb)] debug_info: Option<DebugInfo>,
+        #[cfg(crashdump)] metadata: SandboxMetadata,
     ) -> Result<()> {
         let configuration = self.configuration.clone();
 
@@ -301,6 +304,8 @@ impl HypervisorHandler {
                                         execution_variables.shm.try_lock().map_err(|e| new_error!("Failed to lock shm: {}", e))?.deref_mut().as_mut().ok_or_else(|| new_error!("shm not set"))?,
                                         #[cfg(gdb)]
                                         &debug_info,
+                                        #[cfg(crashdump)]
+                                        &metadata,
                                     )?);
                                 }
                                 let hv = hv.as_mut().ok_or_else(|| new_error!("Hypervisor not set"))?;
@@ -822,6 +827,7 @@ pub enum HandlerMsg {
 fn set_up_hypervisor_partition(
     mgr: &mut SandboxMemoryManager<GuestSharedMemory>,
     #[cfg(gdb)] debug_info: &Option<DebugInfo>,
+    #[cfg(crashdump)] metadata: &SandboxMetadata,
 ) -> Result<Box<dyn Hypervisor>> {
     let mem_size = u64::try_from(mgr.shared_mem.mem_size())?;
     let mut regions = mgr.layout.get_memory_regions(&mgr.shared_mem)?;
@@ -884,6 +890,8 @@ fn set_up_hypervisor_partition(
                 pml4_ptr,
                 #[cfg(gdb)]
                 gdb_conn,
+                #[cfg(crashdump)]
+                metadata.clone(),
             )?;
             Ok(Box::new(hv))
         }
@@ -897,6 +905,8 @@ fn set_up_hypervisor_partition(
                 rsp_ptr.absolute()?,
                 #[cfg(gdb)]
                 gdb_conn,
+                #[cfg(crashdump)]
+                metadata.clone(),
             )?;
             Ok(Box::new(hv))
         }
@@ -914,6 +924,8 @@ fn set_up_hypervisor_partition(
                 entrypoint_ptr.absolute()?,
                 rsp_ptr.absolute()?,
                 HandleWrapper::from(mmap_file_handle),
+                #[cfg(crashdump)]
+                metadata.clone(),
             )?;
             Ok(Box::new(hv))
         }

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -24,9 +24,9 @@ use kvm_ioctls::Cap::UserMemory;
 use kvm_ioctls::{Kvm, VcpuExit, VcpuFd, VmFd};
 use log::LevelFilter;
 use tracing::{instrument, Span};
-
 #[cfg(crashdump)]
-use super::crashdump;
+use {super::crashdump, crate::sandbox::uninitialized::SandboxMetadata, std::path::Path};
+
 use super::fpu::{FP_CONTROL_WORD_DEFAULT, FP_TAG_WORD_DEFAULT, MXCSR_DEFAULT};
 #[cfg(gdb)]
 use super::gdb::{DebugCommChannel, DebugMsg, DebugResponse, GuestDebug, KvmDebug, VcpuStopReason};
@@ -288,6 +288,8 @@ pub(super) struct KVMDriver {
     debug: Option<KvmDebug>,
     #[cfg(gdb)]
     gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
+    #[cfg(crashdump)]
+    metadata: SandboxMetadata,
 }
 
 impl KVMDriver {
@@ -301,6 +303,7 @@ impl KVMDriver {
         entrypoint: u64,
         rsp: u64,
         #[cfg(gdb)] gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
+        #[cfg(crashdump)] metadata: SandboxMetadata,
     ) -> Result<Self> {
         let kvm = Kvm::new()?;
 
@@ -352,6 +355,8 @@ impl KVMDriver {
             debug,
             #[cfg(gdb)]
             gdb_conn,
+            #[cfg(crashdump)]
+            metadata,
         };
 
         Ok(ret)
@@ -625,6 +630,13 @@ impl Hypervisor for KVMDriver {
         regs[25] = sregs.fs.selector as u64; // fs
         regs[26] = sregs.gs.selector as u64; // gs
 
+        // Get the filename from the metadata
+        let filename = self.metadata.binary_path.clone().and_then(|path| {
+            Path::new(&path)
+                .file_name()
+                .and_then(|name| name.to_os_string().into_string().ok())
+        });
+
         // The [`CrashDumpContext`] accepts xsave as a vector of u8, so we need to convert the
         // xsave region to a vector of u8
         Ok(crashdump::CrashDumpContext::new(
@@ -637,6 +649,8 @@ impl Hypervisor for KVMDriver {
                 acc
             }),
             self.entrypoint,
+            self.metadata.binary_path.clone(),
+            filename,
         ))
     }
 

src/hyperlight_host/src/hypervisor/mod.rs

@@ -347,6 +347,8 @@ pub(crate) mod tests {
     };
     use crate::mem::ptr::RawPtr;
     use crate::sandbox::uninitialized::GuestBinary;
+    #[cfg(crashdump)]
+    use crate::sandbox::uninitialized::SandboxMetadata;
     use crate::sandbox::{SandboxConfiguration, UninitializedSandbox};
     use crate::{new_error, Result};
 
@@ -407,6 +409,8 @@ pub(crate) mod tests {
             gshm,
             #[cfg(gdb)]
             None,
+            #[cfg(crashdump)]
+            SandboxMetadata { binary_path: None },
         )?;
 
         hv_handler.execute_hypervisor_handler_action(HypervisorHandlerAction::Initialise)

src/hyperlight_host/src/sandbox/uninitialized.rs

@@ -55,6 +55,12 @@ const EXTRA_ALLOWED_SYSCALLS_FOR_WRITER_FUNC: &[super::ExtraAllowedSyscall] = &[
     libc::SYS_close,
 ];
 
+#[cfg(crashdump)]
+#[derive(Clone, Debug, Default)]
+pub(crate) struct SandboxMetadata {
+    pub(crate) binary_path: Option<String>,
+}
+
 /// A preliminary `Sandbox`, not yet ready to execute guest code.
 ///
 /// Prior to initializing a full-fledged `Sandbox`, you must create one of
@@ -73,6 +79,8 @@ pub struct UninitializedSandbox {
     pub(crate) max_guest_log_level: Option<LevelFilter>,
     #[cfg(gdb)]
     pub(crate) debug_info: Option<DebugInfo>,
+    #[cfg(crashdump)]
+    pub(crate) metadata: SandboxMetadata,
 }
 
 impl crate::sandbox_state::sandbox::UninitializedSandbox for UninitializedSandbox {
@@ -153,15 +161,25 @@ impl UninitializedSandbox {
                 let path = Path::new(&binary_path)
                     .canonicalize()
                     .map_err(|e| new_error!("GuestBinary not found: '{}': {}", binary_path, e))?;
-                GuestBinary::FilePath(
-                    path.into_os_string()
-                        .into_string()
-                        .map_err(|e| new_error!("Error converting OsString to String: {:?}", e))?,
-                )
+                let path = path
+                    .into_os_string()
+                    .into_string()
+                    .map_err(|e| new_error!("Error converting OsString to String: {:?}", e))?;
+
+                GuestBinary::FilePath(path)
             }
             buffer @ GuestBinary::Buffer(_) => buffer,
         };
 
+        #[cfg(crashdump)]
+        let metadata = if let GuestBinary::FilePath(ref path) = guest_binary {
+            SandboxMetadata {
+                binary_path: Some(path.clone()),
+            }
+        } else {
+            SandboxMetadata::default()
+        };
+
         let sandbox_cfg = cfg.unwrap_or_default();
 
         #[cfg(gdb)]
@@ -190,6 +208,8 @@ impl UninitializedSandbox {
             max_guest_log_level: None,
             #[cfg(gdb)]
             debug_info,
+            #[cfg(crashdump)]
+            metadata,
         };
 
         // If we were passed a writer for host print register it otherwise use the default.