test(pci): parametrize uvm_plain* with pci

Move the PCI configuration to the VM factory so that we can have
uvm_plain* fixtures also run the tests on PCIe kernels.
Also cleanup some places where the uvm_plain was simpler.

Signed-off-by: Riccardo Mancini <[email protected]>

Author: Manciukic

tests/conftest.py

@@ -507,9 +507,9 @@ def rootfs_rw():
 
 
 @pytest.fixture
-def uvm_plain(microvm_factory, guest_kernel_linux_5_10, rootfs):
+def uvm_plain(microvm_factory, guest_kernel_linux_5_10, rootfs, pci_enabled):
     """Create a vanilla VM, non-parametrized"""
-    return microvm_factory.build(guest_kernel_linux_5_10, rootfs)
+    return microvm_factory.build(guest_kernel_linux_5_10, rootfs, pci=pci_enabled)
 
 
 @pytest.fixture
@@ -535,12 +535,12 @@ def artifact_dir():
 
 
 @pytest.fixture
-def uvm_plain_any(microvm_factory, guest_kernel, rootfs):
+def uvm_plain_any(microvm_factory, guest_kernel, rootfs, pci_enabled):
     """All guest kernels
     kernel: all
     rootfs: Ubuntu 24.04
     """
-    return microvm_factory.build(guest_kernel, rootfs)
+    return microvm_factory.build(guest_kernel, rootfs, pci=pci_enabled)
 
 
 guest_kernel_6_1_debug = pytest.fixture(
@@ -583,8 +583,8 @@ def uvm_booted(
     mem_size_mib=256,
 ):
     """Return a booted uvm"""
-    uvm = microvm_factory.build(guest_kernel, rootfs)
-    uvm.spawn(pci=pci_enabled)
+    uvm = microvm_factory.build(guest_kernel, rootfs, pci=pci_enabled)
+    uvm.spawn()
     uvm.basic_config(vcpu_count=vcpu_count, mem_size_mib=mem_size_mib)
     uvm.set_cpu_template(cpu_template)
     uvm.add_net_iface()

tests/framework/microvm.py

@@ -191,14 +191,14 @@ def __init__(
         jailer_kwargs: Optional[dict] = None,
         numa_node=None,
         custom_cpu_template: Path = None,
+        pci: bool = False,
     ):
         """Set up microVM attributes, paths, and data structures."""
         # pylint: disable=too-many-statements
         # Unique identifier for this machine.
         assert microvm_id is not None
         self._microvm_id = microvm_id
 
-        self.pci_enabled = False
         self.kernel_file = None
         self.rootfs_file = None
         self.ssh_key = None
@@ -222,6 +222,10 @@ def __init__(
             **jailer_kwargs,
         )
 
+        self.pci_enabled = pci
+        if pci:
+            self.jailer.extra_args["enable-pci"] = None
+
         # Copy the /etc/localtime file in the jailer root
         self.jailer.jailed_path("/etc/localtime", subdir="etc")
 
@@ -612,7 +616,6 @@ def spawn(
         log_show_origin=False,
         metrics_path="fc.ndjson",
         emit_metrics: bool = False,
-        pci: bool = False,
     ):
         """Start a microVM as a daemon or in a screen session."""
         # pylint: disable=subprocess-run-check
@@ -658,10 +661,6 @@ def spawn(
             # Checking the timings requires DEBUG level log messages
             self.time_api_requests = False
 
-        if pci:
-            self.pci_enabled = True
-            self.jailer.extra_args["enable-pci"] = None
-
         cmd = [
             *self._pre_cmd,
             str(self.jailer_binary_path),

tests/integration_tests/functional/test_kernel_cmdline.py

@@ -21,7 +21,7 @@ def test_init_params(uvm_plain):
     # Ubuntu version from the /etc/issue file.
     vm.basic_config(
         vcpu_count=1,
-        boot_args="console=ttyS0 reboot=k panic=1 init=/bin/cat -- /etc/issue",
+        boot_args="console=ttyS0 reboot=k panic=1" " init=/bin/cat -- /etc/issue",
     )
 
     vm.start()

tests/integration_tests/functional/test_serial_io.py

@@ -99,9 +99,7 @@ def test_serial_console_login(uvm_plain_any):
     microvm.memory_monitor = None
 
     # Set up the microVM with 1 vCPU and a serial console.
-    microvm.basic_config(
-        vcpu_count=1, boot_args="console=ttyS0 reboot=k panic=1 pci=off"
-    )
+    microvm.basic_config(vcpu_count=1, boot_args="console=ttyS0 reboot=k panic=1")
 
     microvm.start()
 

tests/integration_tests/functional/test_vsock.py

@@ -37,15 +37,15 @@
 TEST_WORKER_COUNT = 10
 
 
-def test_vsock(uvm_plain_any, pci_enabled, bin_vsock_path, test_fc_session_root_path):
+def test_vsock(uvm_plain_any, bin_vsock_path, test_fc_session_root_path):
     """
     Test guest and host vsock initiated connections.
 
     Check the module docstring for details on the setup.
     """
 
     vm = uvm_plain_any
-    vm.spawn(pci=pci_enabled)
+    vm.spawn()
 
     vm.basic_config()
     vm.add_net_iface()
@@ -102,12 +102,12 @@ def negative_test_host_connections(vm, blob_path, blob_hash):
     validate_fc_metrics(metrics)
 
 
-def test_vsock_epipe(uvm_plain, pci_enabled, bin_vsock_path, test_fc_session_root_path):
+def test_vsock_epipe(uvm_plain_any, bin_vsock_path, test_fc_session_root_path):
     """
     Vsock negative test to validate SIGPIPE/EPIPE handling.
     """
-    vm = uvm_plain
-    vm.spawn(pci=pci_enabled)
+    vm = uvm_plain_any
+    vm.spawn()
     vm.basic_config()
     vm.add_net_iface()
     vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=f"/{VSOCK_UDS_PATH}")
@@ -129,7 +129,7 @@ def test_vsock_epipe(uvm_plain, pci_enabled, bin_vsock_path, test_fc_session_roo
 
 
 def test_vsock_transport_reset_h2g(
-    uvm_plain, pci_enabled, microvm_factory, bin_vsock_path, test_fc_session_root_path
+    uvm_plain_any, microvm_factory, bin_vsock_path, test_fc_session_root_path
 ):
     """
     Vsock transport reset test.
@@ -146,8 +146,8 @@ def test_vsock_transport_reset_h2g(
     6. Close VM -> Load VM from Snapshot -> check that vsock
        device is still working.
     """
-    test_vm = uvm_plain
-    test_vm.spawn(pci=pci_enabled)
+    test_vm = uvm_plain_any
+    test_vm.spawn()
     test_vm.basic_config(vcpu_count=2, mem_size_mib=256)
     test_vm.add_net_iface()
     test_vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=f"/{VSOCK_UDS_PATH}")
@@ -215,12 +215,12 @@ def test_vsock_transport_reset_h2g(
     validate_fc_metrics(metrics)
 
 
-def test_vsock_transport_reset_g2h(uvm_plain, pci_enabled, microvm_factory):
+def test_vsock_transport_reset_g2h(uvm_plain_any, microvm_factory):
     """
     Vsock transport reset test.
     """
-    test_vm = uvm_plain
-    test_vm.spawn(pci=pci_enabled)
+    test_vm = uvm_plain_any
+    test_vm.spawn()
     test_vm.basic_config(vcpu_count=2, mem_size_mib=256)
     test_vm.add_net_iface()
     test_vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=f"/{VSOCK_UDS_PATH}")

tests/integration_tests/performance/test_block.py

@@ -176,8 +176,10 @@ 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, pci=pci_enabled)
+    vm = microvm_factory.build(
+        guest_kernel_acpi, rootfs, monitor_memory=False, pci=pci_enabled
+    )
+    vm.spawn(log_level="Info", emit_metrics=True)
     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_network.py

@@ -45,8 +45,10 @@ def network_microvm(request, microvm_factory, guest_kernel_acpi, rootfs, pci_ena
     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, pci=pci_enabled)
+    vm = microvm_factory.build(
+        guest_kernel_acpi, rootfs, monitor_memory=False, pci=pci_enabled
+    )
+    vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=guest_vcpus, mem_size_mib=guest_mem_mib)
     vm.add_net_iface()
     vm.start()

tests/integration_tests/performance/test_vsock.py

@@ -95,8 +95,10 @@ def test_vsock_throughput(
         pytest.skip("bidrectional test only done with at least 2 vcpus")
 
     mem_size_mib = 1024
-    vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
-    vm.spawn(log_level="Info", emit_metrics=True, pci=pci_enabled)
+    vm = microvm_factory.build(
+        guest_kernel_acpi, rootfs, monitor_memory=False, pci=pci_enabled
+    )
+    vm.spawn(log_level="Info", emit_metrics=True)
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=mem_size_mib)
     vm.add_net_iface()
     # Create a vsock device