[pve-devel] [PATCH v2 qemu-server 1/1] cpuconfig: add new x86-64-vX models

[Alexandre Derumier <aderumier@odiso.com>]

https://lore.kernel.org/all/20210526144038.278899-1-berrange@redhat.com/T/
"
In 2020, AMD, Intel, Red Hat, and SUSE worked together to define
three microarchitecture levels on top of the historical x86-64
baseline:

  * x86-64:    original x86_64 baseline instruction set
  * x86-64-v2: vector instructions up to Streaming SIMD
               Extensions 4.2 (SSE4.2)  and Supplemental
               Streaming SIMD Extensions 3 (SSSE3), the
               POPCNT instruction, and CMPXCHG16B
  * x86-64-v3: vector instructions up to AVX2, MOVBE,
               and additional bit-manipulation instructions.
  * x86-64-v4: vector instructions from some of the
               AVX-512 variants.
"

This patch add new builtin model derivated from original models,
to be compatible between intel/amd.

x86-64-v1 : Derived from Opteron_G1, minus vme
x86-64-v2 : Derived from Nehalem, -vme,+aes

min intel: Westmere (because of aes)
min amd : Opteron_G3

x86-64-v3 : Derived from Haswell-noTSX, -pcid,-erms,-invpcid,-tsc-deadline,-x2apic,-pclmulqdq,+aes

min intel: Haswell
min amd : EPYC_v1

x86-64-v4 : Derived from Skylake-Server-noTSX-IBRS, -spec-ctrl

min intel: Skylake
min amd : EPYC_v4

(v4 model not yet exposed, because not yet tested, other models have been tested)

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 PVE/QemuServer/CPUConfig.pm | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm
index fb0861b..54bbd55 100644
--- a/PVE/QemuServer/CPUConfig.pm
+++ b/PVE/QemuServer/CPUConfig.pm
@@ -31,6 +31,25 @@ sub load_custom_model_conf {
     return cfs_read_file($default_filename);
 }
 
+my $builtin_models = {
+    'x86-64-v1' => {
+	'reported-model' => 'Opteron_G1',
+	flags => "-vme;-svm;-vmx",
+    },
+    'x86-64-v2' => {
+	'reported-model' => 'Nehalem',
+	flags => "+aes;-svm;-vmx",
+    },
+    'x86-64-v3' => {
+	'reported-model' => 'Haswell-noTSX',
+	flags => "+aes;-pcid;-erms;-invpcid;-tsc-deadline;-x2apic;-pclmulqdq;-svm;-vmx",
+    },
+#    'x86-64-v4' => {
+#	'reported-model' => 'Skylake-Server-noTSX-IBRS',
+#	flags => "+aes;-spec-ctrl;-svm;-vmx",
+#    },
+};
+
 my $depreacated_cpu_map = {
     # there never was such a client CPU, so map it to the server one for backward compat
     'Icelake-Client' => 'Icelake-Server',
@@ -96,6 +115,9 @@ my $cpu_vendor_list = {
     kvm64 => 'default',
     qemu32 => 'default',
     qemu64 => 'default',
+    'x86-64-v1' => 'default',
+    'x86-64-v2' => 'default',
+    'x86-64-v3' => 'default',
     max => 'default',
 };
 
@@ -359,7 +381,10 @@ sub print_cpu_device {
 	    or die "Cannot parse cpu description: $cputype\n";
 	$cpu = $cpuconf->{cputype};
 
-	if (is_custom_model($cpu)) {
+	if (my $model = $builtin_models->{$cpu}) {
+	    $cpu = $model->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
+	}
+	if (is_custom_model($cputype)) {
 	    my $custom_cpu = get_custom_model($cpu);
 
 	    $cpu = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
@@ -474,7 +499,11 @@ sub get_cpu_options {
 	    or die "Cannot parse cpu description: $cpu_prop_str\n";
 
 	$cputype = $cpu->{cputype};
-
+	if (my $model = $builtin_models->{$cputype}) {
+	    my $model = $builtin_models->{$cputype};
+	    $cputype = $model->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
+	    $custom_cpu->{flags} = $model->{'flags'};
+	}
 	if (is_custom_model($cputype)) {
 	    $custom_cpu = get_custom_model($cputype);
 
-- 
2.30.2