Skip to content

Commit e97db3d

Browse files
authored
Reduce GPA pool from 1024 to 512 pages for VMM tests (#939)
After updating CI gates to use Rust 1.85 we started to see test errors which looks like OOM errors. Unfortunately, weren't reproducible on DevBox testing (both WSL2 and Windows). This change will return some reserved memory back to Linux pool in attempt to see if it can help. The change can stay permanent because 512 pages is enough to pass the tests.
1 parent 3faf393 commit e97db3d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

openhcl/openhcl_boot/src/cmdline.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ mod tests {
161161
}
162162
);
163163
assert_eq!(
164-
parse_boot_command_line("OPENHCL_ENABLE_VTL2_GPA_POOL=1024"),
164+
parse_boot_command_line("OPENHCL_ENABLE_VTL2_GPA_POOL=512"),
165165
BootCommandLineOptions {
166166
logger: None,
167167
confidential_debug: false,
168-
enable_vtl2_gpa_pool: Some(1024),
168+
enable_vtl2_gpa_pool: Some(512),
169169
}
170170
);
171171
}

vmm_tests/vmm_tests/tests/tests/x86_64/openhcl_servicing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ async fn openhcl_servicing_keepalive(
5858
) -> Result<(), anyhow::Error> {
5959
openhcl_servicing_core(
6060
config,
61-
"OPENHCL_ENABLE_VTL2_GPA_POOL=1024",
61+
"OPENHCL_ENABLE_VTL2_GPA_POOL=512",
6262
igvm_file,
6363
OpenHclServicingFlags {
6464
enable_nvme_keepalive: true,

vmm_tests/vmm_tests/tests/tests/x86_64/openhcl_uefi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ async fn nvme_relay_shared_pool(config: PetriVmConfigOpenVmm) -> Result<(), anyh
8383
#[openvmm_test(openhcl_uefi_x64[nvme](vhd(ubuntu_2204_server_x64)))]
8484
async fn nvme_relay_private_pool(config: PetriVmConfigOpenVmm) -> Result<(), anyhow::Error> {
8585
// Number of pages to reserve as a private pool.
86-
nvme_relay_test_core(config, "OPENHCL_ENABLE_VTL2_GPA_POOL=1024").await
86+
nvme_relay_test_core(config, "OPENHCL_ENABLE_VTL2_GPA_POOL=512").await
8787
}
8888

8989
/// Servicing test of an OpenHCL uefi VM with a NVME disk assigned to VTL2 that boots
@@ -97,7 +97,7 @@ async fn nvme_keepalive(
9797
) -> Result<(), anyhow::Error> {
9898
nvme_relay_servicing_core(
9999
config,
100-
"OPENHCL_ENABLE_VTL2_GPA_POOL=1024",
100+
"OPENHCL_ENABLE_VTL2_GPA_POOL=512",
101101
igvm_file,
102102
OpenHclServicingFlags {
103103
enable_nvme_keepalive: true,

0 commit comments

Comments
 (0)