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 C5CB3A25C5 for ; Mon, 19 Jun 2023 09:29:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9A5D32537F for ; Mon, 19 Jun 2023 09:28:56 +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, 19 Jun 2023 09:28:54 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 572B47EB0; Mon, 19 Jun 2023 09:28:45 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 560D424159E; Mon, 19 Jun 2023 09:28:45 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 19 Jun 2023 09:28:37 +0200 Message-Id: <20230619072841.38531-9-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230619072841.38531-1-aderumier@odiso.com> References: <20230619072841.38531-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 v6 qemu-server 06/10] memory: use 64 slots && static dimm size when max is defined 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, 19 Jun 2023 07:29:26 -0000 default kernel vhost config only support 64 slots by default, for performance since 2015. Original memory hotplug code was done before, using qemu max supported 255 slots. To reach max mem (4TB), we used incremental dimm size. Instead of dynamic memory size, use 1 static dimm size, compute from max memory/64. We also force a static memory to 4GB, as memory under 4G don't works fine with unplug Fix: https://bugzilla.proxmox.com/show_bug.cgi?id=3446 https://bugzilla.proxmox.com/show_bug.cgi?id=1426 Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index cf489ea..0d64a5f 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -19,6 +19,7 @@ get_host_max_mem ); my $MAX_NUMA = 8; +my $MAX_SLOTS = 64; our $memory_fmt = { current => { @@ -73,7 +74,13 @@ my sub get_static_mem { my $static_memory = 0; my $memory = parse_memory($conf->{memory}); - if ($hotplug) { + if ($memory->{max}) { + my $dimm_size = $memory->{max} / $MAX_SLOTS; + #static mem can't be lower than 4G and lower than 1 dimmsize by socket + $static_memory = $dimm_size * $sockets; + $static_memory = 4096 if $static_memory < 4096; + } elsif ($hotplug) { + #legacy $static_memory = 1024; $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); } else { @@ -196,7 +203,10 @@ sub foreach_dimm{ my $current_size = $static_memory; my $dimm_size = 0; - if($conf->{hugepages} && $conf->{hugepages} == 1024) { + my $confmem = parse_memory($conf->{memory}); + if ($confmem->{max}) { + $dimm_size = $confmem->{max} / $MAX_SLOTS; + } elsif($conf->{hugepages} && $conf->{hugepages} == 1024) { $dimm_size = 1024; } else { $dimm_size = 512; @@ -215,7 +225,7 @@ sub foreach_dimm{ &$func($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory); return $current_size if $current_size >= $memory; } - $dimm_size *= 2; + $dimm_size *= 2 if !$confmem->{max}; } } @@ -371,7 +381,9 @@ sub config { } die "minimum memory must be ${static_memory}MB\n" if($memory < $static_memory); - push @$cmd, '-m', "size=${static_memory},slots=255,maxmem=${MAX_MEM}M"; + my $confmem = parse_memory($conf->{memory}); + my $slots = $confmem->{max} ? $MAX_SLOTS : 255; + push @$cmd, '-m', "size=${static_memory},slots=$slots,maxmem=${MAX_MEM}M"; } else { -- 2.39.2