X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FQemuServer%2FCPUConfig.pm;h=33f7524f59ceadd562f55a1bf72c3d03d38452f4;hb=HEAD;hp=20b82fc12d8cb0e990fe515b56d153964f1b32ba;hpb=5d008ad383f35697a2119f319c99976acba38d7f;p=qemu-server.git diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm index 20b82fc1..33f7524f 100644 --- a/PVE/QemuServer/CPUConfig.pm +++ b/PVE/QemuServer/CPUConfig.pm @@ -5,6 +5,7 @@ use warnings; use PVE::JSONSchema; use PVE::Cluster qw(cfs_register_file cfs_read_file); +use PVE::Tools qw(get_host_arch); use PVE::QemuServer::Helpers qw(min_version); use base qw(PVE::SectionConfig Exporter); @@ -12,23 +13,64 @@ use base qw(PVE::SectionConfig Exporter); our @EXPORT_OK = qw( print_cpu_device get_cpu_options +get_cpu_bitness +is_native_arch ); # under certain race-conditions, this module might be loaded before pve-cluster # has started completely, so ensure we don't prevent the FUSE mount with our dir -if (PVE::Cluster::check_cfs_is_mounted()) { +if (PVE::Cluster::check_cfs_is_mounted(1)) { mkdir "/etc/pve/virtual-guest"; } my $default_filename = "virtual-guest/cpu-models.conf"; -cfs_register_file($default_filename, - sub { PVE::QemuServer::CPUConfig->parse_config(@_); }, - sub { PVE::QemuServer::CPUConfig->write_config(@_); }); +cfs_register_file( + $default_filename, + sub { PVE::QemuServer::CPUConfig->parse_config(@_); }, + sub { PVE::QemuServer::CPUConfig->write_config(@_); }, +); 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', + 'Icelake-Client-noTSX' => 'Icelake-Server-noTSX', +}; + +my $cputypes_32bit = { + '486' => 1, + 'pentium' => 1, + 'pentium2' => 1, + 'pentium3' => 1, + 'coreduo' => 1, + 'athlon' => 1, + 'kvm32' => 1, + 'qemu32' => 1, +}; + my $cpu_vendor_list = { # Intel CPUs 486 => 'GenuineIntel', @@ -58,16 +100,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', - 'Icelake-Client-noTSX' => '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', @@ -79,6 +136,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', @@ -106,6 +172,8 @@ my @supported_cpu_flags = ( my $cpu_flag_supported_re = qr/([+-])(@{[join('|', @supported_cpu_flags)]})/; my $cpu_flag_any_re = qr/([+-])([a-zA-Z0-9\-_\.]+)/; +our $qemu_cmdline_cpu_re = qr/^((?>[+-]?[\w\-\._=]+,?)+)$/; + my $cpu_fmt = { cputype => { description => "Emulated CPU type. Can be default or custom name (custom model names must be prefixed with 'custom-').", @@ -117,7 +185,7 @@ my $cpu_fmt = { }, 'reported-model' => { description => "CPU model and vendor to report to the guest. Must be a QEMU/KVM supported model." - . " Only valid for custom CPU model definitions, default models will always report themselves to the guest OS.", + ." Only valid for custom CPU model definitions, default models will always report themselves to the guest OS.", type => 'string', enum => [ sort { lc("$a") cmp lc("$b") } keys %$cpu_vendor_list ], default => 'kvm64', @@ -137,71 +205,76 @@ my $cpu_fmt = { optional => 1, }, flags => { - description => "List of additional CPU flags separated by ';'." - . " Use '+FLAG' to enable, '-FLAG' to disable a flag." - . " Custom CPU models can specify any flag supported by" - . " QEMU/KVM, VM-specific flags must be from the following" - . " set for security reasons: @{[join(', ', @supported_cpu_flags)]}.", + description => "List of additional CPU flags separated by ';'. Use '+FLAG' to enable," + ." '-FLAG' to disable a flag. Custom CPU models can specify any flag supported by" + ." QEMU/KVM, VM-specific flags must be from the following set for security reasons: " + . join(', ', @supported_cpu_flags), format_description => '+FLAG[;-FLAG...]', type => 'string', pattern => qr/$cpu_flag_any_re(;$cpu_flag_any_re)*/, optional => 1, }, + 'phys-bits' => { + type => 'string', + format => 'pve-phys-bits', + format_description => '8-64|host', + description => "The physical memory address bits that are reported to the guest OS. Should" + ." be smaller or equal to the host's. Set to 'host' to use value from host CPU, but" + ." note that doing so will break live migration to CPUs with other values.", + optional => 1, + }, }; -# $cpu_fmt describes both the CPU config passed as part of a VM config, as well -# as the definition of a custom CPU model. There are some slight differences -# though, which we catch in the custom verification function below. -PVE::JSONSchema::register_format('pve-cpu-conf', \&parse_cpu_conf_basic); -sub parse_cpu_conf_basic { - my ($cpu_str, $noerr) = @_; - - my $cpu = eval { PVE::JSONSchema::parse_property_string($cpu_fmt, $cpu_str) }; - if ($@) { - die $@ if !$noerr; - return undef; +PVE::JSONSchema::register_format('pve-phys-bits', \&parse_phys_bits); +sub parse_phys_bits { + my ($str, $noerr) = @_; + + my $err_msg = "value must be an integer between 8 and 64 or 'host'\n"; + + if ($str !~ m/^(host|\d{1,2})$/) { + die $err_msg if !$noerr; + return; } - # required, but can't be forced in schema since it's encoded in section - # header for custom models - if (!$cpu->{cputype}) { - die "CPU is missing cputype\n" if !$noerr; - return undef; + if ($str =~ m/^\d+$/ && (int($str) < 8 || int($str) > 64)) { + die $err_msg if !$noerr; + return; } - return $cpu; + return $str; } -PVE::JSONSchema::register_format('pve-vm-cpu-conf', \&parse_vm_cpu_conf); -sub parse_vm_cpu_conf { - my ($cpu_str, $noerr) = @_; +# $cpu_fmt describes both the CPU config passed as part of a VM config, as well +# as the definition of a custom CPU model. There are some slight differences +# though, which we catch in the custom validation functions below. +PVE::JSONSchema::register_format('pve-cpu-conf', $cpu_fmt, \&validate_cpu_conf); +sub validate_cpu_conf { + my ($cpu) = @_; + # required, but can't be forced in schema since it's encoded in section header for custom models + die "CPU is missing cputype\n" if !$cpu->{cputype}; + return $cpu; +} +PVE::JSONSchema::register_format('pve-vm-cpu-conf', $cpu_fmt, \&validate_vm_cpu_conf); +sub validate_vm_cpu_conf { + my ($cpu) = @_; - my $cpu = parse_cpu_conf_basic($cpu_str, $noerr); - return undef if !$cpu; + validate_cpu_conf($cpu); my $cputype = $cpu->{cputype}; # a VM-specific config is only valid if the cputype exists if (is_custom_model($cputype)) { - eval { get_custom_model($cputype); }; - if ($@) { - die $@ if !$noerr; - return undef; - } + # dies on unknown model + get_custom_model($cputype); } else { - if (!defined($cpu_vendor_list->{$cputype})) { - die "Built-in cputype '$cputype' is not defined (missing 'custom-' prefix?)\n" if !$noerr; - return undef; - } + die "Built-in cputype '$cputype' is not defined (missing 'custom-' prefix?)\n" + if !defined($cpu_vendor_list->{$cputype}) && !defined($builtin_models->{$cputype}); } # in a VM-specific config, certain properties are limited/forbidden - if ($cpu->{flags} && $cpu->{flags} !~ m/$cpu_flag_supported_re(;$cpu_flag_supported_re)*/) { - die "VM-specific CPU flags must be a subset of: @{[join(', ', @supported_cpu_flags)]}\n" - if !$noerr; - return undef; - } + die "VM-specific CPU flags must be a subset of: @{[join(', ', @supported_cpu_flags)]}\n" + if ($cpu->{flags} && $cpu->{flags} !~ m/^$cpu_flag_supported_re(;$cpu_flag_supported_re)*$/); die "Property 'reported-model' not allowed in VM-specific CPU config.\n" if defined($cpu->{'reported-model'}); @@ -233,7 +306,7 @@ sub parse_section_header { my ($type, $sectionId, $errmsg, $config) = $class->SUPER::parse_section_header($line); - return undef if !$type; + return if !$type; return ($type, $sectionId, $errmsg, { # name is given by section header, and we can always prepend 'custom-' # since we're reading the custom CPU file @@ -262,6 +335,56 @@ sub write_config { $class->SUPER::write_config($filename, $cfg); } +sub add_cpu_json_properties { + my ($prop) = @_; + + foreach my $opt (keys %$cpu_fmt) { + $prop->{$opt} = $cpu_fmt->{$opt}; + } + + return $prop; +} + +sub get_cpu_models { + my ($include_custom) = @_; + + my $models = []; + + for my $default_model (keys %{$cpu_vendor_list}) { + push @$models, { + name => $default_model, + custom => 0, + vendor => $cpu_vendor_list->{$default_model}, + }; + } + + 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(); + for my $custom_model (keys %{$conf->{ids}}) { + my $reported_model = $conf->{ids}->{$custom_model}->{'reported-model'}; + $reported_model //= $cpu_fmt->{'reported-model'}->{default}; + my $vendor = $cpu_vendor_list->{$reported_model}; + push @$models, { + name => "custom-$custom_model", + custom => 1, + vendor => $vendor, + }; + } + + return $models; +} + sub is_custom_model { my ($cputype) = @_; return $cputype =~ m/^custom-/; @@ -278,7 +401,7 @@ sub get_custom_model { my $entry = $conf->{ids}->{$name}; if (!defined($entry)) { die "Custom cputype '$name' not found\n" if !$noerr; - return undef; + return; } my $model = {}; @@ -293,20 +416,27 @@ sub get_custom_model { # Print a QEMU device node for a given VM configuration for hotplugging CPUs sub print_cpu_device { - my ($conf, $id) = @_; + my ($conf, $arch, $id) = @_; + + # FIXME: hot plugging other architectures like our unofficial aarch64 support? + die "Hotplug of non x86_64 CPU not yet supported" if $arch ne 'x86_64'; - my $kvm = $conf->{kvm} // 1; - my $cpu = $kvm ? "kvm64" : "qemu64"; + my $kvm = $conf->{kvm} // is_native_arch($arch); + my $cpu = get_default_cpu_type('x86_64', $kvm); if (my $cputype = $conf->{cpu}) { - my $cpuconf = parse_cpu_conf_basic($cputype) + 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}; + $cpu = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default}; + } + if (my $replacement_type = $depreacated_cpu_map->{$cpu}) { + $cpu = $replacement_type; } } @@ -318,99 +448,329 @@ sub print_cpu_device { return "$cpu-x86_64-cpu,id=cpu$id,socket-id=$current_socket,core-id=$current_core,thread-id=0"; } -# Calculate QEMU's '-cpu' argument from a given VM configuration -sub get_cpu_options { - my ($conf, $arch, $kvm, $kvm_off, $machine_version, $winversion, $gpu_passthrough) = @_; - - my $cpuFlags = []; - my $ostype = $conf->{ostype}; - - my $cpu = $kvm ? "kvm64" : "qemu64"; - if ($arch eq 'aarch64') { - $cpu = 'cortex-a57'; - } - my $hv_vendor_id; - if (my $cputype = $conf->{cpu}) { - my $cpuconf = PVE::JSONSchema::parse_property_string($cpu_fmt, $cputype) - or die "Cannot parse cpu description: $cputype\n"; - $cpu = $cpuconf->{cputype}; - $kvm_off = 1 if $cpuconf->{hidden}; - $hv_vendor_id = $cpuconf->{'hv-vendor-id'}; - - if (defined(my $flags = $cpuconf->{flags})) { - push @$cpuFlags, split(";", $flags); +# Resolves multiple arrays of hashes representing CPU flags with metadata to a +# single string in QEMU "-cpu" compatible format. Later arrays have higher +# priority. +# +# Hashes take the following format: +# { +# aes => { +# op => "+", # defaults to "" if undefined +# reason => "to support AES acceleration", # for override warnings +# value => "" # needed for kvm=off (value: off) etc... +# }, +# ... +# } +sub resolve_cpu_flags { + my $flags = {}; + + for my $hash (@_) { + for my $flag_name (keys %$hash) { + my $flag = $hash->{$flag_name}; + my $old_flag = $flags->{$flag_name}; + + $flag->{op} //= ""; + $flag->{reason} //= "unknown origin"; + + if ($old_flag) { + my $value_changed = (defined($flag->{value}) != defined($old_flag->{value})) || + (defined($flag->{value}) && $flag->{value} ne $old_flag->{value}); + + if ($old_flag->{op} eq $flag->{op} && !$value_changed) { + $flags->{$flag_name}->{reason} .= " & $flag->{reason}"; + next; + } + + my $old = print_cpuflag_hash($flag_name, $flags->{$flag_name}); + my $new = print_cpuflag_hash($flag_name, $flag); + warn "warning: CPU flag/setting $new overwrites $old\n"; + } + + $flags->{$flag_name} = $flag; } } - push @$cpuFlags , '+lahf_lm' if $cpu eq 'kvm64' && $arch eq 'x86_64'; + my $flag_str = ''; + # sort for command line stability + for my $flag_name (sort keys %$flags) { + $flag_str .= ','; + $flag_str .= $flags->{$flag_name}->{op}; + $flag_str .= $flag_name; + $flag_str .= "=$flags->{$flag_name}->{value}" + if $flags->{$flag_name}->{value}; + } - push @$cpuFlags , '-x2apic' if $ostype && $ostype eq 'solaris'; + return $flag_str; +} - push @$cpuFlags, '+sep' if $cpu eq 'kvm64' || $cpu eq 'kvm32'; +sub print_cpuflag_hash { + my ($flag_name, $flag) = @_; + my $formatted = "'$flag->{op}$flag_name"; + $formatted .= "=$flag->{value}" if defined($flag->{value}); + $formatted .= "'"; + $formatted .= " ($flag->{reason})" if defined($flag->{reason}); + return $formatted; +} - push @$cpuFlags, '-rdtscp' if $cpu =~ m/^Opteron/; +sub parse_cpuflag_list { + my ($re, $reason, $flaglist) = @_; - if (min_version($machine_version, 2, 3) && $arch eq 'x86_64') { + my $res = {}; + return $res if !$flaglist; - push @$cpuFlags , '+kvm_pv_unhalt' if $kvm; - push @$cpuFlags , '+kvm_pv_eoi' if $kvm; + foreach my $flag (split(";", $flaglist)) { + if ($flag =~ m/^$re$/) { + $res->{$2} = { op => $1, reason => $reason }; + } } - add_hyperv_enlightenments($cpuFlags, $winversion, $machine_version, $conf->{bios}, $gpu_passthrough, $hv_vendor_id) if $kvm; + return $res; +} + +# Calculate QEMU's '-cpu' argument from a given VM configuration +sub get_cpu_options { + my ($conf, $arch, $kvm, $kvm_off, $machine_version, $winversion, $gpu_passthrough) = @_; + + my $cputype = get_default_cpu_type($arch, $kvm); - push @$cpuFlags, 'enforce' if $cpu ne 'host' && $kvm && $arch eq 'x86_64'; + 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 (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}; + $kvm_off = $custom_cpu->{hidden} if defined($custom_cpu->{hidden}); + $hv_vendor_id = $custom_cpu->{'hv-vendor-id'}; + } - push @$cpuFlags, 'kvm=off' if $kvm_off; + if (my $replacement_type = $depreacated_cpu_map->{$cputype}) { + $cputype = $replacement_type; + } - if (my $cpu_vendor = $cpu_vendor_list->{$cpu}) { - push @$cpuFlags, "vendor=${cpu_vendor}" - if $cpu_vendor ne 'default'; + # VM-specific settings override custom CPU config + $kvm_off = $cpu->{hidden} if defined($cpu->{hidden}); + $hv_vendor_id = $cpu->{'hv-vendor-id'} if defined($cpu->{'hv-vendor-id'}); + } + + my $pve_flags = get_pve_cpu_flags($conf, $kvm, $cputype, $arch, $machine_version); + + my $hv_flags = $kvm + ? get_hyperv_enlightenments( + $winversion, + $machine_version, + $conf->{bios}, + $gpu_passthrough, + $hv_vendor_id, + ) + : 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}); + + my $vm_flags = parse_cpuflag_list( + $cpu_flag_supported_re, "manually set for VM", $cpu->{flags}); + + my $pve_forced_flags = {}; + $pve_forced_flags->{'enforce'} = { + reason => "error if requested CPU settings not available", + } if $cputype ne 'host' && $kvm && $arch eq 'x86_64'; + $pve_forced_flags->{'kvm'} = { + value => "off", + reason => "hide KVM virtualization from guest", + } if $kvm_off; + + # $cputype is the "reported-model" for custom types, so we can just look up + # the vendor in the default list + my $cpu_vendor = $cpu_vendor_list->{$cputype}; + if ($cpu_vendor) { + $pve_forced_flags->{'vendor'} = { + value => $cpu_vendor, + } if $cpu_vendor ne 'default'; } elsif ($arch ne 'aarch64') { die "internal error"; # should not happen } - $cpu .= "," . join(',', @$cpuFlags) if scalar(@$cpuFlags); + my $cpu_str = $cputype; + + # will be resolved in parameter order + $cpu_str .= resolve_cpu_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) { + next if !defined($conf); + my $conf_val = $conf->{'phys-bits'}; + next if !$conf_val; + if ($conf_val eq 'host') { + $phys_bits = ",host-phys-bits=true"; + } else { + $phys_bits = ",phys-bits=$conf_val"; + } + } + $cpu_str .= $phys_bits; - return ('-cpu', $cpu); + return ('-cpu', $cpu_str); } -sub add_hyperv_enlightenments { - my ($cpuFlags, $winversion, $machine_version, $bios, $gpu_passthrough, $hv_vendor_id) = @_; +# Some hardcoded flags required by certain configurations +sub get_pve_cpu_flags { + my ($conf, $kvm, $cputype, $arch, $machine_version) = @_; + + my $pve_flags = {}; + my $pve_msg = "set by PVE;"; + + $pve_flags->{'lahf_lm'} = { + op => '+', + reason => "$pve_msg to support Windows 8.1+", + } if $cputype eq 'kvm64' && $arch eq 'x86_64'; + + $pve_flags->{'x2apic'} = { + op => '-', + reason => "$pve_msg incompatible with Solaris", + } if $conf->{ostype} && $conf->{ostype} eq 'solaris'; + + $pve_flags->{'sep'} = { + op => '+', + reason => "$pve_msg to support Windows 8+ and improve Windows XP+", + } if $cputype eq 'kvm64' || $cputype eq 'kvm32'; + + $pve_flags->{'rdtscp'} = { + op => '-', + reason => "$pve_msg broken on AMD Opteron", + } if $cputype =~ m/^Opteron/; + + if (min_version($machine_version, 2, 3) && $kvm && $arch eq 'x86_64') { + $pve_flags->{'kvm_pv_unhalt'} = { + op => '+', + reason => "$pve_msg to improve Linux guest spinlock performance", + }; + $pve_flags->{'kvm_pv_eoi'} = { + op => '+', + reason => "$pve_msg to improve Linux guest interrupt performance", + }; + } + + return $pve_flags; +} + +sub get_hyperv_enlightenments { + my ($winversion, $machine_version, $bios, $gpu_passthrough, $hv_vendor_id) = @_; return if $winversion < 6; return if $bios && $bios eq 'ovmf' && $winversion < 8; - if ($gpu_passthrough || defined($hv_vendor_id)) { + my $flags = {}; + my $default_reason = "automatic Hyper-V enlightenment for Windows"; + my $flagfn = sub { + my ($flag, $value, $reason) = @_; + $flags->{$flag} = { + reason => $reason // $default_reason, + value => $value, + } + }; + + my $hv_vendor_set = defined($hv_vendor_id); + if ($gpu_passthrough || $hv_vendor_set) { $hv_vendor_id //= 'proxmox'; - push @$cpuFlags , "hv_vendor_id=$hv_vendor_id"; + $flagfn->('hv_vendor_id', $hv_vendor_id, $hv_vendor_set ? + "custom hv_vendor_id set" : "NVIDIA workaround for GPU passthrough"); } if (min_version($machine_version, 2, 3)) { - push @$cpuFlags , 'hv_spinlocks=0x1fff'; - push @$cpuFlags , 'hv_vapic'; - push @$cpuFlags , 'hv_time'; + $flagfn->('hv_spinlocks', '0x1fff'); + $flagfn->('hv_vapic'); + $flagfn->('hv_time'); } else { - push @$cpuFlags , 'hv_spinlocks=0xffff'; + $flagfn->('hv_spinlocks', '0xffff'); } if (min_version($machine_version, 2, 6)) { - push @$cpuFlags , 'hv_reset'; - push @$cpuFlags , 'hv_vpindex'; - push @$cpuFlags , 'hv_runtime'; + $flagfn->('hv_reset'); + $flagfn->('hv_vpindex'); + $flagfn->('hv_runtime'); } if ($winversion >= 7) { - push @$cpuFlags , 'hv_relaxed'; + my $win7_reason = $default_reason . " 7 and higher"; + $flagfn->('hv_relaxed', undef, $win7_reason); if (min_version($machine_version, 2, 12)) { - push @$cpuFlags , 'hv_synic'; - push @$cpuFlags , 'hv_stimer'; + $flagfn->('hv_synic', undef, $win7_reason); + $flagfn->('hv_stimer', undef, $win7_reason); } if (min_version($machine_version, 3, 1)) { - push @$cpuFlags , 'hv_ipi'; + $flagfn->('hv_ipi', undef, $win7_reason); } } + + return $flags; +} + +sub get_cpu_from_running_vm { + my ($pid) = @_; + + my $cmdline = PVE::QemuServer::Helpers::parse_cmdline($pid); + die "could not read commandline of running machine\n" + if !$cmdline->{cpu}->{value}; + + # sanitize and untaint value + $cmdline->{cpu}->{value} =~ $qemu_cmdline_cpu_re; + return $1; +} + +sub get_default_cpu_type { + my ($arch, $kvm) = @_; + + my $cputype = $kvm ? 'kvm64' : 'qemu64'; + $cputype = 'cortex-a57' if $arch eq 'aarch64'; + + return $cputype; +} + +sub is_native_arch($) { + my ($arch) = @_; + return get_host_arch() eq $arch; +} + +sub get_cpu_bitness { + my ($cpu_prop_str, $arch) = @_; + + $arch //= get_host_arch(); + + my $cputype = get_default_cpu_type($arch, 0); + + if ($cpu_prop_str) { + my $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 (my $model = $builtin_models->{$cputype}) { + $cputype = $model->{'reported-model'}; + } elsif (is_custom_model($cputype)) { + my $custom_cpu = get_custom_model($cputype); + $cputype = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default}; + } + } + + return $cputypes_32bit->{$cputype} ? 32 : 64 if $arch eq 'x86_64'; + return 64 if $arch eq 'aarch64'; + + die "unsupported architecture '$arch'\n"; } __PACKAGE__->register();