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 61D46E6E2 for ; Fri, 9 Dec 2022 20:28:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 393972728B for ; Fri, 9 Dec 2022 20:27:37 +0100 (CET) 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 ; Fri, 9 Dec 2022 20:27:35 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id B84487EAF; Fri, 9 Dec 2022 20:27:28 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id B4F08FC3B9; Fri, 9 Dec 2022 20:27:28 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com, t.lamprecht@proxmox.com Date: Fri, 9 Dec 2022 20:27:20 +0100 Message-Id: <20221209192726.1499142-5-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221209192726.1499142-1-aderumier@odiso.com> References: <20221209192726.1499142-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records 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 Subject: [pve-devel] [PATCH qemu-server 04/10] memory: add get_static_mem 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, 09 Dec 2022 19:28:07 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 50 ++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index 668508b..90e355b 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -15,7 +15,33 @@ get_current_memory ); my $MAX_NUMA = 8; -my $STATICMEM = 1024; + +my sub get_static_mem { + my ($conf) = @_; + + my $sockets = 1; + $sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused + $sockets = $conf->{sockets} if $conf->{sockets}; + my $hotplug_features = PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); + + my $static_memory = 0; + my $memory = PVE::QemuServer::parse_memory($conf->{memory}); + + if($memory->{max}) { + my $dimm_size = $memory->{max} / 64; + #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_features->{memory}) { + #legacy + $static_memory = 1024; + $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); + } else { + $static_memory = $memory->{current}; + } + + return $static_memory; +} my $_host_bits; my sub get_host_phys_address_bits { @@ -177,8 +203,7 @@ sub qemu_memory_hotplug { my $memory = get_current_memory($conf); return $value if $value == $memory; - my $static_memory = $STATICMEM; - $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); + my $static_memory = get_static_mem($conf); die "memory can't be lower than $static_memory MB" if $value < $static_memory; my $MAX_MEM = get_max_mem($conf); @@ -288,7 +313,7 @@ sub config { my $memory = get_current_memory($conf); - my $static_memory = 0; + my $static_memory = get_static_mem($conf); if ($hotplug_features->{memory}) { die "NUMA needs to be enabled for memory hotplug\n" if !$conf->{numa}; @@ -300,18 +325,10 @@ sub config { if $conf->{"numa$i"}; } - my $sockets = 1; - $sockets = $conf->{sockets} if $conf->{sockets}; - - $static_memory = $STATICMEM; - $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); - 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"; } else { - - $static_memory = $memory; push @$cmd, '-m', $static_memory; } @@ -504,20 +521,13 @@ sub hugepages_topology { my $defaults = PVE::QemuServer::load_defaults(); my $memory = get_current_memory($conf); - my $static_memory = 0; + my $static_memory = get_static_mem($conf); my $sockets = 1; $sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused $sockets = $conf->{sockets} if $conf->{sockets}; my $numa_custom_topology = undef; my $hotplug_features = PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); - if ($hotplug_features->{memory}) { - $static_memory = $STATICMEM; - $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); - } else { - $static_memory = $memory; - } - #custom numa topology for (my $i = 0; $i < $MAX_NUMA; $i++) { next if !$conf->{"numa$i"}; -- 2.30.2