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 066A79AABA for ; Mon, 22 May 2023 12:25:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2A482FC43 for ; Mon, 22 May 2023 12:25:40 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Mon, 22 May 2023 12:25:39 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 197208B6C; Mon, 22 May 2023 12:25:30 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 1724C2E807F; Mon, 22 May 2023 12:25:30 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 22 May 2023 12:25:26 +0200 Message-Id: <20230522102528.186955-8-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230522102528.186955-1-aderumier@odiso.com> References: <20230522102528.186955-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.015 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v3 qemu-server 5/7] cpuconfig: add find_best_cpumodel 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: Mon, 22 May 2023 10:25:41 -0000 return the more recent cpu model compatible with host cpu Signed-off-by: Alexandre Derumier --- PVE/QemuServer/CPUConfig.pm | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm index 45bf26f..63e57d4 100644 --- a/PVE/QemuServer/CPUConfig.pm +++ b/PVE/QemuServer/CPUConfig.pm @@ -14,6 +14,7 @@ our @EXPORT_OK = qw( print_cpu_device get_cpu_options get_host_cpu_flags +find_best_cpumodel ); # under certain race-conditions, this module might be loaded before pve-cluster @@ -696,6 +697,51 @@ sub get_host_cpu_flags { return $res; } +sub find_best_cpumodel { + my ($host_flags, $vendor) = @_; + + my $res = {}; + + #flags in qemu model but not in cpuinfo + my $missing_flag = { + #qemu internal + 'svme-addr-chk' => 1, + #TCG exposes CPUID flags FSRM, FZRM, FSRS, FSRC. + #These do not correspond to any new instructions; + #they only direct software to use string operations even if the length is zero or short. + fzrm => 1, + fsrc => 1, + fsr => 1, + fsrs => 1, + #masked from cpuinfo + xfd => 1, + }; + + foreach my $cpu (keys %$qemu_cpu_models) { + next if $qemu_cpu_models->{$cpu}->{vendor} ne $vendor; + next if $qemu_cpu_models->{$cpu}->{model} == 0; + $res->{$cpu} = $qemu_cpu_models->{$cpu}; + my $flags = $qemu_cpu_models->{$cpu}->{'flags'}; + next if !$flags; + foreach my $flag (keys %$flags) { + next if $missing_flag->{$flag}; + if (!$host_flags->{$flag}) { + #print"$cpu unsupported flag: $flag\n"; + delete $res->{$cpu}; + } + } + } + + foreach my $name (sort { + $res->{$b}->{family} <=> $res->{$a}->{family} || + $res->{$b}->{model} <=> $res->{$a}->{model} || + $res->{$b}->{version} <=> $res->{$a}->{version} + } keys %$res) { + return $name; + } +} + + __PACKAGE__->register(); __PACKAGE__->init(); -- 2.30.2