tests(onboarding): add granite rapids to integration tests

Add the new Granite Rapids CPU model to CPUModel enum and modify
test to account for feature differences.

Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>

Author: JamesC1305

tests/framework/utils_cpuid.py

@@ -32,13 +32,15 @@ class CpuModel(str, Enum):
     INTEL_CASCADELAKE = "INTEL_CASCADELAKE"
     INTEL_ICELAKE = "INTEL_ICELAKE"
     INTEL_SAPPHIRE_RAPIDS = "INTEL_SAPPHIRE_RAPIDS"
+    INTEL_GRANITE_RAPIDS = "INTEL_GRANITE_RAPIDS"
 
 
 CPU_DICT = {
     CpuVendor.INTEL: {
         "Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE",
         "Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE",
         "Intel(R) Xeon(R) Platinum 8488C": "INTEL_SAPPHIRE_RAPIDS",
+        "Intel(R) Xeon(R) 6975P-C": "INTEL_GRANITE_RAPIDS",
     },
     CpuVendor.AMD: {"AMD EPYC 7R13": "AMD_MILAN", "AMD EPYC 9R14": "AMD_GENOA"},
     CpuVendor.ARM: {

tests/integration_tests/functional/test_cpu_features_host_vs_guest.py

@@ -238,8 +238,7 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
             else:
                 assert host_feats - guest_feats == host_guest_diff_6_1
             assert guest_feats - host_feats == INTEL_GUEST_ONLY_FEATS - {"umip"}
-
-        case CpuModel.INTEL_SAPPHIRE_RAPIDS:
+        case CpuModel.INTEL_SAPPHIRE_RAPIDS | CpuModel.INTEL_GRANITE_RAPIDS:
             expected_host_minus_guest = INTEL_HOST_ONLY_FEATS.copy()
             expected_guest_minus_host = INTEL_GUEST_ONLY_FEATS.copy()
 
@@ -275,25 +274,32 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
                 # L3 variants are listed in INTEL_HOST_ONLY_FEATS.
                 "cat_l2",
                 "cdp_l2",
-                # This is a synthesized bit for split lock detection that raise an Alignment Check
-                # (#AC) exception if an operand of an atomic operation crosses two cache lines. It
-                # is not enumerated on CPUID, instead detected by actually attempting to read from
-                # MSR address 0x33 (MSR_MEMORY_CTRL in Intel SDM, MSR_TEST_CTRL in Linux kernel).
-                "split_lock_detect",
                 # Firecracker disables WAITPKG in CPUID normalization.
                 # https://github.com/firecracker-microvm/firecracker/pull/5118
                 "waitpkg",
             }
 
+            # FIX: Split lock detection should be enabled on Granite Rapids too. This is a temporary patch
+            # to prevent recurrent, known test failures. Once addressed, split lock detection will be enabled
+            # on both Sapphire and Granite Rapids.
+            if CPU_MODEL == CpuModel.INTEL_SAPPHIRE_RAPIDS:
+                # This is a synthesized bit for split lock detection that raise an Alignment Check
+                # (#AC) exception if an operand of an atomic operation crosses two cache lines. It
+                # is not enumerated on CPUID, instead detected by actually attempting to read from
+                # MSR address 0x33 (MSR_MEMORY_CTRL in Intel SDM, MSR_TEST_CTRL in Linux kernel).
+                expected_host_minus_guest |= {"split_lock_detect"}
+
+            elif CPU_MODEL == CpuModel.INTEL_GRANITE_RAPIDS:
+                # VMScape mitigation. Granite Rapids CPUs are not affected, and therefore do not need
+                # this feature.
+                expected_host_minus_guest -= {
+                    "ibpb_exit_to_user",
+                }
+
             # The following features are also not virtualized by KVM yet but are only supported on
             # newer kernel versions.
             if host_version >= (5, 18):
                 expected_host_minus_guest |= {
-                    # Hardware Feedback Interface (HFI) is a feature that gives OSes a performance
-                    # and energy efficiency capability data for each CPU that can be used to
-                    # influence task placement decisions.
-                    # https://github.com/torvalds/linux/commit/7b8f40b3de75c971a4e5f9308b06deb59118dbac
-                    "hfi",
                     # Indirect Brach Tracking (IBT) is a feature where the CPU ensures that indirect
                     # branch targets start with ENDBRANCH instruction (`endbr32` or `endbr64`),
                     # which executes as a no-op; if anything else is found, a control-protection
@@ -302,6 +308,25 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
                     "ibt",
                 }
 
+                if CPU_MODEL == CpuModel.INTEL_SAPPHIRE_RAPIDS:
+                    expected_host_minus_guest |= {
+                        # Hardware Feedback Interface (HFI) is a feature that gives OSes a performance
+                        # and energy efficiency capability data for each CPU that can be used to
+                        # influence task placement decisions. Only available on Sapphire Rapids.
+                        # https://github.com/torvalds/linux/commit/7b8f40b3de75c971a4e5f9308b06deb59118dbac
+                        "hfi",
+                    }
+
+            # FIX: This should also be backported to 5.10. Lower priority than split_lock_detect
+            # though.
+            elif host_version < (5, 19) and CPU_MODEL == CpuModel.INTEL_GRANITE_RAPIDS:
+                expected_host_minus_guest -= {
+                    # From v5.19 onwards, PPIN is detected by reading MSRs. On versions before,
+                    # a static list of architectures is enumerated. As of now, Granite Rapids has
+                    # not been backported to this list, and hence PPIN is not enabled.
+                    "intel_ppin",
+                }
+
             # AVX512 FP16 is supported and passed through on v5.11+.
             # https://github.com/torvalds/linux/commit/e1b35da5e624f8b09d2e98845c2e4c84b179d9a4
             # https://github.com/torvalds/linux/commit/2224fc9efb2d6593fbfb57287e39ba4958b188ba
@@ -337,7 +362,6 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
 
             assert host_feats - guest_feats == expected_host_minus_guest
             assert guest_feats - host_feats == expected_guest_minus_host
-
         case CpuModel.ARM_NEOVERSE_N1:
             expected_guest_minus_host = set()
             expected_host_minus_guest = set()