[LKVS Sync] sync/KVM-20260914 form 20260429

BM/instruction-check/feature_list.py

@@ -34,6 +34,10 @@
         "cpuid": ['7', '0', '0', '0', 'b', '15'],
         "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF"}
     },
+    "AVX2": {
+        "cpuid": ['7', '0', '0', '0', 'b', '5'],
+        "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF"}
+    },
     "AVX512_F": {
         "cpuid": ['7', '0', '0', '0', 'b', '16'],
         "platforms": {"SPR", "EMR", "GNR"}
@@ -142,6 +146,10 @@
         "cpuid": ['7', '0', '0', '0', 'd', '8'],
         "platforms": {}
     },
+    "AVX512_BF16": {
+        "cpuid": ['7', '0', '1', '0', 'a', '5'],
+        "platforms": {"SPR", "EMR", "GNR", "DMR"}
+    },
     "SERIALIZE": {
         "cpuid": ['7', '0', '0', '0', 'd', '14'],
         "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF"}
@@ -294,17 +302,33 @@
         "cpuid": ['1E', '0', '1', '0', 'a', '4'],
         "platforms": {"DMR"}
     },
-    "AMX_TF32": {
-        "cpuid": ['1E', '0', '1', '0', 'a', '6'],
-        "platforms": {"DMR"}
-    },
     "AMX_AVX512": {
         "cpuid": ['1E', '0', '1', '0', 'a', '7'],
         "platforms": {"DMR"}
     },
     "AMX_MOVRS": {
         "cpuid": ['1E', '0', '1', '0', 'a', '8'],
         "platforms": {"DMR"}
+    },
+    "ADX": {
+        "cpuid": ['7', '0', '0', '0', 'b', '19'],
+        "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF", "DMR"}
+    },
+    "VMX": {
+        "cpuid": ['1', '0', '0', '0', 'c', '5'],
+        "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF", "DMR"}
+    },
+    "IBRS": {
+        "cpuid": ['7', '0', '0', '0', 'd', '26'],
+        "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF", "DMR"}
+    },
+    "ARCH_CAPABILITIES": {
+        "cpuid": ['7', '0', '0', '0', 'd', '29'],
+        "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF", "DMR"}
+    },
+    "SSBD": {
+        "cpuid": ['7', '0', '0', '0', 'd', '31'],
+        "platforms": {"SPR", "EMR", "GNR", "SRF", "CWF", "DMR"}
     }
     # Add more feature_info here
 }

BM/tdx-compliance/tdx-compliance.h

@@ -11,6 +11,11 @@
 #define X86_CR4_CET_BIT			23 /* enable Control-flow Enforcement Technology */
 #define X86_CR4_CET			_BITUL(X86_CR4_CET_BIT)
 #define MSR_IA32_VMX_PROCBASED_CTLS3	0x00000492
+/* Compatibility: kzalloc_obj may not be available in older kernels */
+#ifndef kzalloc_obj
+#define kzalloc_obj(type, flags)	((type *)kzalloc(sizeof(type), flags))
+#endif
+
 #define MSR_IA32_U_CET			0x000006a0 /* user mode cet */
 #define MSR_IA32_S_CET			0x000006a2 /* kernel mode cet */
 #define MSR_IA32_PL0_SSP		0x000006a4 /* ring-0 shadow stack pointer */
@@ -98,9 +103,9 @@ struct tdx_module_args {
 };
 
 /* Used to communicate with the TDX module */
-extern u64 __tdcall(u64 fn, struct tdx_module_args *args);
-extern u64 __tdcall_ret(u64 fn, struct tdx_module_args *args);
-extern u64 __tdcall_saved_ret(u64 fn, struct tdx_module_args *args);
+u64 __tdcall(u64 fn, struct tdx_module_args *args);
+u64 __tdcall_ret(u64 fn, struct tdx_module_args *args);
+u64 __tdcall_saved_ret(u64 fn, struct tdx_module_args *args);
 u64 tdcall(u64 fn, struct tdx_module_args *args);
 
 /* Used to request services from the VMM */

