test(pmem): add secret free

This is to make sure we test secret freedom with pmem.

Signed-off-by: Nikita Kalyazin <kalyazin@amazon.com>

Author: kalyazin

tests/integration_tests/functional/test_pmem.py

@@ -46,15 +46,15 @@ def check_pmem_exist(vm, index, root, read_only, size, extension):
     assert False
 
 
-def test_pmem_add(uvm_plain_any, microvm_factory):
+def test_pmem_add(uvm_plain_any, microvm_factory, secret_free):
     """
     Test addition of pmem devices to the VM and
     writes persistance
     """
 
     vm = uvm_plain_any
     vm.spawn()
-    vm.basic_config(add_root_device=True)
+    vm.basic_config(add_root_device=True, secret_free=secret_free)
     vm.add_net_iface()
 
     # Pmem should work with non 2MB aligned files as well
@@ -75,6 +75,9 @@ def test_pmem_add(uvm_plain_any, microvm_factory):
     check_pmem_exist(vm, 0, False, False, align(pmem_size_mb_1 << 20), "ext4")
     check_pmem_exist(vm, 1, False, True, align(pmem_size_mb_2 << 20), "ext4")
 
+    if secret_free:
+        return
+
     # Write something to the pmem0 to see that it is indeed saved to
     # underlying file when VM shots down
     test_string = "testing pmem persistance"
@@ -97,7 +100,7 @@ def test_pmem_add(uvm_plain_any, microvm_factory):
     assert stdout.strip() == test_string
 
 
-def test_pmem_add_as_root_rw(uvm_plain_any, rootfs_rw, microvm_factory):
+def test_pmem_add_as_root_rw(uvm_plain_any, rootfs_rw, microvm_factory, secret_free):
     """
     Test addition of a single root pmem device in read-write mode
     """
@@ -106,7 +109,7 @@ def test_pmem_add_as_root_rw(uvm_plain_any, rootfs_rw, microvm_factory):
     vm.memory_monitor = None
     vm.monitors = []
     vm.spawn()
-    vm.basic_config(add_root_device=False)
+    vm.basic_config(add_root_device=False, secret_free=secret_free)
     vm.add_net_iface()
 
     rootfs_size = os.path.getsize(rootfs_rw)
@@ -115,12 +118,15 @@ def test_pmem_add_as_root_rw(uvm_plain_any, rootfs_rw, microvm_factory):
 
     check_pmem_exist(vm, 0, True, False, align(rootfs_size), "ext4")
 
+    if secret_free:
+        return
+
     snapshot = vm.snapshot_full()
     restored_vm = microvm_factory.build_from_snapshot(snapshot)
     check_pmem_exist(restored_vm, 0, True, False, align(rootfs_size), "ext4")
 
 
-def test_pmem_add_as_root_ro(uvm_plain_any, rootfs, microvm_factory):
+def test_pmem_add_as_root_ro(uvm_plain_any, rootfs, microvm_factory, secret_free):
     """
     Test addition of a single root pmem device in read-only mode
     """
@@ -129,7 +135,7 @@ def test_pmem_add_as_root_ro(uvm_plain_any, rootfs, microvm_factory):
     vm.memory_monitor = None
     vm.monitors = []
     vm.spawn()
-    vm.basic_config(add_root_device=False)
+    vm.basic_config(add_root_device=False, secret_free=secret_free)
     vm.add_net_iface()
 
     rootfs_size = os.path.getsize(rootfs)
@@ -138,6 +144,9 @@ def test_pmem_add_as_root_ro(uvm_plain_any, rootfs, microvm_factory):
 
     check_pmem_exist(vm, 0, True, True, align(rootfs_size), "squashfs")
 
+    if secret_free:
+        return
+
     snapshot = vm.snapshot_full()
     restored_vm = microvm_factory.build_from_snapshot(snapshot)
     check_pmem_exist(restored_vm, 0, True, True, align(rootfs_size), "squashfs")

tests/integration_tests/performance/test_pmem.py

@@ -84,14 +84,17 @@ def test_pmem_performance(
     fio_engine,
     metrics,
     results_dir,
+    secret_free,
 ):
     """
     Measure performance of pmem device
     """
     vm = uvm_plain_acpi
     vm.memory_monitor = None
     vm.spawn()
-    vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
+    vm.basic_config(
+        vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB, secret_free=secret_free
+    )
     vm.add_net_iface()
     # Add a secondary block device for benchmark tests.
     fs = drive_tools.FilesystemFile(
@@ -164,6 +167,7 @@ def test_pmem_first_read(
     fio_block_size,
     metrics,
     results_dir,
+    secret_free,
 ):
     """
     Measure performance of a first full read from the pmem device.
@@ -177,7 +181,7 @@ def test_pmem_first_read(
             guest_kernel_acpi, rootfs, pci=True, monitor_memory=False
         )
         vm.spawn()
-        vm.basic_config(mem_size_mib=GUEST_MEM_MIB)
+        vm.basic_config(mem_size_mib=GUEST_MEM_MIB, secret_free=secret_free)
         vm.add_net_iface()
 
         fs = drive_tools.FilesystemFile(