cpu config: add helper to get the default CPU type

[qemu-server.git] / PVE / QemuServer / CPUConfig.pm

diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm
index fb0861bb6ab641cc07c4801f0b55f02d05ea717c..4be526267457ee2408fe91823ddea496ce162156 100644 (file)
--- a/PVE/QemuServer/CPUConfig.pm
+++ b/PVE/QemuServer/CPUConfig.pm
@@ -31,6 +31,26 @@ sub load_custom_model_conf {
     return cfs_read_file($default_filename);
 }
 
+#builtin models : reported-model is mandatory
+my $builtin_models = {
+    'x86-64-v2' => {
+       'reported-model' => 'qemu64',
+       flags => "+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
+    },
+    'x86-64-v2-AES' => {
+       'reported-model' => 'qemu64',
+       flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
+    },
+    'x86-64-v3' => {
+       'reported-model' => 'qemu64',
+       flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave",
+    },
+    'x86-64-v4' => {
+       'reported-model' => 'qemu64',
+       flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave;+avx512f;+avx512bw;+avx512cd;+avx512dq;+avx512vl",
+    },
+};
+
 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',
@@ -66,16 +86,31 @@ my $cpu_vendor_list = {
     'Skylake-Client' => 'GenuineIntel',
     'Skylake-Client-IBRS' => 'GenuineIntel',
     'Skylake-Client-noTSX-IBRS' => 'GenuineIntel',
+    'Skylake-Client-v4' => 'GenuineIntel',
     'Skylake-Server' => 'GenuineIntel',
     'Skylake-Server-IBRS' => 'GenuineIntel',
     'Skylake-Server-noTSX-IBRS' => 'GenuineIntel',
+    'Skylake-Server-v4' => 'GenuineIntel',
+    'Skylake-Server-v5' => 'GenuineIntel',
     'Cascadelake-Server' => 'GenuineIntel',
+    'Cascadelake-Server-v2' => 'GenuineIntel',
     'Cascadelake-Server-noTSX' => 'GenuineIntel',
+    'Cascadelake-Server-v4' => 'GenuineIntel',
+    'Cascadelake-Server-v5' => 'GenuineIntel',
+    'Cooperlake' => 'GenuineIntel',
+    'Cooperlake-v2' => 'GenuineIntel',
     KnightsMill => 'GenuineIntel',
     'Icelake-Client' => 'GenuineIntel', # depreacated, removed with QEMU 7.1
     'Icelake-Client-noTSX' => 'GenuineIntel', # depreacated, removed with QEMU 7.1
     'Icelake-Server' => 'GenuineIntel',
     'Icelake-Server-noTSX' => 'GenuineIntel',
+    'Icelake-Server-v3' => 'GenuineIntel',
+    'Icelake-Server-v4' => 'GenuineIntel',
+    'Icelake-Server-v5' => 'GenuineIntel',
+    'Icelake-Server-v6' => 'GenuineIntel',
+    'SapphireRapids' => 'GenuineIntel',
+    'SapphireRapids-v2' => 'GenuineIntel',
+    'GraniteRapids' => 'GenuineIntel',
 
     # AMD CPUs
     athlon => 'AuthenticAMD',
@@ -87,8 +122,15 @@ my $cpu_vendor_list = {
     Opteron_G5 => 'AuthenticAMD',
     EPYC => 'AuthenticAMD',
     'EPYC-IBPB' => 'AuthenticAMD',
+    'EPYC-v3' => 'AuthenticAMD',
+    'EPYC-v4' => 'AuthenticAMD',
     'EPYC-Rome' => 'AuthenticAMD',
+    'EPYC-Rome-v2' => 'AuthenticAMD',
+    'EPYC-Rome-v3' => 'AuthenticAMD',
+    'EPYC-Rome-v4' => 'AuthenticAMD',
     'EPYC-Milan' => 'AuthenticAMD',
+    'EPYC-Milan-v2' => 'AuthenticAMD',
+    'EPYC-Genoa' => 'AuthenticAMD',
 
     # generic types, use vendor from host node
     host => 'default',
@@ -212,7 +254,7 @@ sub validate_vm_cpu_conf {
        get_custom_model($cputype);
     } else {
        die "Built-in cputype '$cputype' is not defined (missing 'custom-' prefix?)\n"
-           if !defined($cpu_vendor_list->{$cputype});
+           if !defined($cpu_vendor_list->{$cputype}) && !defined($builtin_models->{$cputype});
     }
 
     # in a VM-specific config, certain properties are limited/forbidden
@@ -302,6 +344,16 @@ sub get_cpu_models {
        };
     }
 
+    for my $model (keys %{$builtin_models}) {
+       my $reported_model = $builtin_models->{$model}->{'reported-model'};
+       my $vendor = $cpu_vendor_list->{$reported_model};
+       push @$models, {
+           name => $model,
+           custom => 0,
+           vendor => $vendor,
+       };
+    }
+
     return $models if !$include_custom;
 
     my $conf = load_custom_model_conf();
@@ -353,13 +405,15 @@ sub print_cpu_device {
     my ($conf, $id) = @_;
 
     my $kvm = $conf->{kvm} // 1;
-    my $cpu = $kvm ? "kvm64" : "qemu64";
+    my $cpu = get_default_cpu_type('x86_64', $kvm);
     if (my $cputype = $conf->{cpu}) {
        my $cpuconf = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $cputype)
            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'};
+       } elsif (is_custom_model($cputype)) {
            my $custom_cpu = get_custom_model($cpu);
 
            $cpu = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
@@ -461,21 +515,21 @@ sub parse_cpuflag_list {
 sub get_cpu_options {
     my ($conf, $arch, $kvm, $kvm_off, $machine_version, $winversion, $gpu_passthrough) = @_;
 
-    my $cputype = $kvm ? "kvm64" : "qemu64";
-    if ($arch eq 'aarch64') {
-       $cputype = 'cortex-a57';
-    }
+    my $cputype = get_default_cpu_type($arch, $kvm);
 
     my $cpu = {};
     my $custom_cpu;
+    my $builtin_cpu;
     my $hv_vendor_id;
     if (my $cpu_prop_str = $conf->{cpu}) {
        $cpu = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $cpu_prop_str)
            or die "Cannot parse cpu description: $cpu_prop_str\n";
 
        $cputype = $cpu->{cputype};
-
-       if (is_custom_model($cputype)) {
+       if (my $model = $builtin_models->{$cputype}) {
+           $cputype = $model->{'reported-model'};
+           $builtin_cpu->{flags} = $model->{'flags'};
+       } elsif (is_custom_model($cputype)) {
            $custom_cpu = get_custom_model($cputype);
 
            $cputype = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
@@ -504,6 +558,9 @@ sub get_cpu_options {
        )
        : undef;
 
+    my $builtin_cputype_flags = parse_cpuflag_list(
+       $cpu_flag_any_re, "set by builtin CPU model", $builtin_cpu->{flags});
+
     my $custom_cputype_flags = parse_cpuflag_list(
        $cpu_flag_any_re, "set by custom CPU model", $custom_cpu->{flags});
 
@@ -534,7 +591,7 @@ sub get_cpu_options {
 
     # will be resolved in parameter order
     $cpu_str .= resolve_cpu_flags(
-       $pve_flags, $hv_flags, $custom_cputype_flags, $vm_flags, $pve_forced_flags);
+       $pve_flags, $hv_flags, $builtin_cputype_flags, $custom_cputype_flags, $vm_flags, $pve_forced_flags);
 
     my $phys_bits = '';
     foreach my $conf ($custom_cpu, $cpu) {
@@ -659,6 +716,15 @@ sub get_cpu_from_running_vm {
     return $1;
 }
 
+sub get_default_cpu_type {
+    my ($arch, $kvm) = @_;
+
+    my $cputype = $kvm ? 'kvm64' : 'qemu64';
+    $cputype = 'cortex-a57' if $arch eq 'aarch64';
+
+    return $cputype;
+}
+
 __PACKAGE__->register();
 __PACKAGE__->init();