BM/topology/tests-cache_topo

@@ -0,0 +1,10 @@
+# This file collects the CPU Topology case that verifies DMR cache topology
+# (leaf 0x04H L1/L2/L3 sharing) inside a guest booted with a single socket
+# DMR topology:
+#   -smp cpus=192,sockets=1,dies=4,modules=24,cores=2,threads=1 \
+#   -machine smp-cache.0.cache=l2,smp-cache.0.topology=module
+# @hw_dep:
+# @other_dep:
+# @other_warn: which cpuid 2>/dev/null @ cpuid tool is required
+
+cpu_topology.sh -t verify_qemu_dmr_cache_topo_cpuid

BM/topology/tests-cores_per_socket

@@ -0,0 +1,8 @@
+# This file collects the CPU Topology case that verifies the number of cores
+# per socket is consistent between sysfs and lscpu inside a guest booted with
+# a two sockets topology:
+#   -smp cpus=192,sockets=2,dies=2,modules=24,cores=2,threads=1
+# @hw_dep:
+# @other_dep:
+
+cpu_topology.sh -t verify_cores_per_socket

BM/topology/tests-die_cluster_1

@@ -0,0 +1,10 @@
+# This file collects the CPU Topology case that verifies DMR CPUID 0x1f
+# level types (thread/core/module/die) inside a guest booted with a single
+# socket DMR topology:
+#   -smp cpus=192,sockets=1,dies=4,modules=24,cores=2,threads=1 \
+#   -machine smp-cache.0.cache=l2,smp-cache.0.topology=module
+# @hw_dep:
+# @other_dep:
+# @other_warn: which cpuid 2>/dev/null @ cpuid tool is required
+
+cpu_topology.sh -t verify_qemu_dmr_one_socket_cpuid

BM/topology/tests-die_cluster_2

@@ -0,0 +1,10 @@
+# This file collects the CPU Topology case that verifies DMR CPUID 0x1f
+# level types (thread/core/module/die) inside a guest booted with a two
+# sockets DMR topology:
+#   -smp cpus=192,sockets=2,dies=2,modules=24,cores=2,threads=1 \
+#   -machine smp-cache.0.cache=l2,smp-cache.0.topology=module
+# @hw_dep:
+# @other_dep:
+# @other_warn: which cpuid 2>/dev/null @ cpuid tool is required
+
+cpu_topology.sh -t verify_qemu_dmr_two_sockets_cpuid

BM/topology/tests-sockets_number

@@ -0,0 +1,9 @@
+# This file collects the CPU Topology case that verifies the number of sockets
+# is consistent between lscpu and sysfs (and matches the NUMA node count)
+# inside a guest booted with a two sockets, two NUMA nodes topology:
+#   -smp cpus=192,sockets=2,dies=2,modules=24,cores=2,threads=1
+#   with one NUMA node per socket
+# @hw_dep:
+# @other_dep:
+
+cpu_topology.sh -t verify_socket_num

KVM/docs/tdx_temp.cfg

@@ -34,6 +34,8 @@ image_name = /root/avocado/data/avocado-vt/images/rhel-guest-image-9.4-20240419.
 image_format = qcow2
 #image_name = /root/avocado/data/avocado-vt/images/tdx_guest
 #image_format = raw
+# image_name = /root/avocado/data/avocado-vt/images/ia32e_win11
+# image_format = raw
 
 #For RHEL9.4 guest
 shell_prompt = "^\[.*\][\#\$]\s*$"
@@ -74,9 +76,13 @@ only x86_64
 only RHEL.9
 #For Ubuntu guest
 #only Linux.Ubuntu.14.04.3-server.x86_64
+#For Windows guest
+#only Windows
+#only Win10
 only smallpages
 only virtio_blk
 only qcow2
+#only raw
 only bridge
 only virtio_net
 only no_virtio_rng

KVM/qemu/apic_timer_v.cfg

@@ -1,5 +1,7 @@
 - apic_timer_v:
     type = apic_timer_v
