Skip to content

Commit 7760007

Browse files
JamesC1305ShadowCurse
authored andcommitted
tests: add VMScape CPU feature for 6.1 Granite Rapids
This feature is available on AL2023 6.1 kernel, but not yet on 5.10. Update the test accordingly. Signed-off-by: James Curtis <[email protected]>
1 parent b1341a4 commit 7760007

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

tests/integration_tests/functional/test_cpu_features_host_vs_guest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,8 @@ def test_host_vs_guest_cpu_features(uvm_plain_any):
289289
# MSR address 0x33 (MSR_MEMORY_CTRL in Intel SDM, MSR_TEST_CTRL in Linux kernel).
290290
expected_host_minus_guest |= {"split_lock_detect"}
291291

292-
elif CPU_MODEL == CpuModel.INTEL_GRANITE_RAPIDS:
293-
# VMScape mitigation. Granite Rapids CPUs are not affected, and therefore do not need
294-
# this feature.
292+
# FIX: VMScape mitigation has not yet been backported to 5.10.
293+
elif host_version < (6, 1) and CPU_MODEL == CpuModel.INTEL_GRANITE_RAPIDS:
295294
expected_host_minus_guest -= {
296295
"ibpb_exit_to_user",
297296
}

0 commit comments

Comments
 (0)