[trace-host] move mem_profile logic to different file

- Rename TraceInfo to reflect only being used by mem_profile

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

Author: dblnz

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -70,8 +70,8 @@ use crate::mem::shared_mem::HostSharedMemory;
 use crate::sandbox::SandboxConfiguration;
 use crate::sandbox::host_funcs::FunctionRegistry;
 use crate::sandbox::outb::handle_outb;
-#[cfg(feature = "trace_guest")]
-use crate::sandbox::trace::TraceInfo;
+#[cfg(feature = "mem_profile")]
+use crate::sandbox::trace::MemTraceInfo;
 #[cfg(crashdump)]
 use crate::sandbox::uninitialized::SandboxRuntimeConfig;
 use crate::{Result, log_then_return, new_error};
@@ -297,8 +297,8 @@ pub(crate) struct HypervLinuxDriver {
     #[cfg(crashdump)]
     rt_cfg: SandboxRuntimeConfig,
     #[allow(dead_code)]
-    #[cfg(feature = "trace_guest")]
-    trace_info: TraceInfo,
+    #[cfg(feature = "mem_profile")]
+    trace_info: MemTraceInfo,
 }
 
 impl HypervLinuxDriver {
@@ -321,7 +321,7 @@ impl HypervLinuxDriver {
         config: &SandboxConfiguration,
         #[cfg(gdb)] gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
         #[cfg(crashdump)] rt_cfg: SandboxRuntimeConfig,
-        #[cfg(feature = "trace_guest")] trace_info: TraceInfo,
+        #[cfg(feature = "mem_profile")] trace_info: MemTraceInfo,
     ) -> Result<Self> {
         let mshv = Mshv::new()?;
         let pr = Default::default();
@@ -429,7 +429,7 @@ impl HypervLinuxDriver {
             gdb_conn,
             #[cfg(crashdump)]
             rt_cfg,
-            #[cfg(feature = "trace_guest")]
+            #[cfg(feature = "mem_profile")]
             trace_info,
         };
 
@@ -595,7 +595,7 @@ impl Hypervisor for HypervLinuxDriver {
         padded[..copy_len].copy_from_slice(&data[..copy_len]);
         let val = u32::from_le_bytes(padded);
 
-        #[cfg(feature = "trace_guest")]
+        #[cfg(feature = "mem_profile")]
         {
             // We need to handle the borrow checker issue where we need both:
             // - &mut SandboxMemoryManager (from self.mem_mgr)
@@ -616,7 +616,7 @@ impl Hypervisor for HypervLinuxDriver {
             self.mem_mgr = Some(mem_mgr);
         }
 
-        #[cfg(not(feature = "trace_guest"))]
+        #[cfg(not(feature = "mem_profile"))]
         {
             let mem_mgr = self
                 .mem_mgr
@@ -1087,7 +1087,7 @@ impl Hypervisor for HypervLinuxDriver {
     }
 
     #[cfg(feature = "mem_profile")]
-    fn trace_info_mut(&mut self) -> &mut TraceInfo {
+    fn trace_info_mut(&mut self) -> &mut MemTraceInfo {
         &mut self.trace_info
     }
 }
@@ -1178,12 +1178,8 @@ mod tests {
                 #[cfg(crashdump)]
                 guest_core_dump: true,
             },
-            #[cfg(feature = "trace_guest")]
-            TraceInfo::new(
-                #[cfg(feature = "mem_profile")]
-                Arc::new(DummyUnwindInfo {}),
-            )
-            .unwrap(),
+            #[cfg(feature = "mem_profile")]
+            MemTraceInfo::new(Arc::new(DummyUnwindInfo {})).unwrap(),
         )
         .unwrap();
     }

src/hyperlight_host/src/hypervisor/hyperv_windows.rs

@@ -49,10 +49,10 @@ use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::mem::mgr::SandboxMemoryManager;
 use crate::mem::ptr::{GuestPtr, RawPtr};
 use crate::mem::shared_mem::HostSharedMemory;
-#[cfg(feature = "trace_guest")]
-use crate::sandbox::TraceInfo;
 use crate::sandbox::host_funcs::FunctionRegistry;
 use crate::sandbox::outb::handle_outb;
+#[cfg(feature = "mem_profile")]
+use crate::sandbox::trace::MemTraceInfo;
 #[cfg(crashdump)]
 use crate::sandbox::uninitialized::SandboxRuntimeConfig;
 use crate::{Result, debug, log_then_return, new_error};
@@ -274,9 +274,9 @@ pub(crate) struct HypervWindowsDriver {
     gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
     #[cfg(crashdump)]
     rt_cfg: SandboxRuntimeConfig,
-    #[cfg(feature = "trace_guest")]
+    #[cfg(feature = "mem_profile")]
     #[allow(dead_code)]
-    trace_info: TraceInfo,
+    trace_info: MemTraceInfo,
 }
 /* This does not automatically impl Send because the host
  * address of the shared memory region is a raw pointer, which are
@@ -298,7 +298,7 @@ impl HypervWindowsDriver {
         mmap_file_handle: HandleWrapper,
         #[cfg(gdb)] gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
         #[cfg(crashdump)] rt_cfg: SandboxRuntimeConfig,
-        #[cfg(feature = "trace_guest")] trace_info: TraceInfo,
+        #[cfg(feature = "mem_profile")] trace_info: MemTraceInfo,
     ) -> Result<Self> {
         // create and setup hypervisor partition
         let mut partition = VMPartition::new(1)?;
@@ -350,7 +350,7 @@ impl HypervWindowsDriver {
             gdb_conn,
             #[cfg(crashdump)]
             rt_cfg,
-            #[cfg(feature = "trace_guest")]
+            #[cfg(feature = "mem_profile")]
             trace_info,
         };
 
@@ -502,7 +502,7 @@ impl Hypervisor for HypervWindowsDriver {
         padded[..copy_len].copy_from_slice(&data[..copy_len]);
         let val = u32::from_le_bytes(padded);
 
-        #[cfg(feature = "trace_guest")]
+        #[cfg(feature = "mem_profile")]
         {
             // We need to handle the borrow checker issue where we need both:
             // - &mut SandboxMemoryManager (from self.mem_mgr.as_mut())
@@ -523,7 +523,7 @@ impl Hypervisor for HypervWindowsDriver {
             self.mem_mgr = Some(mem_mgr);
         }
 
-        #[cfg(not(feature = "trace_guest"))]
+        #[cfg(not(feature = "mem_profile"))]
         {
             let mem_mgr = self
                 .mem_mgr
@@ -933,7 +933,7 @@ impl Hypervisor for HypervWindowsDriver {
     }
 
     #[cfg(feature = "mem_profile")]
-    fn trace_info_mut(&mut self) -> &mut TraceInfo {
+    fn trace_info_mut(&mut self) -> &mut MemTraceInfo {
         &mut self.trace_info
     }
 }

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -43,8 +43,8 @@ use crate::mem::shared_mem::HostSharedMemory;
 use crate::sandbox::SandboxConfiguration;
 use crate::sandbox::host_funcs::FunctionRegistry;
 use crate::sandbox::outb::handle_outb;
-#[cfg(feature = "trace_guest")]
-use crate::sandbox::trace::TraceInfo;
+#[cfg(feature = "mem_profile")]
+use crate::sandbox::trace::MemTraceInfo;
 #[cfg(crashdump)]
 use crate::sandbox::uninitialized::SandboxRuntimeConfig;
 use crate::{Result, log_then_return, new_error};
@@ -284,9 +284,9 @@ pub(crate) struct KVMDriver {
     gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
     #[cfg(crashdump)]
     rt_cfg: SandboxRuntimeConfig,
-    #[cfg(feature = "trace_guest")]
+    #[cfg(feature = "mem_profile")]
     #[allow(dead_code)]
-    trace_info: TraceInfo,
+    trace_info: MemTraceInfo,
 }
 
 impl KVMDriver {
@@ -304,7 +304,7 @@ impl KVMDriver {
         config: &SandboxConfiguration,
         #[cfg(gdb)] gdb_conn: Option<DebugCommChannel<DebugResponse, DebugMsg>>,
         #[cfg(crashdump)] rt_cfg: SandboxRuntimeConfig,
-        #[cfg(feature = "trace_guest")] trace_info: TraceInfo,
+        #[cfg(feature = "mem_profile")] trace_info: MemTraceInfo,
     ) -> Result<Self> {
         let kvm = Kvm::new()?;
 
@@ -375,7 +375,7 @@ impl KVMDriver {
             gdb_conn,
             #[cfg(crashdump)]
             rt_cfg,
-            #[cfg(feature = "trace_guest")]
+            #[cfg(feature = "mem_profile")]
             trace_info,
         };
 
@@ -572,7 +572,7 @@ impl Hypervisor for KVMDriver {
             padded[..copy_len].copy_from_slice(&data[..copy_len]);
             let value = u32::from_le_bytes(padded);
 
-            #[cfg(feature = "trace_guest")]
+            #[cfg(feature = "mem_profile")]
             {
                 // We need to handle the borrow checker issue where we need both:
                 // - &mut SandboxMemoryManager (from self.mem_mgr.as_mut())
@@ -593,7 +593,7 @@ impl Hypervisor for KVMDriver {
                 self.mem_mgr = Some(mem_mgr);
             }
 
-            #[cfg(not(feature = "trace_guest"))]
+            #[cfg(not(feature = "mem_profile"))]
             {
                 let mem_mgr = self
                     .mem_mgr
@@ -1022,7 +1022,7 @@ impl Hypervisor for KVMDriver {
     }
 
     #[cfg(feature = "mem_profile")]
-    fn trace_info_mut(&mut self) -> &mut TraceInfo {
+    fn trace_info_mut(&mut self) -> &mut MemTraceInfo {
         &mut self.trace_info
     }
 }

src/hyperlight_host/src/hypervisor/mod.rs

@@ -25,7 +25,7 @@ use crate::hypervisor::regs::{
 use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::metrics::METRIC_GUEST_CANCELLATION;
 #[cfg(feature = "mem_profile")]
-use crate::sandbox::trace::TraceInfo;
+use crate::sandbox::trace::MemTraceInfo;
 use crate::{HyperlightError, Result, log_then_return};
 
 /// HyperV-on-linux functionality
@@ -315,7 +315,7 @@ pub(crate) trait Hypervisor: Debug + Send {
 
     /// Get a mutable reference of the trace info for the guest
     #[cfg(feature = "mem_profile")]
-    fn trace_info_mut(&mut self) -> &mut TraceInfo;
+    fn trace_info_mut(&mut self) -> &mut MemTraceInfo;
 }
 
 /// Returns a Some(HyperlightExit::AccessViolation(..)) if the given gpa doesn't have

src/hyperlight_host/src/sandbox/outb.rs

@@ -25,7 +25,7 @@ use tracing::{Span, instrument};
 use tracing_log::format_trace;
 
 use super::host_funcs::FunctionRegistry;
-#[cfg(feature = "trace_guest")]
+#[cfg(feature = "mem_profile")]
 use crate::hypervisor::Hypervisor;
 use crate::mem::mgr::SandboxMemoryManager;
 use crate::mem::shared_mem::HostSharedMemory;
@@ -148,7 +148,7 @@ fn outb_abort(mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>, data: u32) -
 pub(crate) fn handle_outb(
     mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>,
     host_funcs: Arc<Mutex<FunctionRegistry>>,
-    #[cfg(feature = "trace_guest")] _hv: &mut dyn Hypervisor,
+    #[cfg(feature = "mem_profile")] _hv: &mut dyn Hypervisor,
     port: u16,
     data: u32,
 ) -> Result<()> {