+    # Default value for centos image, you can overwrite it in runtime cfg for other OS image.
+    shell_prompt = "^\[.*\][\#\$]\s*$"
     vms = ""
     auto_cpu_policy = "virttest"
     # MSR_IA32_VMX_PROCBASED_CTLS3 (0x492) VMX_FEATURE_GUEST_APIC_TIMER feature flag (bit8)

KVM/qemu/boot_check.cfg

@@ -2,12 +2,10 @@
     type = boot_check
     virt_test_type = qemu
     vm_accelerator = kvm
-    # Don't create/remove guest images
-    force_create_image = no
-    remove_image = no
     start_vm = no
     # Stop VM after testing
     kill_vm = yes
+    # Default value for centos image, you can overwrite it in runtime cfg for other OS image.
     shell_prompt = "^\[.*\][\#\$]\s*$"
     vga = std
     variants:
@@ -33,6 +31,13 @@
         - 1G:
             no 208_cpu, 256_cpu, 288_cpu
             mem = 1024
+        - 2031M:
+            # 2031 is not aligned to the guest memory block size, so the
+            # in-guest total memory can not match it exactly. Only require
+            # the guest to boot up successfully with this memory size.
+            only 1_cpu
+            mem = 2031
+            check_mem = no
         - 4G:
             mem = 4096
         - 16G:

KVM/qemu/boot_repeat.cfg

@@ -1,4 +1,6 @@
 - boot_repeat:
+    # Default value for centos image, you can overwrite it in runtime cfg for other OS image.
+    shell_prompt = "^\[.*\][\#\$]\s*$"
     variants:
         - one_vm_repeat:
             virt_test_type = qemu

KVM/qemu/boot_vm_in_hugepage.cfg

@@ -2,6 +2,8 @@
     virt_test_type = qemu
     type = boot
     kill_vm_on_error = yes
+    # Default value for centos image, you can overwrite it in runtime cfg for other OS image.
+    shell_prompt = "^\[.*\][\#\$]\s*$"
     login_timeout = 240
     setup_hugepages = yes
     pre_command_noncritical = yes

KVM/qemu/boot_win11.cfg

@@ -0,0 +1,19 @@
+- boot_win11:
+    type = boot_win11
+    # In this testcase you should change image_name & image format into correct format for windows guest.
+    # Also you should change `display` parameter among (vnc, sdl, spice) according to your machine config
+    # and comment `display` parameter in your avocado config file.
+    display = "vnc"
+    # Finally comment `only RHEL.9` and `only qcow2`, so as other similar parameter which limits
+    # host os_variant or image type, add following contents to your avocado config file:
+    # only Windows
+    # only Win10
+    # only raw
+    virt_test_type = qemu
+    vm_accelerator = kvm
+    start_vm = no
+    # Stop VM after testing
+    kill_vm = yes
+    vga = std
+    auto_cpu_model = "no"
+    cpu_model = host

KVM/qemu/buslock_de.cfg

@@ -3,10 +3,10 @@
     only Linux
     virt_test_type = qemu
     vm_accelerator = kvm
-    force_create_image = no
-    remove_image = no
     start_vm = yes
     kill_vm = yes
+    # Default value for centos image, you can overwrite it in runtime cfg for other OS image.
+    shell_prompt = "^\[.*\][\#\$]\s*$"
     auto_cpu_model = "no"
     cpu_model = host
     vga = std

KVM/qemu/buslock_ve.cfg

