From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <root@kvmformation3.odiso.net>
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 CBB8A933A1
for <pve-devel@lists.proxmox.com>; Wed, 4 Jan 2023 07:43:45 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 932A81B749
for <pve-devel@lists.proxmox.com>; Wed, 4 Jan 2023 07:43:15 +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 <pve-devel@lists.proxmox.com>; Wed, 4 Jan 2023 07:43:12 +0100 (CET)
Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12])
by bastionodiso.odiso.net (Postfix) with ESMTP id BCC467B37;
Wed, 4 Jan 2023 07:43:04 +0100 (CET)
Received: by kvmformation3.odiso.net (Postfix, from userid 0)
id BB9AD2248F6; Wed, 4 Jan 2023 07:43:04 +0100 (CET)
From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 4 Jan 2023 07:43:00 +0100
Message-Id: <20230104064303.2898194-7-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.030 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 6/9] memory: use 64 slots &&
static dimm size when max is defined
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2023 06:43:45 -0000
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.
We also force a static memory to 4GB, as memory under 4G don't
works fine with unplug
Fix:
https://bugzilla.proxmox.com/show_bug.cgi?id=3446
https://bugzilla.proxmox.com/show_bug.cgi?id=1426
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/QemuServer/Memory.pm | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index 20b9bf9..b9136d2 100644
--- a/PVE/QemuServer/Memory.pm
+++ b/PVE/QemuServer/Memory.pm
@@ -18,6 +18,7 @@ get_host_max_mem
);
my $MAX_NUMA = 8;
+my $MAX_SLOTS = 64;
my $memory_fmt = {
current => {
@@ -68,7 +69,12 @@ my sub get_static_mem {
my $static_memory = 0;
my $memory = parse_memory($conf->{memory});
- if ($hotplug_features->{memory}) {
+ if ($memory->{max}) {
+ my $dimm_size = $memory->{max} / $MAX_SLOTS;
+ #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);
@@ -185,14 +191,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 = parse_memory($conf->{memory});
+ if ($confmem->{max}) {
+ $dimm_size = $confmem->{max} / $MAX_SLOTS;
+ } elsif($conf->{hugepages} && $conf->{hugepages} == 1024) {
$dimm_size = 1024;
} else {
- $current_size = 1024;
$dimm_size = 512;
}
@@ -209,7 +216,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};
}
}
@@ -220,7 +227,12 @@ sub foreach_reverse_dimm {
my $current_size = 0;
my $dimm_size = 0;
- if($conf->{hugepages} && $conf->{hugepages} == 1024) {
+ my $confmem = parse_memory($conf->{memory});
+ if ($confmem->{max}) {
+ $dimm_id = $MAX_SLOTS - 1;
+ $current_size = $confmem->{max};
+ $dimm_size = $confmem->{max} / $MAX_SLOTS;
+ } elsif ($conf->{hugepages} && $conf->{hugepages} == 1024) {
$current_size = 8355840;
$dimm_size = 131072;
} else {
@@ -241,7 +253,7 @@ sub foreach_reverse_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};
}
}
@@ -387,7 +399,9 @@ 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 $confmem = parse_memory($conf->{memory});
+ my $slots = $confmem->{max} ? $MAX_SLOTS : 255;
+ push @$cmd, '-m', "size=${static_memory},slots=$slots,maxmem=${MAX_MEM}M";
} else {
push @$cmd, '-m', $static_memory;
--
2.30.2