Skip to content

Commit 81ad304

Browse files
ludfjigludfjig
authored
Remove MemMgrWrapper abstraction because it's useless overhead with no benefit. Also remove WrapperGetter (#884)
Signed-off-by: Ludvig Liljenberg <[email protected]>
1 parent 44808b9 commit 81ad304

File tree

15 files changed

+135
-262
lines changed

15 files changed

+135
-262
lines changed

‎src/hyperlight_host/src/func/guest_err.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ limitations under the License.
1717
use hyperlight_common::flatbuffer_wrappers::guest_error::ErrorCode;
1818

1919
use crate::error::HyperlightError::{GuestError, StackOverflow};
20+
use crate::mem::mgr::SandboxMemoryManager;
2021
use crate::mem::shared_mem::HostSharedMemory;
2122
use crate::metrics::{METRIC_GUEST_ERROR, METRIC_GUEST_ERROR_LABEL_CODE};
22-
use crate::sandbox::mem_mgr::MemMgrWrapper;
2323
use crate::{Result, log_then_return};
2424

2525
/// Check for a guest error and return an `Err` if one was found,
2626
/// and `Ok` if one was not found.
27-
pub(crate) fn check_for_guest_error(mgr: &mut MemMgrWrapper<HostSharedMemory>) -> Result<()> {
28-
let guest_err = mgr.as_mut().get_guest_error().ok();
27+
pub(crate) fn check_for_guest_error(
28+
mgr: &mut SandboxMemoryManager<HostSharedMemory>,
29+
) -> Result<()> {
30+
let guest_err = mgr.get_guest_error().ok();
2931
let Some(guest_err) = guest_err else {
3032
return Ok(());
3133
};

‎src/hyperlight_host/src/func/host_functions.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl Registerable for UninitializedSandbox {
6161
return_type: Output::TYPE,
6262
};
6363

64-
(*hfs).register_host_function(name.to_string(), entry, self.mgr.unwrap_mgr_mut())
64+
(*hfs).register_host_function(name.to_string(), entry, &mut self.mgr)
6565
}
6666
#[cfg(all(feature = "seccomp", target_os = "linux"))]
6767
fn register_host_function_with_syscalls<Args: ParameterTuple, Output: SupportedReturnType>(
@@ -82,7 +82,7 @@ impl Registerable for UninitializedSandbox {
8282
return_type: Output::TYPE,
8383
};
8484

85-
(*hfs).register_host_function(name.to_string(), entry, self.mgr.unwrap_mgr_mut())
85+
(*hfs).register_host_function(name.to_string(), entry, &mut self.mgr)
8686
}
8787
}
8888

@@ -210,7 +210,7 @@ pub(crate) fn register_host_function<Args: ParameterTuple, Output: SupportedRetu
210210
.host_funcs
211211
.try_lock()
212212
.map_err(|e| new_error!("Error locking at {}:{}: {}", file!(), line!(), e))?
213-
.register_host_function(name.to_string(), entry, sandbox.mgr.unwrap_mgr_mut())?;
213+
.register_host_function(name.to_string(), entry, &mut sandbox.mgr)?;
214214

215215
Ok(())
216216
}

‎src/hyperlight_host/src/hypervisor/gdb/mod.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ use x86_64_target::HyperlightSandboxTarget;
4747

4848
use super::InterruptHandle;
4949
use crate::mem::layout::SandboxMemoryLayout;
50+
use crate::mem::mgr::SandboxMemoryManager;
5051
use crate::mem::shared_mem::HostSharedMemory;
51-
use crate::sandbox::mem_mgr::MemMgrWrapper;
5252
use crate::{HyperlightError, new_error};
5353

5454
#[derive(Debug, Error)]
@@ -210,7 +210,7 @@ pub(super) trait GuestDebug {
210210
&mut self,
211211
vcpu_fd: &Self::Vcpu,
212212
addr: u64,
213-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
213+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
214214
) -> crate::Result<()> {
215215
let addr = self.translate_gva(vcpu_fd, addr)?;
216216

@@ -235,7 +235,7 @@ pub(super) trait GuestDebug {
235235
vcpu_fd: &Self::Vcpu,
236236
mut gva: u64,
237237
mut data: &mut [u8],
238-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
238+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
239239
) -> crate::Result<()> {
240240
let data_len = data.len();
241241
log::debug!("Read addr: {:X} len: {:X}", gva, data_len);
@@ -259,7 +259,6 @@ pub(super) trait GuestDebug {
259259
dbg_mem_access_fn
260260
.try_lock()
261261
.map_err(|e| new_error!("Error locking at {}:{}: {}", file!(), line!(), e))?
262-
.unwrap_mgr_mut()
263262
.get_shared_mem_mut()
264263
.copy_to_slice(&mut data[..read_len], offset)?;
265264

@@ -285,7 +284,7 @@ pub(super) trait GuestDebug {
285284
&mut self,
286285
vcpu_fd: &Self::Vcpu,
287286
addr: u64,
288-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
287+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
289288
) -> crate::Result<()> {
290289
let addr = self.translate_gva(vcpu_fd, addr)?;
291290

@@ -309,7 +308,7 @@ pub(super) trait GuestDebug {
309308
vcpu_fd: &Self::Vcpu,
310309
mut gva: u64,
311310
mut data: &[u8],
312-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
311+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
313312
) -> crate::Result<()> {
314313
let data_len = data.len();
315314
log::debug!("Write addr: {:X} len: {:X}", gva, data_len);
@@ -333,7 +332,6 @@ pub(super) trait GuestDebug {
333332
dbg_mem_access_fn
334333
.try_lock()
335334
.map_err(|e| new_error!("Error locking at {}:{}: {}", file!(), line!(), e))?
336-
.unwrap_mgr_mut()
337335
.get_shared_mem_mut()
338336
.copy_from_slice(&data[..write_len], offset)?;
339337

‎src/hyperlight_host/src/hypervisor/hyperv_linux.rs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ use super::{HyperlightExit, Hypervisor, InterruptHandle, LinuxInterruptHandle, V
7575
use crate::HyperlightError;
7676
use crate::hypervisor::get_memory_access_violation;
7777
use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
78+
use crate::mem::mgr::SandboxMemoryManager;
7879
use crate::mem::ptr::{GuestPtr, RawPtr};
7980
use crate::mem::shared_mem::HostSharedMemory;
8081
use crate::sandbox::SandboxConfiguration;
8182
#[cfg(feature = "trace_guest")]
8283
use crate::sandbox::TraceInfo;
8384
use crate::sandbox::host_funcs::FunctionRegistry;
84-
use crate::sandbox::mem_mgr::MemMgrWrapper;
8585
use crate::sandbox::outb::handle_outb;
8686
#[cfg(crashdump)]
8787
use crate::sandbox::uninitialized::SandboxRuntimeConfig;
@@ -94,8 +94,8 @@ mod debug {
9494
use super::mshv_bindings::hv_x64_exception_intercept_message;
9595
use super::{HypervLinuxDriver, *};
9696
use crate::hypervisor::gdb::{DebugMsg, DebugResponse, VcpuStopReason, X86_64Regs};
97+
use crate::mem::mgr::SandboxMemoryManager;
9798
use crate::mem::shared_mem::HostSharedMemory;
98-
use crate::sandbox::mem_mgr::MemMgrWrapper;
9999
use crate::{Result, new_error};
100100

101101
impl HypervLinuxDriver {
@@ -126,7 +126,7 @@ mod debug {
126126
pub(crate) fn process_dbg_request(
127127
&mut self,
128128
req: DebugMsg,
129-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
129+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
130130
) -> Result<DebugResponse> {
131131
if let Some(debug) = self.debug.as_mut() {
132132
match req {
@@ -174,7 +174,6 @@ mod debug {
174174
.map_err(|e| {
175175
new_error!("Error locking at {}:{}: {}", file!(), line!(), e)
176176
})?
177-
.unwrap_mgr()
178177
.layout
179178
.get_guest_code_address();
180179

@@ -312,7 +311,7 @@ pub(crate) struct HypervLinuxDriver {
312311
orig_rsp: GuestPtr,
313312
entrypoint: u64,
314313
interrupt_handle: Arc<LinuxInterruptHandle>,
315-
mem_mgr: Option<MemMgrWrapper<HostSharedMemory>>,
314+
mem_mgr: Option<SandboxMemoryManager<HostSharedMemory>>,
316315
host_funcs: Option<Arc<Mutex<FunctionRegistry>>>,
317316

318317
sandbox_regions: Vec<MemoryRegion>, // Initially mapped regions when sandbox is created
@@ -584,10 +583,10 @@ impl Hypervisor for HypervLinuxDriver {
584583
peb_addr: RawPtr,
585584
seed: u64,
586585
page_size: u32,
587-
mem_mgr: MemMgrWrapper<HostSharedMemory>,
586+
mem_mgr: SandboxMemoryManager<HostSharedMemory>,
588587
host_funcs: Arc<Mutex<FunctionRegistry>>,
589588
max_guest_log_level: Option<LevelFilter>,
590-
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
589+
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
591590
) -> Result<()> {
592591
self.mem_mgr = Some(mem_mgr);
593592
self.host_funcs = Some(host_funcs);
@@ -659,7 +658,7 @@ impl Hypervisor for HypervLinuxDriver {
659658
fn dispatch_call_from_host(
660659
&mut self,
661660
dispatch_func_addr: RawPtr,
662-
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
661+
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
663662
) -> Result<()> {
664663
// Reset general purpose registers, then set RIP and RSP
665664
let regs = StandardRegisters {
@@ -705,7 +704,7 @@ impl Hypervisor for HypervLinuxDriver {
705704
#[cfg(feature = "trace_guest")]
706705
{
707706
// We need to handle the borrow checker issue where we need both:
708-
// - &mut MemMgrWrapper (from self.mem_mgr.as_mut())
707+
// - &mut SandboxMemoryManager (from self.mem_mgr)
709708
// - &mut dyn Hypervisor (from self)
710709
// We'll use a temporary approach to extract the mem_mgr temporarily
711710
let mem_mgr_option = self.mem_mgr.take();
@@ -1021,7 +1020,7 @@ impl Hypervisor for HypervLinuxDriver {
10211020
#[cfg(gdb)]
10221021
fn handle_debug(
10231022
&mut self,
1024-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
1023+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
10251024
stop_reason: VcpuStopReason,
10261025
) -> Result<()> {
10271026
if self.debug.is_none() {

‎src/hyperlight_host/src/hypervisor/hyperv_windows.rs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ use crate::hypervisor::fpu::FP_CONTROL_WORD_DEFAULT;
5858
use crate::hypervisor::get_memory_access_violation;
5959
use crate::hypervisor::wrappers::WHvGeneralRegisters;
6060
use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
61+
use crate::mem::mgr::SandboxMemoryManager;
6162
use crate::mem::ptr::{GuestPtr, RawPtr};
6263
use crate::mem::shared_mem::HostSharedMemory;
6364
#[cfg(feature = "trace_guest")]
6465
use crate::sandbox::TraceInfo;
6566
use crate::sandbox::host_funcs::FunctionRegistry;
66-
use crate::sandbox::mem_mgr::MemMgrWrapper;
6767
use crate::sandbox::outb::handle_outb;
6868
#[cfg(crashdump)]
6969
use crate::sandbox::uninitialized::SandboxRuntimeConfig;
@@ -78,8 +78,8 @@ mod debug {
7878
use super::{HypervWindowsDriver, *};
7979
use crate::Result;
8080
use crate::hypervisor::gdb::{DebugMsg, DebugResponse, VcpuStopReason, X86_64Regs};
81+
use crate::mem::mgr::SandboxMemoryManager;
8182
use crate::mem::shared_mem::HostSharedMemory;
82-
use crate::sandbox::mem_mgr::MemMgrWrapper;
8383

8484
impl HypervWindowsDriver {
8585
/// Resets the debug information to disable debugging
@@ -109,7 +109,7 @@ mod debug {
109109
pub(crate) fn process_dbg_request(
110110
&mut self,
111111
req: DebugMsg,
112-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
112+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
113113
) -> Result<DebugResponse> {
114114
if let Some(debug) = self.debug.as_mut() {
115115
match req {
@@ -157,7 +157,6 @@ mod debug {
157157
.map_err(|e| {
158158
new_error!("Error locking at {}:{}: {}", file!(), line!(), e)
159159
})?
160-
.unwrap_mgr()
161160
.layout
162161
.get_guest_code_address();
163162

@@ -279,7 +278,7 @@ pub(crate) struct HypervWindowsDriver {
279278
entrypoint: u64,
280279
orig_rsp: GuestPtr,
281280
interrupt_handle: Arc<WindowsInterruptHandle>,
282-
mem_mgr: Option<MemMgrWrapper<HostSharedMemory>>,
281+
mem_mgr: Option<SandboxMemoryManager<HostSharedMemory>>,
283282
host_funcs: Option<Arc<Mutex<FunctionRegistry>>>,
284283

285284
sandbox_regions: Vec<MemoryRegion>, // Initially mapped regions when sandbox is created
@@ -599,10 +598,10 @@ impl Hypervisor for HypervWindowsDriver {
599598
peb_address: RawPtr,
600599
seed: u64,
601600
page_size: u32,
602-
mem_mgr: MemMgrWrapper<HostSharedMemory>,
601+
mem_mgr: SandboxMemoryManager<HostSharedMemory>,
603602
host_funcs: Arc<Mutex<FunctionRegistry>>,
604603
max_guest_log_level: Option<LevelFilter>,
605-
#[cfg(gdb)] dbg_mem_access_hdl: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
604+
#[cfg(gdb)] dbg_mem_access_hdl: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
606605
) -> Result<()> {
607606
self.mem_mgr = Some(mem_mgr);
608607
self.host_funcs = Some(host_funcs);
@@ -652,7 +651,7 @@ impl Hypervisor for HypervWindowsDriver {
652651
fn dispatch_call_from_host(
653652
&mut self,
654653
dispatch_func_addr: RawPtr,
655-
#[cfg(gdb)] dbg_mem_access_hdl: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
654+
#[cfg(gdb)] dbg_mem_access_hdl: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
656655
) -> Result<()> {
657656
// Reset general purpose registers, then set RIP and RSP
658657
let regs = WHvGeneralRegisters {
@@ -696,7 +695,7 @@ impl Hypervisor for HypervWindowsDriver {
696695
#[cfg(feature = "trace_guest")]
697696
{
698697
// We need to handle the borrow checker issue where we need both:
699-
// - &mut MemMgrWrapper (from self.mem_mgr.as_mut())
698+
// - &mut SandboxMemoryManager (from self.mem_mgr.as_mut())
700699
// - &mut dyn Hypervisor (from self)
701700
// We'll use a temporary approach to extract the mem_mgr temporarily
702701
let mem_mgr_option = self.mem_mgr.take();
@@ -955,7 +954,7 @@ impl Hypervisor for HypervWindowsDriver {
955954
#[cfg(gdb)]
956955
fn handle_debug(
957956
&mut self,
958-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
957+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
959958
stop_reason: super::gdb::VcpuStopReason,
960959
) -> Result<()> {
961960
if self.debug.is_none() {

‎src/hyperlight_host/src/hypervisor/kvm.rs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ use super::{HyperlightExit, Hypervisor, InterruptHandle, LinuxInterruptHandle, V
4242
use crate::HyperlightError;
4343
use crate::hypervisor::get_memory_access_violation;
4444
use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
45+
use crate::mem::mgr::SandboxMemoryManager;
4546
use crate::mem::ptr::{GuestPtr, RawPtr};
4647
use crate::mem::shared_mem::HostSharedMemory;
4748
use crate::sandbox::SandboxConfiguration;
4849
#[cfg(feature = "trace_guest")]
4950
use crate::sandbox::TraceInfo;
5051
use crate::sandbox::host_funcs::FunctionRegistry;
51-
use crate::sandbox::mem_mgr::MemMgrWrapper;
5252
use crate::sandbox::outb::handle_outb;
5353
#[cfg(crashdump)]
5454
use crate::sandbox::uninitialized::SandboxRuntimeConfig;
@@ -86,8 +86,8 @@ mod debug {
8686
use crate::hypervisor::gdb::{
8787
DebugMsg, DebugResponse, GuestDebug, KvmDebug, VcpuStopReason, X86_64Regs,
8888
};
89+
use crate::mem::mgr::SandboxMemoryManager;
8990
use crate::mem::shared_mem::HostSharedMemory;
90-
use crate::sandbox::mem_mgr::MemMgrWrapper;
9191
use crate::{Result, new_error};
9292

9393
impl KVMDriver {
@@ -118,7 +118,7 @@ mod debug {
118118
pub(crate) fn process_dbg_request(
119119
&mut self,
120120
req: DebugMsg,
121-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
121+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
122122
) -> Result<DebugResponse> {
123123
if let Some(debug) = self.debug.as_mut() {
124124
match req {
@@ -166,7 +166,6 @@ mod debug {
166166
.map_err(|e| {
167167
new_error!("Error locking at {}:{}: {}", file!(), line!(), e)
168168
})?
169-
.unwrap_mgr()
170169
.layout
171170
.get_guest_code_address();
172171

@@ -292,7 +291,7 @@ pub(crate) struct KVMDriver {
292291
entrypoint: u64,
293292
orig_rsp: GuestPtr,
294293
interrupt_handle: Arc<LinuxInterruptHandle>,
295-
mem_mgr: Option<MemMgrWrapper<HostSharedMemory>>,
294+
mem_mgr: Option<SandboxMemoryManager<HostSharedMemory>>,
296295
host_funcs: Option<Arc<Mutex<FunctionRegistry>>>,
297296

298297
sandbox_regions: Vec<MemoryRegion>, // Initially mapped regions when sandbox is created
@@ -472,10 +471,10 @@ impl Hypervisor for KVMDriver {
472471
peb_addr: RawPtr,
473472
seed: u64,
474473
page_size: u32,
475-
mem_mgr: MemMgrWrapper<HostSharedMemory>,
474+
mem_mgr: SandboxMemoryManager<HostSharedMemory>,
476475
host_funcs: Arc<Mutex<FunctionRegistry>>,
477476
max_guest_log_level: Option<LevelFilter>,
478-
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
477+
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
479478
) -> Result<()> {
480479
self.mem_mgr = Some(mem_mgr);
481480
self.host_funcs = Some(host_funcs);
@@ -570,7 +569,7 @@ impl Hypervisor for KVMDriver {
570569
fn dispatch_call_from_host(
571570
&mut self,
572571
dispatch_func_addr: RawPtr,
573-
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
572+
#[cfg(gdb)] dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
574573
) -> Result<()> {
575574
// Reset general purpose registers, then set RIP and RSP
576575
let regs = kvm_regs {
@@ -623,7 +622,7 @@ impl Hypervisor for KVMDriver {
623622
#[cfg(feature = "trace_guest")]
624623
{
625624
// We need to handle the borrow checker issue where we need both:
626-
// - &mut MemMgrWrapper (from self.mem_mgr.as_mut())
625+
// - &mut SandboxMemoryManager (from self.mem_mgr.as_mut())
627626
// - &mut dyn Hypervisor (from self)
628627
// We'll use a temporary approach to extract the mem_mgr temporarily
629628
let mem_mgr_option = self.mem_mgr.take();
@@ -898,7 +897,7 @@ impl Hypervisor for KVMDriver {
898897
#[cfg(gdb)]
899898
fn handle_debug(
900899
&mut self,
901-
dbg_mem_access_fn: Arc<Mutex<MemMgrWrapper<HostSharedMemory>>>,
900+
dbg_mem_access_fn: Arc<Mutex<SandboxMemoryManager<HostSharedMemory>>>,
902901
stop_reason: VcpuStopReason,
903902
) -> Result<()> {
904903
if self.debug.is_none() {

0 commit comments

Comments
 (0)