Skip to content

Deduplicate mem mgr and host functions from hv drivers #1013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+71 −220
Open

Deduplicate mem mgr and host functions from hv drivers #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3dc80d
Remove mem_mgr and host_func from drivers struct
ludfjig Nov 20, 2025
b368621
Remove Hypervisor::check_stack_guard and handle_trace
ludfjig Nov 20, 2025
a165f74
Cargo fmt
ludfjig Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 11 additions & 62 deletions src/hyperlight_host/src/hypervisor/hyperv_linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,6 @@ pub(crate) struct HypervLinuxDriver {
orig_rsp: GuestPtr,
entrypoint: u64,
interrupt_handle: Arc<dyn InterruptHandleImpl>,
mem_mgr: Option<SandboxMemoryManager<HostSharedMemory>>,
host_funcs: Option<Arc<Mutex<FunctionRegistry>>>,

sandbox_regions: Vec<MemoryRegion>, // Initially mapped regions when sandbox is created
mmap_regions: Vec<MemoryRegion>, // Later mapped regions
Expand Down Expand Up @@ -405,8 +403,6 @@ impl HypervLinuxDriver {
entrypoint: entrypoint_ptr.absolute()?,
orig_rsp: rsp_ptr,
interrupt_handle: interrupt_handle.clone(),
mem_mgr: None,
host_funcs: None,
#[cfg(gdb)]
debug,
#[cfg(gdb)]
Expand Down Expand Up @@ -467,13 +463,11 @@ impl Hypervisor for HypervLinuxDriver {
peb_addr: RawPtr,
seed: u64,
page_size: u32,
mem_mgr: SandboxMemoryManager<HostSharedMemory>,
host_funcs: Arc<Mutex<FunctionRegistry>>,
mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>,
host_funcs: &Arc<Mutex<FunctionRegistry>>,
max_guest_log_level: Option<LevelFilter>,
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
) -> Result<()> {
self.mem_mgr = Some(mem_mgr);
self.host_funcs = Some(host_funcs);
self.page_size = page_size as usize;

let max_guest_log_level: u64 = match max_guest_log_level {
Expand Down Expand Up @@ -501,6 +495,8 @@ impl Hypervisor for HypervLinuxDriver {
VirtualCPU::run(
self.as_mut_hypervisor(),
interrupt_handle,
mem_mgr,
host_funcs,
#[cfg(gdb)]
dbg_mem_access_fn,
)
Expand Down Expand Up @@ -545,6 +541,8 @@ impl Hypervisor for HypervLinuxDriver {
fn dispatch_call_from_host(
&mut self,
dispatch_func_addr: RawPtr,
mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>,
host_funcs: &Arc<Mutex<FunctionRegistry>>,
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
) -> Result<()> {
// Reset general purpose registers, then set RIP and RSP
Expand All @@ -565,6 +563,8 @@ impl Hypervisor for HypervLinuxDriver {
VirtualCPU::run(
self.as_mut_hypervisor(),
interrupt_handle,
mem_mgr,
host_funcs,
#[cfg(gdb)]
dbg_mem_access_fn,
)
Expand All @@ -577,47 +577,15 @@ impl Hypervisor for HypervLinuxDriver {
data: Vec<u8>,
rip: u64,
instruction_length: u64,
mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>,
host_funcs: &Arc<Mutex<FunctionRegistry>>,
) -> Result<()> {
let mut padded = [0u8; 4];
let copy_len = data.len().min(4);
padded[..copy_len].copy_from_slice(&data[..copy_len]);
let val = u32::from_le_bytes(padded);

#[cfg(feature = "mem_profile")]
{
// We need to handle the borrow checker issue where we need both:
// - &mut SandboxMemoryManager (from self.mem_mgr)
// - &mut dyn Hypervisor (from self)
// We'll use a temporary approach to extract the mem_mgr temporarily
let mem_mgr_option = self.mem_mgr.take();
let mut mem_mgr = mem_mgr_option
.ok_or_else(|| new_error!("mem_mgr should be initialized before handling IO"))?;
let host_funcs = self
.host_funcs
.as_ref()
.ok_or_else(|| new_error!("host_funcs should be initialized before handling IO"))?
.clone();

handle_outb(&mut mem_mgr, host_funcs, self, port, val)?;

// Put the mem_mgr back
self.mem_mgr = Some(mem_mgr);
}

#[cfg(not(feature = "mem_profile"))]
{
let mem_mgr = self
.mem_mgr
.as_mut()
.ok_or_else(|| new_error!("mem_mgr should be initialized before handling IO"))?;
let host_funcs = self
.host_funcs
.as_ref()
.ok_or_else(|| new_error!("host_funcs should be initialized before handling IO"))?
.clone();

handle_outb(mem_mgr, host_funcs, port, val)?;
}
handle_outb(mem_mgr, host_funcs, port, val, self)?;

// update rip
self.vcpu_fd.set_reg(&[hv_register_assoc {
Expand Down Expand Up @@ -985,25 +953,6 @@ impl Hypervisor for HypervLinuxDriver {
Ok(())
}

fn check_stack_guard(&self) -> Result<bool> {
if let Some(mgr) = self.mem_mgr.as_ref() {
mgr.check_stack_guard()
} else {
Err(new_error!("Memory manager is not initialized"))
}
}

#[cfg(feature = "trace_guest")]
fn handle_trace(&mut self, tc: &mut crate::sandbox::trace::TraceContext) -> Result<()> {
let regs = self.regs()?;
tc.handle_trace(
&regs,
self.mem_mgr.as_mut().ok_or_else(|| {
new_error!("Memory manager is not initialized before handling trace")
})?,
)
}

#[cfg(feature = "mem_profile")]
fn trace_info_mut(&mut self) -> &mut MemTraceInfo {
&mut self.trace_info
Expand Down
78 changes: 14 additions & 64 deletions src/hyperlight_host/src/hypervisor/hyperv_windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,15 @@ 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(gdb)]
use crate::new_error;
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};
use crate::{Result, debug, log_then_return};

#[cfg(gdb)]
mod debug {
Expand Down Expand Up @@ -261,8 +263,6 @@ pub(crate) struct HypervWindowsDriver {
entrypoint: u64,
orig_rsp: GuestPtr,
interrupt_handle: Arc<dyn InterruptHandleImpl>,
mem_mgr: Option<SandboxMemoryManager<HostSharedMemory>>,
host_funcs: Option<Arc<Mutex<FunctionRegistry>>>,

sandbox_regions: Vec<MemoryRegion>, // Initially mapped regions when sandbox is created
mmap_regions: Vec<MemoryRegion>, // Later mapped regions
Expand Down Expand Up @@ -335,8 +335,6 @@ impl HypervWindowsDriver {
entrypoint,
orig_rsp: GuestPtr::try_from(RawPtr::from(rsp))?,
interrupt_handle: interrupt_handle.clone(),
mem_mgr: None,
host_funcs: None,
sandbox_regions: mem_regions,
mmap_regions: Vec::new(),
#[cfg(gdb)]
Expand Down Expand Up @@ -408,14 +406,11 @@ impl Hypervisor for HypervWindowsDriver {
peb_address: RawPtr,
seed: u64,
page_size: u32,
mem_mgr: SandboxMemoryManager<HostSharedMemory>,
host_funcs: Arc<Mutex<FunctionRegistry>>,
mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>,
host_funcs: &Arc<Mutex<FunctionRegistry>>,
max_guest_log_level: Option<LevelFilter>,
#[cfg(gdb)] dbg_mem_access_hdl: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
) -> Result<()> {
self.mem_mgr = Some(mem_mgr);
self.host_funcs = Some(host_funcs);

let max_guest_log_level: u64 = match max_guest_log_level {
Some(level) => level as u64,
None => self.get_max_log_level().into(),
Expand All @@ -440,6 +435,8 @@ impl Hypervisor for HypervWindowsDriver {
VirtualCPU::run(
self.as_mut_hypervisor(),
interrupt_handle,
mem_mgr,
host_funcs,
#[cfg(gdb)]
dbg_mem_access_hdl,
)
Expand All @@ -463,6 +460,8 @@ impl Hypervisor for HypervWindowsDriver {
fn dispatch_call_from_host(
&mut self,
dispatch_func_addr: RawPtr,
mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>,
host_funcs: &Arc<Mutex<FunctionRegistry>>,
#[cfg(gdb)] dbg_mem_access_hdl: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
) -> Result<()> {
// Reset general purpose registers, then set RIP and RSP
Expand All @@ -481,6 +480,8 @@ impl Hypervisor for HypervWindowsDriver {
VirtualCPU::run(
self.as_mut_hypervisor(),
interrupt_handle,
mem_mgr,
host_funcs,
#[cfg(gdb)]
dbg_mem_access_hdl,
)
Expand All @@ -493,47 +494,15 @@ impl Hypervisor for HypervWindowsDriver {
data: Vec<u8>,
rip: u64,
instruction_length: u64,
mem_mgr: &mut SandboxMemoryManager<HostSharedMemory>,
host_funcs: &Arc<Mutex<FunctionRegistry>>,
) -> Result<()> {
let mut padded = [0u8; 4];
let copy_len = data.len().min(4);
padded[..copy_len].copy_from_slice(&data[..copy_len]);
let val = u32::from_le_bytes(padded);

#[cfg(feature = "mem_profile")]
{
// We need to handle the borrow checker issue where we need both:
// - &mut SandboxMemoryManager (from self.mem_mgr.as_mut())
// - &mut dyn Hypervisor (from self)
// We'll use a temporary approach to extract the mem_mgr temporarily
let mem_mgr_option = self.mem_mgr.take();
let mut mem_mgr = mem_mgr_option
.ok_or_else(|| new_error!("mem_mgr should be initialized before handling IO"))?;
let host_funcs = self
.host_funcs
.as_ref()
.ok_or_else(|| new_error!("host_funcs should be initialized before handling IO"))?
.clone();

handle_outb(&mut mem_mgr, host_funcs, self, port, val)?;

// Put the mem_mgr back
self.mem_mgr = Some(mem_mgr);
}

#[cfg(not(feature = "mem_profile"))]
{
let mem_mgr = self
.mem_mgr
.as_mut()
.ok_or_else(|| new_error!("mem_mgr should be initialized before handling IO"))?;
let host_funcs = self
.host_funcs
.as_ref()
.ok_or_else(|| new_error!("host_funcs should be initialized before handling IO"))?
.clone();

handle_outb(mem_mgr, host_funcs, port, val)?;
}
handle_outb(mem_mgr, host_funcs, port, val, self)?;

let mut regs = self.regs()?;
regs.rip = rip + instruction_length;
Expand Down Expand Up @@ -879,25 +848,6 @@ impl Hypervisor for HypervWindowsDriver {
Ok(())
}

fn check_stack_guard(&self) -> Result<bool> {
if let Some(mgr) = self.mem_mgr.as_ref() {
mgr.check_stack_guard()
} else {
Err(new_error!("Memory manager is not initialized"))
}
}

#[cfg(feature = "trace_guest")]
fn handle_trace(&mut self, tc: &mut crate::sandbox::trace::TraceContext) -> Result<()> {
let regs = self.regs()?;
tc.handle_trace(
&regs,
self.mem_mgr.as_mut().ok_or_else(|| {
new_error!("Memory manager is not initialized before handling trace")
})?,
)
}

#[cfg(feature = "mem_profile")]
fn trace_info_mut(&mut self) -> &mut MemTraceInfo {
&mut self.trace_info
Expand Down
Loading
Loading