From: Jiri Denemark Date: Thu, 6 Nov 2025 08:33:16 +0000 (+0100) Subject: cpu_map: Add EPYC-Turin CPU model X-Git-Tag: CVE-2025-12748~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee95c9d7d131ee56751e646ddb2c02dfd12a6ec8;p=thirdparty%2Flibvirt.git cpu_map: Add EPYC-Turin CPU model Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index e73e5d5ae8..a0985511f9 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -173,6 +173,8 @@ + + diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 34b7bfac36..a623b51e09 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -78,6 +78,8 @@ cpumap_data = [ 'x86_EPYC-Rome-v4.xml', 'x86_EPYC-Rome-v5.xml', 'x86_EPYC-Rome.xml', + 'x86_EPYC-Turin-v1.xml', + 'x86_EPYC-Turin.xml', 'x86_EPYC-v1.xml', 'x86_EPYC-v2.xml', 'x86_EPYC-v3.xml', diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 6d577e7316..5b3656e4d7 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -81,6 +81,7 @@ def translate_feature(name, model): "CPUID_7_0_EDX_SPEC_CTRL_SSBD": "ssbd", "CPUID_7_0_EDX_STIBP": "stibp", "CPUID_7_0_EDX_TSX_LDTRK": "tsx-ldtrk", + "CPUID_7_0_EDX_AVX512_VP2INTERSECT": "avx512-vp2intersect", "CPUID_7_1_EAX_AMX_FP16": "amx-fp16", "CPUID_7_1_EAX_AVX512_BF16": "avx512-bf16", "CPUID_7_1_EAX_AVX_IFMA": "avx-ifma", @@ -130,6 +131,9 @@ def translate_feature(name, model): "CPUID_8000_0021_EAX_VERW_CLEAR": "verw-clear", "CPUID_8000_0021_ECX_TSA_SQ_NO": "tsa-sq-no", "CPUID_8000_0021_ECX_TSA_L1_NO": "tsa-l1-no", + "CPUID_8000_0021_EAX_SBPB": "sbpb", + "CPUID_8000_0021_EAX_IBPB_BRTYPE": "ibpb-brtype", + "CPUID_8000_0021_EAX_SRSO_USER_KERNEL_NO": "srso-user-kernel-no", "CPUID_8000_0022_EAX_PERFMON_V2": "perfmon-v2", "CPUID_ACPI": "acpi", "CPUID_APIC": "apic", diff --git a/src/cpu_map/x86_EPYC-Turin-v1.xml b/src/cpu_map/x86_EPYC-Turin-v1.xml new file mode 100644 index 0000000000..0f7402f022 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Turin-v1.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/cpu_map/x86_EPYC-Turin.xml b/src/cpu_map/x86_EPYC-Turin.xml new file mode 100644 index 0000000000..c7524da247 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Turin.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml index 19f2abdbc9..c685a4d34b 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-guest.xml @@ -1,5 +1,5 @@ - EPYC-Genoa + EPYC-Turin AMD @@ -8,11 +8,7 @@ - - - - @@ -23,27 +19,11 @@ - - - - - - - - - - - - - - - - diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-json.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-json.xml index a37180d4b2..1718323541 100644 --- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-json.xml +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-9950X-16-Core-json.xml @@ -1,36 +1,16 @@ - EPYC-Genoa + EPYC-Turin AMD - - - - - - - - - - - - - - - - - - - - diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml index ffee527ff4..ae7c20c4cb 100644 --- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64+inteltdx.xml @@ -387,6 +387,56 @@ + EPYC-Turin + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-Turin-v1 + + + + + + + + + + + + + + + + + + + + + + + + EPYC-v1 diff --git a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml index b5d745c4ec..503429daa5 100644 --- a/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-q35.x86_64.xml @@ -602,6 +602,84 @@ + EPYC-Turin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-Turin-v1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-v1 EPYC-v2 EPYC-v3 diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml index 2d40cf5228..fd1740133c 100644 --- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64+inteltdx.xml @@ -780,6 +780,118 @@ + EPYC-Turin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-Turin-v1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-v1 diff --git a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml index 6bb394c533..289ecc903d 100644 --- a/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0-tcg.x86_64.xml @@ -780,6 +780,118 @@ + EPYC-Turin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-Turin-v1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-v1 diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml index 7e1ec7e590..cdf4390c6c 100644 --- a/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml +++ b/tests/domaincapsdata/qemu_10.1.0.x86_64+inteltdx.xml @@ -386,6 +386,56 @@ + EPYC-Turin + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-Turin-v1 + + + + + + + + + + + + + + + + + + + + + + + + EPYC-v1 diff --git a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml index af75d3fd36..645f4c83ab 100644 --- a/tests/domaincapsdata/qemu_10.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.1.0.x86_64.xml @@ -601,6 +601,84 @@ + EPYC-Turin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-Turin-v1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-v1 EPYC-v2 EPYC-v3 diff --git a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml index 39c65c061b..b5881d5ba4 100644 --- a/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-q35.x86_64.xml @@ -41,42 +41,22 @@ - EPYC-Genoa + EPYC-Turin AMD - - - - - - - - - - - - - - - - - - - - @@ -302,6 +282,16 @@ EPYC-Rome-v3 EPYC-Rome-v4 EPYC-Rome-v5 + EPYC-Turin + + + + + EPYC-Turin-v1 + + + + EPYC-v1 EPYC-v2 EPYC-v3 diff --git a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml index 4cb64e95df..802c8f3a51 100644 --- a/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0-tcg.x86_64.xml @@ -780,6 +780,118 @@ + EPYC-Turin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-Turin-v1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EPYC-v1 diff --git a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml index 71c1767f1b..d196ab09f9 100644 --- a/tests/domaincapsdata/qemu_10.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_10.2.0.x86_64.xml @@ -40,42 +40,22 @@ - EPYC-Genoa + EPYC-Turin AMD - - - - - - - - - - - - - - - - - - - - @@ -301,6 +281,16 @@ EPYC-Rome-v3 EPYC-Rome-v4 EPYC-Rome-v5 + EPYC-Turin + + + + + EPYC-Turin-v1 + + + + EPYC-v1 EPYC-v2 EPYC-v3 diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args index b25f7ee787..6afa8a4c2d 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu EPYC-Genoa,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,movdiri=on,movdir64b=on,avx512-vp2intersect=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,avx-vnni=on,cmp-legacy=on,overflow-recov=on,succor=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,fs-gs-base-ns=on,prefetchi=on,sbpb=on,ibpb-brtype=on,srso-user-kernel-no=on,tsa-sq-no=on,tsa-l1-no=on,perfmon-v2=on,pcid=off,la57=off \ +-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args index e9225ea0fa..ce60a39acc 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu EPYC-Genoa,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,movdiri=on,movdir64b=on,avx512-vp2intersect=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,avx-vnni=on,cmp-legacy=on,overflow-recov=on,succor=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,fs-gs-base-ns=on,prefetchi=on,sbpb=on,ibpb-brtype=on,srso-user-kernel-no=on,tsa-sq-no=on,tsa-l1-no=on,perfmon-v2=on,pcid=off,la57=off,abm=on,ds=on,invtsc=off \ +-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off,abm=on,ds=on,invtsc=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args index 345babd056..2bf920b9c7 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu EPYC-Genoa,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,movdiri=on,movdir64b=on,avx512-vp2intersect=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,avx-vnni=on,cmp-legacy=on,overflow-recov=on,succor=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,fs-gs-base-ns=on,prefetchi=on,sbpb=on,ibpb-brtype=on,srso-user-kernel-no=on,tsa-sq-no=on,tsa-l1-no=on,perfmon-v2=on,pcid=off,la57=off \ +-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args index b25f7ee787..6afa8a4c2d 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu EPYC-Genoa,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,movdiri=on,movdir64b=on,avx512-vp2intersect=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,avx-vnni=on,cmp-legacy=on,overflow-recov=on,succor=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,flushbyasid=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,fs-gs-base-ns=on,prefetchi=on,sbpb=on,ibpb-brtype=on,srso-user-kernel-no=on,tsa-sq-no=on,tsa-l1-no=on,perfmon-v2=on,pcid=off,la57=off \ +-cpu EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,cmp-legacy=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,la57=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \