KVM: Add MWAIT/MONITOR test cases

3 mwait test cases for TD 3 mwait test cases for Non-TD Also add MWAIT/MONITOR in instruction-check Signed-off-by: Xudong Hao <[email protected]>
intel · Nov 12, 2024 · ea4702b · ea4702b
1 parent 2187c57
commit ea4702b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/BM/instruction-check/feature_list.py b/BM/instruction-check/feature_list.py
@@ -17,6 +17,10 @@
         "cpuid": ['1', '0', '0', '0', 'c', '26'],
         "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF"}
     },
+    "MONITOR": {
+        "cpuid": ['1', '0', '3', '0', 'c', '3'],
+        "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF"}
+    },
     "FSGSBASE": {
         "cpuid": ['7', '0', '0', '0', 'b', '0'],
         "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF"}

diff --git a/KVM/qemu/x86_cpu_flags.cfg b/KVM/qemu/x86_cpu_flags.cfg
@@ -79,6 +79,14 @@
                 - disable:
                     cpu_model_flags = ",-tsc-deadline"
                     no_flags = "tsc_deadline_timer"
+        - mwait:
+            flags = "monitor"
+            variants:
+                - enable:
+                    cpu-pm = on
+                - disable:
+                    cpu-pm = off
+                    no_flags = "monitor"
     variants:
         - vm:
             # Only No-TDVM supports soft reboot

diff --git a/KVM/qemu/x86_cpuid.cfg b/KVM/qemu/x86_cpuid.cfg
@@ -76,6 +76,9 @@
             features = "VPCLMULQDQ"
         - sha_ni:
             features = "SHA_NI"
+        - mwait:
+            features = "MONITOR"
+            cpu-pm = on
     variants:
         - vm:
         - tdvm: