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 28524F6E1 for ; Fri, 16 Dec 2022 14:39:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0A4742280E for ; Fri, 16 Dec 2022 14:39:18 +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 ; Fri, 16 Dec 2022 14:39:16 +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 8127D438EA; Fri, 16 Dec 2022 14:39:16 +0100 (CET) Message-ID: <5c672ed8-0385-e840-607d-ab6bbb84f7bf@proxmox.com> Date: Fri, 16 Dec 2022 14:39:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 From: Fiona Ebner To: pve-devel@lists.proxmox.com, aderumier@odiso.com References: <20221209192726.1499142-1-aderumier@odiso.com> <20221209192726.1499142-7-aderumier@odiso.com> Content-Language: en-US In-Reply-To: <20221209192726.1499142-7-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, memory.pm] Subject: Re: [pve-devel] [PATCH qemu-server 06/10] memory: use 64 slots && static dimm size with 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: Fri, 16 Dec 2022 13:39:48 -0000 Am 09.12.22 um 20:27 schrieb Alexandre Derumier: > 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. > > 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 | 31 ++++++++++++++++++++----------- > 1 file changed, 20 insertions(+), 11 deletions(-) > > diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm > index b847742..8bbbf07 100644 > --- a/PVE/QemuServer/Memory.pm > +++ b/PVE/QemuServer/Memory.pm > @@ -140,14 +140,15 @@ sub foreach_dimm{ > my ($conf, $vmid, $memory, $sockets, $func) = @_; > > my $dimm_id = 0; > - my $current_size = 0; > + my $current_size = get_static_mem($conf); > my $dimm_size = 0; > > - if($conf->{hugepages} && $conf->{hugepages} == 1024) { > - $current_size = 1024 * $sockets; > + my $confmem = PVE::QemuServer::parse_memory($conf->{memory}); > + if ($confmem->{max}) { > + $dimm_size = $confmem->{max}/64; Style nit: missing spaces around division operator > + } elsif($conf->{hugepages} && $conf->{hugepages} == 1024) { > $dimm_size = 1024; > } else { > - $current_size = 1024; > $dimm_size = 512; > } > > @@ -164,7 +165,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}; > } > } > > @@ -175,7 +176,12 @@ sub foreach_reverse_dimm { > my $current_size = 0; > my $dimm_size = 0; > > - if($conf->{hugepages} && $conf->{hugepages} == 1024) { > + my $confmem = PVE::QemuServer::parse_memory($conf->{memory}); > + if ($confmem->{max}) { > + $dimm_id = 63; > + $current_size = $confmem->{max}; > + $dimm_size = $confmem->{max}/64; > + } elsif ($conf->{hugepages} && $conf->{hugepages} == 1024) { > $current_size = 8355840; > $dimm_size = 131072; > } else { > @@ -197,6 +203,7 @@ sub foreach_reverse_dimm { > return $current_size if $current_size <= $memory; > } > $dimm_size /= 2; This line should be removed? > + $dimm_size /= 2 if !$confmem->{max}; > } > } > > @@ -263,7 +270,7 @@ sub qemu_memory_hotplug { > die $err; > } > #update conf after each succesful module hotplug > - my $mem = {}; > + my $mem = { max => $MAX_MEM }; > $mem->{current} = $current_size; > $conf->{memory} = PVE::QemuServer::print_memory($mem); > PVE::QemuConfig->write_config($vmid, $conf); > @@ -289,7 +296,7 @@ sub qemu_memory_hotplug { > } > > #update conf after each succesful module unplug > - my $mem = {}; > + my $mem = { max => $MAX_MEM }; > $mem->{current} = $current_size; > $conf->{memory} = PVE::QemuServer::print_memory($mem); > > @@ -322,8 +329,9 @@ sub config { > my $memory = get_current_memory($conf); > > my $static_memory = get_static_mem($conf); > + my $confmem = PVE::QemuServer::parse_memory($conf->{memory}); > > - if ($hotplug_features->{memory}) { > + if ($hotplug_features->{memory} || defined($confmem->{max})) { So setting 'max' auto-attches the dimms[0], but without memory hotplug enabled, those are useless? Or am I missing something? I feel like we can just keep the conditional here and below[0] as-is. > die "NUMA needs to be enabled for memory hotplug\n" if !$conf->{numa}; > my $MAX_MEM = get_max_mem($conf); > die "Total memory is bigger than ${MAX_MEM}MB\n" if $memory > $MAX_MEM; > @@ -334,7 +342,8 @@ 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 $slots = $confmem->{max} ? 64 : 255; > + push @$cmd, '-m', "size=${static_memory},slots=$slots,maxmem=${MAX_MEM}M"; > > } else { > push @$cmd, '-m', $static_memory; > @@ -403,7 +412,7 @@ sub config { > } > } > > - if ($hotplug_features->{memory}) { > + if ($hotplug_features->{memory} || $confmem->{max}) { [0]: here > foreach_dimm($conf, $vmid, $memory, $sockets, sub { > my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_; >