Skip to content

openhcl: remove cmdline to configure shared vis pool + tests #2189

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

Merged
merged 1 commit into from
Oct 16, 2025
Merged

openhcl: remove cmdline to configure shared vis pool + tests #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion openhcl/underhill_core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ async fn launch_workers(
force_load_vtl0_image: opt.force_load_vtl0_image,
nvme_vfio: opt.nvme_vfio,
mcr: opt.mcr,
enable_shared_visibility_pool: opt.enable_shared_visibility_pool,
halt_on_guest_halt: opt.halt_on_guest_halt,
no_sidecar_hotplug: opt.no_sidecar_hotplug,
gdbstub: opt.gdbstub,
Expand Down
8 changes: 0 additions & 8 deletions openhcl/underhill_core/src/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@ pub struct Options {
/// MCR Device Enable
pub mcr: bool, // TODO MCR: support closed-source ENV vars

/// (OPENHCL_ENABLE_SHARED_VISIBILITY_POOL=1)
/// Enable the shared visibility pool. This is enabled by default on
/// hardware isolated platforms, but can be enabled for testing.
pub enable_shared_visibility_pool: bool,

/// (OPENHCL_HIDE_ISOLATION=1)
/// Hide the isolation mode from the guest.
pub hide_isolation: bool,
Expand Down Expand Up @@ -328,8 +323,6 @@ impl Options {
let serial_wait_for_rts = parse_legacy_env_bool("OPENHCL_SERIAL_WAIT_FOR_RTS");
let nvme_vfio = parse_legacy_env_bool("OPENHCL_NVME_VFIO");
let mcr = parse_legacy_env_bool("OPENHCL_MCR_DEVICE");
let enable_shared_visibility_pool =
parse_legacy_env_bool("OPENHCL_ENABLE_SHARED_VISIBILITY_POOL");
let hide_isolation = parse_env_bool("OPENHCL_HIDE_ISOLATION");
let halt_on_guest_halt = parse_legacy_env_bool("OPENHCL_HALT_ON_GUEST_HALT");
let no_sidecar_hotplug = parse_legacy_env_bool("OPENHCL_NO_SIDECAR_HOTPLUG");
Expand Down Expand Up @@ -418,7 +411,6 @@ impl Options {
force_load_vtl0_image,
nvme_vfio,
mcr,
enable_shared_visibility_pool,
hide_isolation,
halt_on_guest_halt,
no_sidecar_hotplug,
Expand Down
4 changes: 0 additions & 4 deletions openhcl/underhill_core/src/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,6 @@ pub struct UnderhillEnvCfg {
pub nvme_vfio: bool,
// TODO MCR: support closed-source configuration logic for MCR device
pub mcr: bool,
/// Enable the shared visibility pool. This is enabled by default on
/// hardware isolated platforms, but can be enabled for testing.
pub enable_shared_visibility_pool: bool,
/// Halt on a guest halt request instead of forwarding to the host.
pub halt_on_guest_halt: bool,
/// Leave sidecar VPs remote even if they hit exits.
Expand Down Expand Up @@ -1381,7 +1378,6 @@ async fn new_underhill_vm(
round_up_to_2mb(cpu_bytes + device_dma + attestation)
}
virt::IsolationType::Vbs => round_up_to_2mb(device_dma + attestation),
_ if env_cfg.enable_shared_visibility_pool => round_up_to_2mb(device_dma + attestation),
_ => 0,
};

Expand Down
2 changes: 0 additions & 2 deletions vmm_tests/vmm_tests/tests/tests/x86_64/openhcl_linux_direct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ async fn mana_nic_shared_pool(
let (vm, agent) = config
.with_vmbus_redirect(true)
.modify_backend(|b| b.with_nic())
.with_openhcl_command_line("OPENHCL_ENABLE_SHARED_VISIBILITY_POOL=1")
.run()
.await?;

Expand All @@ -87,7 +86,6 @@ async fn mana_nic_servicing(
let (mut vm, agent) = config
.with_vmbus_redirect(true)
.modify_backend(|b| b.with_nic())
.with_openhcl_command_line("OPENHCL_ENABLE_SHARED_VISIBILITY_POOL=1")
.run()
.await?;

Expand Down
20 changes: 0 additions & 20 deletions vmm_tests/vmm_tests/tests/tests/x86_64/openhcl_uefi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,26 +152,6 @@ async fn nvme_relay(config: PetriVmBuilder<OpenVmmPetriBackend>) -> Result<(), a
nvme_relay_test_core(config, "", None).await
}

/// Test an OpenHCL uefi VM with a NVME disk assigned to VTL2 that boots
/// linux, with vmbus relay. This should expose a disk to VTL0 via vmbus.
///
/// Use the shared pool override to test the shared pool dma path.
#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2504_server_x64)))]
async fn nvme_relay_shared_pool(
config: PetriVmBuilder<OpenVmmPetriBackend>,
) -> Result<(), anyhow::Error> {
nvme_relay_test_core(
config,
"OPENHCL_ENABLE_SHARED_VISIBILITY_POOL=1",
Some(ExpectedNvmeDeviceProperties {
save_restore_supported: false, // No private pool, so no save/restore of memory.
qsize: 64, // Should be 256, but #2185.
nvme_keepalive: false,
}),
)
.await
}

/// Test an OpenHCL uefi VM with a NVME disk assigned to VTL2 that boots
/// linux, with vmbus relay. This should expose a disk to VTL0 via vmbus.
///
Expand Down