Skip to content

Commit 29f99b5

Browse files
committed
fix(test): renable huge pages tests on arm64
With the updated host kernel, the bug that made them fail seems to have been fixed. Signed-off-by: Patrick Roy <[email protected]>
1 parent 2674107 commit 29f99b5

File tree

3 files changed

+0
-59
lines changed

3 files changed

+0
-59
lines changed

tests/integration_tests/performance/test_huge_pages.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ def check_hugetlbfs_in_use(pid: int, allocation_name: str):
5454
assert kernel_page_size_kib > 4
5555

5656

57-
@pytest.mark.skipif(
58-
global_props.host_linux_version_tpl > (6, 1)
59-
and global_props.cpu_architecture == "aarch64",
60-
reason="Huge page tests with secret hidden kernels on ARM currently fail",
61-
)
6257
def test_hugetlbfs_boot(uvm_plain):
6358
"""Tests booting a microvm with guest memory backed by 2MB hugetlbfs pages"""
6459

@@ -73,11 +68,6 @@ def test_hugetlbfs_boot(uvm_plain):
7368
)
7469

7570

76-
@pytest.mark.skipif(
77-
global_props.host_linux_version_tpl > (6, 1)
78-
and global_props.cpu_architecture == "aarch64",
79-
reason="Huge page tests with secret hidden kernels on ARM currently fail",
80-
)
8171
def test_hugetlbfs_snapshot(microvm_factory, guest_kernel_linux_5_10, rootfs):
8272
"""
8373
Test hugetlbfs snapshot restore via uffd
@@ -105,11 +95,6 @@ def test_hugetlbfs_snapshot(microvm_factory, guest_kernel_linux_5_10, rootfs):
10595
check_hugetlbfs_in_use(vm.firecracker_pid, "/anon_hugepage")
10696

10797

108-
@pytest.mark.skipif(
109-
global_props.host_linux_version_tpl > (6, 1)
110-
and global_props.cpu_architecture == "aarch64",
111-
reason="Huge page tests with secret hidden kernels on ARM currently fail",
112-
)
11398
def test_hugetlbfs_diff_snapshot(microvm_factory, uvm_plain):
11499
"""
115100
Test hugetlbfs differential snapshot support.
@@ -150,11 +135,6 @@ def test_hugetlbfs_diff_snapshot(microvm_factory, uvm_plain):
150135
# Verify if the restored microvm works.
151136

152137

153-
@pytest.mark.skipif(
154-
global_props.host_linux_version_tpl > (6, 1)
155-
and global_props.cpu_architecture == "aarch64",
156-
reason="Huge page tests with secret hidden kernels on ARM currently fail",
157-
)
158138
@pytest.mark.parametrize("huge_pages", HugePagesConfig)
159139
def test_ept_violation_count(
160140
microvm_factory,
@@ -231,11 +211,6 @@ def test_ept_violation_count(
231211
metrics.put_metric(metric, int(metric_value), "Count")
232212

233213

234-
@pytest.mark.skipif(
235-
global_props.host_linux_version_tpl > (6, 1)
236-
and global_props.cpu_architecture == "aarch64",
237-
reason="Huge page tests with secret hidden kernels on ARM currently fail",
238-
)
239214
def test_negative_huge_pages_plus_balloon(uvm_plain):
240215
"""Tests that huge pages and memory ballooning cannot be used together"""
241216
uvm_plain.memory_monitor = None

tests/integration_tests/performance/test_initrd.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import pytest
55

66
from framework.microvm import HugePagesConfig, Serial
7-
from framework.properties import global_props
87

98
INITRD_FILESYSTEM = "rootfs"
109

@@ -21,11 +20,6 @@ def uvm_with_initrd(microvm_factory, guest_kernel, record_property, artifact_dir
2120
yield uvm
2221

2322

24-
@pytest.mark.skipif(
25-
global_props.host_linux_version_tpl > (6, 1)
26-
and global_props.cpu_architecture == "aarch64",
27-
reason="Huge page tests with secret hidden kernels on ARM currently fail",
28-
)
2923
@pytest.mark.parametrize("huge_pages", HugePagesConfig)
3024
def test_microvm_initrd_with_serial(uvm_with_initrd, huge_pages):
3125
"""

tests/integration_tests/performance/test_snapshot.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import host_tools.drive as drive_tools
1515
from framework.microvm import HugePagesConfig, Microvm, SnapshotType
16-
from framework.properties import global_props
1716

1817
USEC_IN_MSEC = 1000
1918
NS_IN_MSEC = 1_000_000
@@ -112,15 +111,6 @@ def test_restore_latency(
112111
113112
We only test a single guest kernel, as the guest kernel does not "participate" in snapshot restore.
114113
"""
115-
if (
116-
test_setup.huge_pages != HugePagesConfig.NONE
117-
and global_props.host_linux_version_tpl > (6, 1)
118-
and global_props.cpu_architecture == "aarch64"
119-
):
120-
pytest.skip(
121-
"huge pages with secret hiding kernels on ARM are currently failing"
122-
)
123-
124114
vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs, False)
125115

126116
metrics.set_dimensions(
@@ -170,15 +160,6 @@ def test_post_restore_latency(
170160
if huge_pages != HugePagesConfig.NONE and uffd_handler is None:
171161
pytest.skip("huge page snapshots can only be restored using uffd")
172162

173-
if (
174-
huge_pages != HugePagesConfig.NONE
175-
and global_props.host_linux_version_tpl > (6, 1)
176-
and global_props.cpu_architecture == "aarch64"
177-
):
178-
pytest.skip(
179-
"huge pages with secret hiding kernels on ARM are currently failing"
180-
)
181-
182163
if secret_free and uffd_handler is None:
183164
pytest.skip("Restoring from a file is not compatible with Secret Freedom")
184165

@@ -243,15 +224,6 @@ def test_population_latency(
243224
secret_free,
244225
):
245226
"""Collects population latency metrics (e.g. how long it takes UFFD handler to fault in all memory)"""
246-
if (
247-
huge_pages != HugePagesConfig.NONE
248-
and global_props.host_linux_version_tpl > (6, 1)
249-
and global_props.cpu_architecture == "aarch64"
250-
):
251-
pytest.skip(
252-
"huge pages with secret hiding kernels on ARM are currently failing"
253-
)
254-
255227
if secret_free and huge_pages != HugePagesConfig.NONE:
256228
pytest.skip("Huge pages are not supported with Secret Freedom yet")
257229

0 commit comments

Comments
 (0)