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 72D4493256 for ; Wed, 4 Jan 2023 07:43:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 51CE61B71F for ; Wed, 4 Jan 2023 07:43:13 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 4 Jan 2023 07:43:11 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id B2A977B91; Wed, 4 Jan 2023 07:43:04 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id AC1772249A7; Wed, 4 Jan 2023 07:43:04 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 4 Jan 2023 07:42:57 +0100 Message-Id: <20230104064303.2898194-4-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230104064303.2898194-1-aderumier@odiso.com> References: <20230104064303.2898194-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.249 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 v2 qemu-server 3/9] 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: Wed, 04 Jan 2023 06:43:13 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 43 +++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index 59e51c8..e9c0115 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -15,7 +15,6 @@ get_current_memory ); my $MAX_NUMA = 8; -my $STATICMEM = 1024; my $memory_fmt = { current => { @@ -47,6 +46,26 @@ sub parse_memory { return $res; } +my sub get_static_mem { + my ($conf, $defaults) = @_; + + my $sockets = $conf->{sockets} || $defaults->{sockets}; + my $hotplug_features = PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); + + my $static_memory = 0; + my $memory = parse_memory($conf->{memory}); + + if ($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 { return $_host_bits if defined($_host_bits); @@ -212,8 +231,7 @@ sub qemu_memory_hotplug { my $sockets = 1; $sockets = $conf->{sockets} if $conf->{sockets}; - my $static_memory = $STATICMEM; - $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); + my $static_memory = get_static_mem($conf, $defaults); die "memory can't be lower than $static_memory MB" if $value < $static_memory; my $MAX_MEM = get_max_mem($conf); @@ -321,7 +339,7 @@ sub config { my $memory = get_current_memory($conf->{memory}); - my $static_memory = 0; + my $static_memory = get_static_mem($conf, $defaults); if ($hotplug_features->{memory}) { die "NUMA needs to be enabled for memory hotplug\n" if !$conf->{numa}; @@ -333,18 +351,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; } @@ -544,20 +554,13 @@ sub hugepages_topology { my $defaults = PVE::QemuServer::load_defaults(); my $memory = get_current_memory($conf->{memory}); - my $static_memory = 0; + my $static_memory = get_static_mem($conf, $defaults); 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