Dont pass hv to outb_handler

Signed-off-by: Ludvig Liljenberg <[email protected]>

Author: ludfjig

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -585,7 +585,16 @@ impl Hypervisor for HypervLinuxDriver {
         padded[..copy_len].copy_from_slice(&data[..copy_len]);
         let val = u32::from_le_bytes(padded);
 
-        handle_outb(mem_mgr, host_funcs, port, val, self)?;
+        #[cfg(feature = "mem_profile")]
+        {
+            let regs = self.regs()?;
+            let trace_info = self.trace_info_mut();
+            handle_outb(mem_mgr, host_funcs, port, val, &regs, trace_info)?;
+        }
+        #[cfg(not(feature = "mem_profile"))]
+        {
+            handle_outb(mem_mgr, host_funcs, port, val)?;
+        }
 
         // update rip
         self.vcpu_fd.set_reg(&[hv_register_assoc {

src/hyperlight_host/src/hypervisor/hyperv_windows.rs

@@ -502,7 +502,16 @@ impl Hypervisor for HypervWindowsDriver {
         padded[..copy_len].copy_from_slice(&data[..copy_len]);
         let val = u32::from_le_bytes(padded);
 
-        handle_outb(mem_mgr, host_funcs, port, val, self)?;
+        #[cfg(feature = "mem_profile")]
+        {
+            let regs = self.regs()?;
+            let trace_info = self.trace_info_mut();
+            handle_outb(mem_mgr, host_funcs, port, val, &regs, trace_info)?;
+        }
+        #[cfg(not(feature = "mem_profile"))]
+        {
+            handle_outb(mem_mgr, host_funcs, port, val)?;
+        }
 
         let mut regs = self.regs()?;
         regs.rip = rip + instruction_length;

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -578,7 +578,16 @@ impl Hypervisor for KVMDriver {
             padded[..copy_len].copy_from_slice(&data[..copy_len]);
             let value = u32::from_le_bytes(padded);
 
-            handle_outb(mem_mgr, host_funcs, port, value, self)?;
+            #[cfg(feature = "mem_profile")]
+            {
+                let regs = self.regs()?;
+                let trace_info = self.trace_info_mut();
+                handle_outb(mem_mgr, host_funcs, port, value, &regs, trace_info)?;
+            }
+            #[cfg(not(feature = "mem_profile"))]
+            {
+                handle_outb(mem_mgr, host_funcs, port, value)?;
+            }
         }
 
         Ok(())

src/hyperlight_host/src/sandbox/outb.rs

@@ -25,9 +25,12 @@ use tracing::{Span, instrument};
 use tracing_log::format_trace;
 
 use super::host_funcs::FunctionRegistry;
-use crate::hypervisor::Hypervisor;
+#[cfg(feature = "mem_profile")]
+use crate::hypervisor::regs::CommonRegisters;
 use crate::mem::mgr::SandboxMemoryManager;
 use crate::mem::shared_mem::HostSharedMemory;
+#[cfg(feature = "mem_profile")]
+use crate::sandbox::trace::MemTraceInfo;
 use crate::{HyperlightError, Result, new_error};
 
 #[instrument(err(Debug), skip_all, parent = Span::current(), level="Trace")]
@@ -149,7 +152,8 @@ pub(crate) fn handle_outb(
     host_funcs: &Arc<Mutex<FunctionRegistry>>,
     port: u16,
     data: u32,
-    _hv: &mut dyn Hypervisor,
+    #[cfg(feature = "mem_profile")] regs: &CommonRegisters,
+    #[cfg(feature = "mem_profile")] trace_info: &mut MemTraceInfo,
 ) -> Result<()> {
     match port.try_into()? {
         OutBAction::Log => outb_log(mem_mgr),
@@ -184,17 +188,9 @@ pub(crate) fn handle_outb(
         #[cfg(feature = "trace_guest")]
         OutBAction::TraceBatch => Ok(()),
         #[cfg(feature = "mem_profile")]
-        OutBAction::TraceMemoryAlloc => {
-            let regs = _hv.regs()?;
-            let trace_info = _hv.trace_info_mut();
-            trace_info.handle_trace_mem_alloc(&regs, mem_mgr)
-        }
+        OutBAction::TraceMemoryAlloc => trace_info.handle_trace_mem_alloc(regs, mem_mgr),
         #[cfg(feature = "mem_profile")]
-        OutBAction::TraceMemoryFree => {
-            let regs = _hv.regs()?;
-            let trace_info = _hv.trace_info_mut();
-            trace_info.handle_trace_mem_free(&regs, mem_mgr)
-        }
+        OutBAction::TraceMemoryFree => trace_info.handle_trace_mem_free(regs, mem_mgr),
     }
 }
 #[cfg(test)]