test: allow extd_apicid CPU feature on AMD guests

When PCI is enabled inside the guest, the (guest) kernel enables the
`extd_apicid` CPU feature for AMD CPU families after 16h. Our supported
AMD families (Milan & Genoa) are both 19h.

Do not mark this as host-only when PCI is enabled.

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

Author: bchalios

tests/framework/microvm.py

@@ -198,6 +198,7 @@ def __init__(
         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
@@ -639,6 +640,7 @@ def spawn(
             self.time_api_requests = False
 
         if pci:
+            self.pci_enabled = True
             self.jailer.extra_args["enable-pci"] = None
 
         cmd = [

tests/integration_tests/functional/test_cpu_features_host_vs_guest.py

@@ -170,18 +170,32 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
 
     match CPU_MODEL:
         case CpuModel.AMD_MILAN:
+            if vm.pci_enabled:
+                feats = AMD_MILAN_HOST_ONLY_FEATS - {"extd_apicid"}
+                feats_6_1 = AMD_MILAN_HOST_ONLY_FEATS_6_1 - {"extd_apicid"}
+            else:
+                feats = AMD_MILAN_HOST_ONLY_FEATS
+                feats_6_1 = AMD_MILAN_HOST_ONLY_FEATS_6_1
+
             if global_props.host_linux_version_tpl < (6, 1):
-                assert host_feats - guest_feats == AMD_MILAN_HOST_ONLY_FEATS
+                assert host_feats - guest_feats == feats
             else:
-                assert host_feats - guest_feats == AMD_MILAN_HOST_ONLY_FEATS_6_1
+                assert host_feats - guest_feats == feats_6_1
 
             assert guest_feats - host_feats == AMD_GUEST_ONLY_FEATS
 
         case CpuModel.AMD_GENOA:
+            if vm.pci_enabled:
+                feats = AMD_GENOA_HOST_ONLY_FEATS - {"extd_apicid"}
+                feats_6_1 = AMD_GENOA_HOST_ONLY_FEATS_6_1 - {"extd_apicid"}
+            else:
+                feats = AMD_MILAN_HOST_ONLY_FEATS
+                feats_6_1 = AMD_MILAN_HOST_ONLY_FEATS_6_1
+
             if global_props.host_linux_version_tpl < (6, 1):
-                assert host_feats - guest_feats == AMD_GENOA_HOST_ONLY_FEATS
+                assert host_feats - guest_feats == feats
             else:
-                assert host_feats - guest_feats == AMD_GENOA_HOST_ONLY_FEATS_6_1
+                assert host_feats - guest_feats == feats_6_1
 
             assert guest_feats - host_feats == AMD_GUEST_ONLY_FEATS