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 2EAD89178A for ; Thu, 2 Feb 2023 12:04:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 042F5B1AF for ; Thu, 2 Feb 2023 12:04:01 +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 ; Thu, 2 Feb 2023 12:03:57 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 0DD758178; Thu, 2 Feb 2023 12:03:50 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 0CA1E22A2BE; Thu, 2 Feb 2023 12:03:50 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 2 Feb 2023 12:03:36 +0100 Message-Id: <20230202110344.840195-6-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230202110344.840195-1-aderumier@odiso.com> References: <20230202110344.840195-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [memory.pm, qemuserver.pm] Subject: [pve-devel] [PATCH v3 qemu-server 05/13] memory: add get_static_mem && remove parse_hotplug_features 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: Thu, 02 Feb 2023 11:04:02 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 5 ++-- PVE/QemuServer/Memory.pm | 51 ++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 17ecd63..9db1d8e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3866,7 +3866,7 @@ sub config_to_command { push @$cmd, get_cpu_options($conf, $arch, $kvm, $kvm_off, $machine_version, $winversion, $gpu_passthrough); } - PVE::QemuServer::Memory::config($conf, $vmid, $sockets, $cores, $hotplug_features, $cmd); + PVE::QemuServer::Memory::config($conf, $vmid, $sockets, $cores, $hotplug_features->{memory}, $cmd); push @$cmd, '-S' if $conf->{freeze}; @@ -5901,7 +5901,8 @@ sub vm_start_nolock { if ($conf->{hugepages}) { my $code = sub { - my $hugepages_topology = PVE::QemuServer::Memory::hugepages_topology($conf); + my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); + my $hugepages_topology = PVE::QemuServer::Memory::hugepages_topology($conf, $hotplug_features->{memory}); my $hugepages_host_topology = PVE::QemuServer::Memory::hugepages_host_topology(); PVE::QemuServer::Memory::hugepages_mount(); diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index 0704944..7079907 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,23 @@ 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) { + #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); @@ -208,8 +224,7 @@ sub qemu_memory_hotplug { 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); @@ -314,13 +329,13 @@ sub qemu_dimm_list { } sub config { - my ($conf, $vmid, $sockets, $cores, $hotplug_features, $cmd) = @_; + 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_features->{memory}) { + if ($hotplug) { 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; @@ -330,18 +345,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; } @@ -408,7 +415,7 @@ sub config { } } - if ($hotplug_features->{memory}) { + if ($hotplug) { foreach_dimm($conf, $vmid, $memory, $sockets, sub { my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_; @@ -537,7 +544,7 @@ sub hugepages_size { } sub hugepages_topology { - my ($conf) = @_; + my ($conf, $hotplug) = @_; my $hugepages_topology = {}; @@ -545,16 +552,8 @@ sub hugepages_topology { my $memory = get_current_memory($conf->{memory}); my $sockets = $conf->{sockets} || 1; - my $static_memory = 0; + my $static_memory = get_static_mem($conf, $sockets, $hotplug); 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++) { @@ -585,7 +584,7 @@ sub hugepages_topology { } } - if ($hotplug_features->{memory}) { + if ($hotplug) { my $numa_hostmap = get_numa_guest_to_host_map($conf); foreach_dimm($conf, undef, $memory, $sockets, sub { -- 2.30.2