From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, aderumier@odiso.com
Subject: Re: [pve-devel] [PATCH qemu-server 06/10] memory: use 64 slots && static dimm size with max is defined
Date: Fri, 16 Dec 2022 14:39:15 +0100 [thread overview]
Message-ID: <5c672ed8-0385-e840-607d-ab6bbb84f7bf@proxmox.com> (raw)
In-Reply-To: <20221209192726.1499142-7-aderumier@odiso.com>
Am 09.12.22 um 20:27 schrieb Alexandre Derumier:
> 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.
>
> 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 | 31 ++++++++++++++++++++-----------
> 1 file changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
> index b847742..8bbbf07 100644
> --- a/PVE/QemuServer/Memory.pm
> +++ b/PVE/QemuServer/Memory.pm
> @@ -140,14 +140,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 = PVE::QemuServer::parse_memory($conf->{memory});
> + if ($confmem->{max}) {
> + $dimm_size = $confmem->{max}/64;
Style nit: missing spaces around division operator
> + } elsif($conf->{hugepages} && $conf->{hugepages} == 1024) {
> $dimm_size = 1024;
> } else {
> - $current_size = 1024;
> $dimm_size = 512;
> }
>
> @@ -164,7 +165,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};
> }
> }
>
> @@ -175,7 +176,12 @@ sub foreach_reverse_dimm {
> my $current_size = 0;
> my $dimm_size = 0;
>
> - if($conf->{hugepages} && $conf->{hugepages} == 1024) {
> + my $confmem = PVE::QemuServer::parse_memory($conf->{memory});
> + if ($confmem->{max}) {
> + $dimm_id = 63;
> + $current_size = $confmem->{max};
> + $dimm_size = $confmem->{max}/64;
> + } elsif ($conf->{hugepages} && $conf->{hugepages} == 1024) {
> $current_size = 8355840;
> $dimm_size = 131072;
> } else {
> @@ -197,6 +203,7 @@ sub foreach_reverse_dimm {
> return $current_size if $current_size <= $memory;
> }
> $dimm_size /= 2;
This line should be removed?
> + $dimm_size /= 2 if !$confmem->{max};
> }
> }
>
> @@ -263,7 +270,7 @@ sub qemu_memory_hotplug {
> die $err;
> }
> #update conf after each succesful module hotplug
> - my $mem = {};
> + my $mem = { max => $MAX_MEM };
> $mem->{current} = $current_size;
> $conf->{memory} = PVE::QemuServer::print_memory($mem);
> PVE::QemuConfig->write_config($vmid, $conf);
> @@ -289,7 +296,7 @@ sub qemu_memory_hotplug {
> }
>
> #update conf after each succesful module unplug
> - my $mem = {};
> + my $mem = { max => $MAX_MEM };
> $mem->{current} = $current_size;
> $conf->{memory} = PVE::QemuServer::print_memory($mem);
>
> @@ -322,8 +329,9 @@ sub config {
> my $memory = get_current_memory($conf);
>
> my $static_memory = get_static_mem($conf);
> + my $confmem = PVE::QemuServer::parse_memory($conf->{memory});
>
> - if ($hotplug_features->{memory}) {
> + if ($hotplug_features->{memory} || defined($confmem->{max})) {
So setting 'max' auto-attches the dimms[0], but without memory hotplug
enabled, those are useless? Or am I missing something? I feel like we
can just keep the conditional here and below[0] as-is.
> 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;
> @@ -334,7 +342,8 @@ 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 $slots = $confmem->{max} ? 64 : 255;
> + push @$cmd, '-m', "size=${static_memory},slots=$slots,maxmem=${MAX_MEM}M";
>
> } else {
> push @$cmd, '-m', $static_memory;
> @@ -403,7 +412,7 @@ sub config {
> }
> }
>
> - if ($hotplug_features->{memory}) {
> + if ($hotplug_features->{memory} || $confmem->{max}) {
[0]: here
> foreach_dimm($conf, $vmid, $memory, $sockets, sub {
> my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_;
>
next prev parent reply other threads:[~2022-12-16 13:39 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-09 19:27 [pve-devel] [PATCH qemu-server 00/10] rework memory hotplug + virtiomem Alexandre Derumier
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 01/10] test: add memory tests Alexandre Derumier
2022-12-16 13:38 ` Fiona Ebner
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 02/10] add memory parser Alexandre Derumier
2022-12-16 13:38 ` Fiona Ebner
2023-01-02 10:50 ` DERUMIER, Alexandre
2023-01-05 12:47 ` Fiona Ebner
2023-01-02 11:23 ` DERUMIER, Alexandre
2023-01-05 12:48 ` Fiona Ebner
[not found] ` <4ba723fb986517054761eb65f38812fac86a895b.camel@groupe-cyllene.com>
2023-01-09 14:35 ` Fiona Ebner
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 03/10] config: memory: add 'max' option Alexandre Derumier
2022-12-16 13:38 ` Fiona Ebner
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 04/10] memory: add get_static_mem Alexandre Derumier
2022-12-16 13:38 ` Fiona Ebner
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 05/10] memory: get_max_mem: use config memory max Alexandre Derumier
2022-12-16 13:39 ` Fiona Ebner
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 06/10] memory: use 64 slots && static dimm size with max is defined Alexandre Derumier
2022-12-16 13:39 ` Fiona Ebner [this message]
2022-12-19 12:05 ` DERUMIER, Alexandre
2022-12-19 12:28 ` Fiona Ebner
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 07/10] test: add memory-max tests Alexandre Derumier
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 08/10] memory: add virtio-mem support Alexandre Derumier
2022-12-16 13:42 ` Fiona Ebner
[not found] ` <7b9306c429440304fb37601ece5ffdbad0b90e5f.camel@groupe-cyllene.com>
2022-12-20 10:26 ` Fiona Ebner
[not found] ` <b354aab5e4791e7c862b15470ca24c273b8030be.camel@groupe-cyllene.com>
2022-12-20 12:31 ` DERUMIER, Alexandre
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 09/10] tests: add virtio-mem tests Alexandre Derumier
2022-12-16 13:42 ` Fiona Ebner
2022-12-19 14:48 ` Thomas Lamprecht
2022-12-09 19:27 ` [pve-devel] [PATCH qemu-server 10/10] memory: fix hotplug with virtiomem && maxmem Alexandre Derumier
2022-12-16 13:42 ` Fiona Ebner
2022-12-16 13:38 ` [pve-devel] [PATCH qemu-server 00/10] rework memory hotplug + virtiomem Fiona Ebner
2022-12-19 11:31 ` DERUMIER, Alexandre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5c672ed8-0385-e840-607d-ab6bbb84f7bf@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox