test: enable secret freedom in uffd tests

This includes both functional and performance.

Signed-off-by: Nikita Kalyazin <[email protected]>

Author: kalyazin

tests/integration_tests/functional/test_uffd.py

@@ -12,12 +12,12 @@
 
 
 @pytest.fixture(scope="function", name="snapshot")
-def snapshot_fxt(microvm_factory, guest_kernel_linux_5_10, rootfs):
+def snapshot_fxt(microvm_factory, guest_kernel_linux_5_10, rootfs, secret_free):
     """Create a snapshot of a microVM."""
 
     basevm = microvm_factory.build(guest_kernel_linux_5_10, rootfs)
     basevm.spawn()
-    basevm.basic_config(vcpu_count=2, mem_size_mib=256)
+    basevm.basic_config(vcpu_count=2, mem_size_mib=256, secret_free=secret_free)
     basevm.add_net_iface()
 
     # Add a memory balloon.

tests/integration_tests/performance/test_snapshot_ab.py

@@ -46,7 +46,7 @@ def id(self):
         """Computes a unique id for this test instance"""
         return "all_dev" if self.all_devices else f"{self.vcpus}vcpu_{self.mem}mb"
 
-    def boot_vm(self, microvm_factory, guest_kernel, rootfs) -> Microvm:
+    def boot_vm(self, microvm_factory, guest_kernel, rootfs, secret_free) -> Microvm:
         """Creates the initial snapshot that will be loaded repeatedly to sample latencies"""
         vm = microvm_factory.build(
             guest_kernel,
@@ -60,6 +60,7 @@ def boot_vm(self, microvm_factory, guest_kernel, rootfs) -> Microvm:
             mem_size_mib=self.mem,
             rootfs_io_engine="Sync",
             huge_pages=self.huge_pages,
+            secret_free=secret_free,
         )
 
         for _ in range(self.nets):
@@ -98,7 +99,11 @@ def boot_vm(self, microvm_factory, guest_kernel, rootfs) -> Microvm:
     ids=lambda x: x.id,
 )
 def test_restore_latency(
-    microvm_factory, rootfs, guest_kernel_linux_5_10, test_setup, metrics
+    microvm_factory,
+    rootfs,
+    guest_kernel_linux_5_10,
+    test_setup,
+    metrics,
 ):
     """
     Restores snapshots with vcpu/memory configuration, roughly scaling according to mem = (vcpus - 1) * 2048MB,
@@ -116,7 +121,9 @@ def test_restore_latency(
             "huge pages with secret hiding kernels on ARM are currently failing"
         )
 
-    vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs)
+    vm = test_setup.boot_vm(
+        microvm_factory, guest_kernel_linux_5_10, rootfs, secret_free
+    )
 
     metrics.set_dimensions(
         {
@@ -159,6 +166,7 @@ def test_post_restore_latency(
     metrics,
     uffd_handler,
     huge_pages,
+    secret_free,
 ):
     """Collects latency metric of post-restore memory accesses done inside the guest"""
     if huge_pages != HugePagesConfig.NONE and uffd_handler is None:
@@ -173,8 +181,13 @@ def test_post_restore_latency(
             "huge pages with secret hiding kernels on ARM are currently failing"
         )
 
+    if secret_free and uffd_handler is None:
+        pytest.skip("Restoring from a file is not compatible with Secret Freedom")
+
     test_setup = SnapshotRestoreTest(mem=1024, vcpus=2, huge_pages=huge_pages)
-    vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs)
+    vm = test_setup.boot_vm(
+        microvm_factory, guest_kernel_linux_5_10, rootfs, secret_free
+    )
 
     metrics.set_dimensions(
         {
@@ -226,6 +239,7 @@ def test_population_latency(
     huge_pages,
     vcpus,
     mem,
+    secret_free,
 ):
     """Collects population latency metrics (e.g. how long it takes UFFD handler to fault in all memory)"""
     if (
@@ -238,7 +252,9 @@ def test_population_latency(
         )
 
     test_setup = SnapshotRestoreTest(mem=mem, vcpus=vcpus, huge_pages=huge_pages)
-    vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs)
+    vm = test_setup.boot_vm(
+        microvm_factory, guest_kernel_linux_5_10, rootfs, secret_free
+    )
 
     metrics.set_dimensions(
         {
@@ -281,16 +297,13 @@ def test_population_latency(
 
 
 def test_snapshot_create_latency(
-    microvm_factory,
-    guest_kernel_linux_5_10,
-    rootfs,
-    metrics,
+    microvm_factory, guest_kernel_linux_5_10, rootfs, metrics, secret_free
 ):
     """Measure the latency of creating a Full snapshot"""
 
     vm = microvm_factory.build(guest_kernel_linux_5_10, rootfs, monitor_memory=False)
     vm.spawn()
-    vm.basic_config(vcpu_count=2, mem_size_mib=512)
+    vm.basic_config(vcpu_count=2, mem_size_mib=512, secret_free=secret_free)
     vm.start()
     vm.pin_threads(0)