@@ -0,0 +1,41 @@
+- buslock_ve:
+    type = buslock_ve
+    only Linux
+    virt_test_type = qemu
+    vm_accelerator = kvm
+    start_vm = no
+    kill_vm = yes
+    # Default value for centos image, you can overwrite it in runtime cfg for other OS image.
+    shell_prompt = "^\[.*\][\#\$]\s*$"
+    auto_cpu_model = "no"
+    cpu_model = host
+    vga = std
+    test_dir = '/tmp'
+    login_timeout = 240
+    deps_subdir = "bus_lock"
+    bus_lock_common_file = bus_lock_common.h
+    # IA32_VMX_PROCBASED_CTLS2 MSR must have bit 62 (BUS_LOCK_DETECT) set on host.
+    host_msr_probe = "rdmsr 0x48b -0 --bitfield 62:62"
+    variants:
+        - buslock_ve_01:
+            buslock_ve_action = bus_lock_exit
+            machine_type_extra_params = "bus-lock-ratelimit=20"
+            bus_lock_source_file = bus_lock.c
+            bus_lock_exec_file = bus_lock.out
+            trace_settle_time = 3
+        - buslock_ve_02:
+            buslock_ve_action = ratelimit_effect
+            bus_lock_source_file = bus_lock_ct.c
+            bus_lock_exec_file = bus_lock_ct.out
+            # Modernized: use the named split-locks PMU event instead of the
+            # legacy raw SQ_MISC encoding (cpu/event=0x2c,umask=0x10/), which
+            # no longer exists on current Intel server CPUs. bus_lock.split_locks
+            # counts split locks issued by any core and is available on the
+            # HW target used for validation.
+            perf_event = "bus_lock.split_locks"
+            perf_interval_ms = 1000
+            perf_interval_count = 2
+            # Two runs: baseline (no ratelimit) then bus-lock-ratelimit=20.
+            ratelimit_runs = "baseline ratelimited"
+            machine_extra_baseline = ""
+            machine_extra_ratelimited = "bus-lock-ratelimit=20"

KVM/qemu/cache_model.cfg

@@ -0,0 +1,38 @@
+- cache_model:
+    type = cache_model
+    virt_test_type = qemu
+    vm_accelerator = kvm
+    force_create_image = no
+    remove_image = no
+    image_snapshot = yes
+    start_vm = no
+    kill_vm = yes
+    shell_prompt = "^\[.*\][\#\$]\s*$"
+    vga = std
+    auto_cpu_model = no
+    # avocado-vt has no 'modules' knob. It builds -smp from
+    # sockets/dies/cores/threads only. We provide the module axis via
+    # extra_params '-smp modules=2', which QEMU merges into the same
+    # -smp option, so the final product is:
+    #   sockets(2) * dies(1) * modules(2) * cores(16) * threads(2) = 128
+    smp = 128
+    vcpu_maxcpus = 128
+    vcpu_sockets = 2
+    vcpu_cores = 16
+    vcpu_threads = 2
+    extra_params += " -smp modules=2"
+    # Guest package that provides the `cpuid` tool (used for CPUID.4 check)
+    cpuid_pkg = cpuid
+    variants:
+        - srf:
+            cpu_model = SierraForest-v6
+            # Expected CPUID.4 sharing / associativity for cache 0..3
+            # (L1d, L1i, L2, L3). Format: 8 space-separated hex values:
+            # c0_sharing c0_assoc c1_sharing c1_assoc c2_sharing c2_assoc c3_sharing c3_assoc
+            cpuid_cache_expect = "0x1 0x8 0x1 0x8 0x1f 0x10 0x3f 0xc"
+        - gnr:
+            cpu_model = GraniteRapids-v7
+            cpuid_cache_expect = "0x1 0xc 0x1 0x10 0x1 0x10 0x3f 0x10"
+        - spr:
+            cpu_model = SapphireRapids-v8
+            cpuid_cache_expect = "0x1 0xc 0x1 0x8 0x1 0x10 0x3f 0xf"

KVM/qemu/cpu_aia.cfg

@@ -0,0 +1,19 @@
+- cpu_aia:
+    type = cpu_aia
+    virt_test_type = qemu
+    vm_accelerator = kvm
+    start_vm = no
+    # Stop VM after testing
+    kill_vm = yes
+    # Default value for centos image, you can overwrite it in runtime cfg for other OS image.
+    shell_prompt = "^\[.*\][\#\$]\s*$"
+    vga = std
+    auto_cpu_model = "no"
+    cpu_model = host
+    variants:
+        - waitpkg:
+            test_command = "tpause umwait umonitor"
+        - movdir64b:
+            test_command = "movdir64b"
+        - movdiri:
+            test_command = "movdiri"