From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 50D7D941EE for ; Wed, 21 Feb 2024 15:35:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3921E19F33 for ; Wed, 21 Feb 2024 15:35:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 21 Feb 2024 15:35:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 37D9744544 for ; Wed, 21 Feb 2024 15:35:13 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Wed, 21 Feb 2024 15:33:14 +0100 Message-Id: <20240221143317.134090-4-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240221143317.134090-1-f.schauer@proxmox.com> References: <20240221143317.134090-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.110 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, cpuconfig.pm] Subject: [pve-devel] [PATCH qemu-server 2/5] prevent starting a 32-bit VM using a 64-bit OVMF BIOS X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2024 14:35:14 -0000 Instead of starting a VM with a 32-bit CPU type and a 64-bit OVMF image, throw an error before starting the VM telling the user that OVMF is not supported on 32-bit CPU types. To obtain a list of 32-bit CPU types, refer to the builtin_x86_defs in target/i386/cpu.c of QEMU. Exclude any entries that have the long mode feature (CPUID_EXT2_LM). Signed-off-by: Filip Schauer --- PVE/QemuServer.pm | 5 ++++- PVE/QemuServer/CPUConfig.pm | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index b45507a..33c374c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -52,7 +52,7 @@ use PVE::QemuConfig; use PVE::QemuServer::Helpers qw(config_aware_timeout min_version windows_version); use PVE::QemuServer::Cloudinit; use PVE::QemuServer::CGroup; -use PVE::QemuServer::CPUConfig qw(print_cpu_device get_cpu_options); +use PVE::QemuServer::CPUConfig qw(print_cpu_device get_cpu_options get_cpu_bitness); use PVE::QemuServer::Drive qw(is_valid_drivename drive_is_cloudinit drive_is_cdrom drive_is_read_only parse_drive print_drive); use PVE::QemuServer::Machine; use PVE::QemuServer::Memory qw(get_current_memory); @@ -3618,6 +3618,9 @@ sub config_to_command { } if ($conf->{bios} && $conf->{bios} eq 'ovmf') { + die "OVMF (UEFI) BIOS is not supported on 32-bit CPU types\n" + if !$forcecpu && get_cpu_bitness($conf->{cpu}, $arch) == 32; + my ($code_drive_str, $var_drive_str) = print_ovmf_drive_commandlines($conf, $storecfg, $vmid, $arch, $q35, $version_guard); push $cmd->@*, '-drive', $code_drive_str; diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm index 4be5262..65ba43f 100644 --- a/PVE/QemuServer/CPUConfig.pm +++ b/PVE/QemuServer/CPUConfig.pm @@ -12,6 +12,7 @@ use base qw(PVE::SectionConfig Exporter); our @EXPORT_OK = qw( print_cpu_device get_cpu_options +get_cpu_bitness ); # under certain race-conditions, this module might be loaded before pve-cluster @@ -57,6 +58,17 @@ my $depreacated_cpu_map = { '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', @@ -725,6 +737,33 @@ sub get_default_cpu_type { return $cputype; } +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"; + + my $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(); __PACKAGE__->init(); -- 2.39.2