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 63468A255F for ; Mon, 19 Jun 2023 09:28:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4CA07252DB for ; Mon, 19 Jun 2023 09:28:54 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 19 Jun 2023 09:28:53 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 3D07A7F8C; Mon, 19 Jun 2023 09:28:45 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 34A6B241522; 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:32 +0200 Message-Id: <20230619072841.38531-4-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 02/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: Mon, 19 Jun 2023 07:28:54 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index aaa94cc..12e6ee4 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; our $memory_fmt = { current => { @@ -44,6 +43,22 @@ sub parse_memory { return $res; } +my sub get_static_mem { + my ($conf, $sockets, $hotplug) = @_; + + my $static_memory = 0; + my $memory = parse_memory($conf->{memory}); + + if ($hotplug) { + $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; sub get_host_phys_address_bits { return $_host_bits if defined($_host_bits); @@ -181,8 +196,7 @@ sub qemu_memory_hotplug { $value = $newmem->{current}; my $sockets = $conf->{sockets} || 1; - my $static_memory = $STATICMEM; - $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024); + my $static_memory = get_static_mem($conf, $sockets, 1); die "memory can't be lower than $static_memory MB" if $value < $static_memory; my $MAX_MEM = get_max_mem($conf); @@ -294,7 +308,7 @@ sub config { my ($conf, $vmid, $sockets, $cores, $hotplug, $cmd) = @_; my $memory = get_current_memory($conf->{memory}); - my $static_memory = 0; + my $static_memory = get_static_mem($conf, $sockets, $hotplug); if ($hotplug) { die "NUMA needs to be enabled for memory hotplug\n" if !$conf->{numa}; @@ -306,17 +320,11 @@ sub config { if $conf->{"numa$i"}; } - my $sockets = $conf->{sockets} || 1; - - $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; } @@ -515,17 +523,10 @@ sub hugepages_topology { return if !$conf->{numa}; my $memory = get_current_memory($conf->{memory}); - my $static_memory = 0; my $sockets = $conf->{sockets} || 1; + my $static_memory = get_static_mem($conf, $sockets, $hotplug); my $numa_custom_topology = undef; - if ($hotplug) { - $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.39.2