test: enable PCI microVMs for performance testing

Use pci_enabled fixture for boot time, block, and network tests to
create PCI microVM variants as well.

Signed-off-by: Babis Chalios <[email protected]>

Author: bchalios

tests/framework/microvm.py

@@ -481,6 +481,7 @@ def dimensions(self):
             "rootfs": self.rootfs_file.name,
             "vcpus": str(self.vcpus_count),
             "guest_memory": f"{self.mem_size_bytes / (1024 * 1024)}MB",
+            "pci": self.pci_enabled,
         }
 
     @property

tests/integration_tests/performance/test_block_ab.py

@@ -168,6 +168,7 @@ def test_block_performance(
     fio_mode,
     fio_block_size,
     fio_engine,
+    pci_enabled,
     io_engine,
     metrics,
     results_dir,
@@ -176,7 +177,7 @@ def test_block_performance(
     Execute block device emulation benchmarking scenarios.
     """
     vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
-    vm.spawn(log_level="Info", emit_metrics=True)
+    vm.spawn(log_level="Info", emit_metrics=True, pci=pci_enabled)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
     vm.add_net_iface()
     # Add a secondary block device for benchmark tests.

tests/integration_tests/performance/test_boottime.py

@@ -95,12 +95,12 @@ def to_ms(v, unit):
 
 
 def launch_vm_with_boot_timer(
-    microvm_factory, guest_kernel_acpi, rootfs_rw, vcpu_count, mem_size_mib
+    microvm_factory, guest_kernel_acpi, rootfs_rw, vcpu_count, mem_size_mib, pci_enabled
 ):
     """Launches a microVM with guest-timer and returns the reported metrics for it"""
     vm = microvm_factory.build(guest_kernel_acpi, rootfs_rw)
     vm.jailer.extra_args.update({"boot-timer": None})
-    vm.spawn()
+    vm.spawn(pci=pci_enabled)
     vm.basic_config(
         vcpu_count=vcpu_count,
         mem_size_mib=mem_size_mib,
@@ -116,9 +116,11 @@ def launch_vm_with_boot_timer(
     return (vm, boot_time_us, cpu_boot_time_us)
 
 
-def test_boot_timer(microvm_factory, guest_kernel_acpi, rootfs):
+def test_boot_timer(microvm_factory, guest_kernel_acpi, rootfs, pci_enabled):
     """Tests that the boot timer device works"""
-    launch_vm_with_boot_timer(microvm_factory, guest_kernel_acpi, rootfs, 1, 128)
+    launch_vm_with_boot_timer(
+        microvm_factory, guest_kernel_acpi, rootfs, 1, 128, pci_enabled
+    )
 
 
 @pytest.mark.parametrize(
@@ -127,13 +129,24 @@ def test_boot_timer(microvm_factory, guest_kernel_acpi, rootfs):
 )
 @pytest.mark.nonci
 def test_boottime(
-    microvm_factory, guest_kernel_acpi, rootfs_rw, vcpu_count, mem_size_mib, metrics
+    microvm_factory,
+    guest_kernel_acpi,
+    rootfs_rw,
+    vcpu_count,
+    mem_size_mib,
+    pci_enabled,
+    metrics,
 ):
     """Test boot time with different guest configurations"""
 
     for i in range(10):
         vm, boot_time_us, cpu_boot_time_us = launch_vm_with_boot_timer(
-            microvm_factory, guest_kernel_acpi, rootfs_rw, vcpu_count, mem_size_mib
+            microvm_factory,
+            guest_kernel_acpi,
+            rootfs_rw,
+            vcpu_count,
+            mem_size_mib,
+            pci_enabled,
         )
 
         if i == 0:

tests/integration_tests/performance/test_network_ab.py

@@ -38,15 +38,15 @@ def consume_ping_output(ping_putput, request_per_round):
 
 
 @pytest.fixture
-def network_microvm(request, microvm_factory, guest_kernel_acpi, rootfs):
+def network_microvm(request, microvm_factory, guest_kernel_acpi, rootfs, pci_enabled):
     """Creates a microvm with the networking setup used by the performance tests in this file.
     This fixture receives its vcpu count via indirect parameterization"""
 
     guest_mem_mib = 1024
     guest_vcpus = request.param
 
     vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
-    vm.spawn(log_level="Info", emit_metrics=True)
+    vm.spawn(log_level="Info", emit_metrics=True, pci=pci_enabled)
     vm.basic_config(vcpu_count=guest_vcpus, mem_size_mib=guest_mem_mib)
     vm.add_net_iface()
     vm.start()