tests: update CPU features for nested virt

Not all CPU features are available on EC2 nested virtualization.

Signed-off-by: Marco Marangoni <mamarang@amazon.com>

Author: marco-marangoni

tests/framework/properties.py

@@ -97,10 +97,12 @@ def __init__(self):
             self.instance = imdsv2_get("/meta-data/instance-type")
             self.instance_id = imdsv2_get("/meta-data/instance-id")
             self.ami = imdsv2_get("/meta-data/ami-id")
+            self.is_ec2_virt = "metal" not in self.instance
         else:
             self.instance = "NA"
             self.instance_id = "NA"
             self.ami = "NA"
+            self.is_ec2_virt = False
 
     @property
     def host_linux_version_tpl(self):

tests/integration_tests/functional/test_cpu_features_host_vs_guest.py

@@ -210,6 +210,53 @@
     "flush_l1d",
 } | {"la57"}
 
+# CPU features not available when running in a non-metal EC2 C8i, M8i, and R8i instance
+EC2_CMR8i_VIRT_UNAVAILABLE = {
+    "acpi",
+    "arch_lbr",
+    "art",
+    "bts",
+    "cat_l2",
+    "cat_l3",
+    "cdp_l2",
+    "cdp_l3",
+    "cqm",
+    "cqm_llc",
+    "cqm_mbm_local",
+    "cqm_mbm_total",
+    "cqm_occup_llc",
+    "dca",
+    "ds_cpl",
+    "dtes64",
+    "dtherm",
+    "dts",
+    "enqcmd",
+    "epb",
+    "est",
+    "hwp",
+    "hwp_act_window",
+    "hwp_epp",
+    "hwp_pkg_req",
+    "ibpb_exit_to_user",
+    "ibt",
+    "intel_ppin",
+    "intel_pt",
+    "la57",
+    "mba",
+    "pbe",
+    "pconfig",
+    "pebs",
+    "pln",
+    "pts",
+    "rdt_a",
+    "sdbg",
+    "smx",
+    "split_lock_detect",
+    "tm",
+    "tm2",
+    "xtpr",
+}
+
 
 def test_host_vs_guest_cpu_features(uvm):
     """Check CPU features host vs guest"""
@@ -457,6 +504,12 @@ def test_host_vs_guest_cpu_features(uvm):
                     # host-only synthesized bit; the guest can't read MSR 0x33).
                     expected_host_minus_guest |= {"split_lock_detect"}
 
+            if global_props.is_ec2_virt:
+                # These features aren't available in the host
+                expected_host_minus_guest -= EC2_CMR8i_VIRT_UNAVAILABLE
+                # Both host and guest run under an hypervisor
+                expected_guest_minus_host -= {"hypervisor"}
+
             assert host_feats - guest_feats == expected_host_minus_guest
             assert guest_feats - host_feats == expected_guest_minus_host
         case CpuModel.ARM_NEOVERSE_N1: