From d1b25a2267187c48339f598e81d5f99706f85513 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Fri, 24 Feb 2023 13:09:05 +0100 Subject: [PATCH] memory: don't use foreach_reversedimm for unplug simple use dimm_list() returned by qemu Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 76 +++++++++++++--------------------------- 1 file changed, 25 insertions(+), 51 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index 7ad8fcbc..0f4229c5 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -128,38 +128,6 @@ sub foreach_dimm{ } } -sub foreach_reverse_dimm { - my ($conf, $vmid, $memory, $sockets, $func) = @_; - - my $dimm_id = 253; - my $current_size = 0; - my $dimm_size = 0; - - if($conf->{hugepages} && $conf->{hugepages} == 1024) { - $current_size = 8355840; - $dimm_size = 131072; - } else { - $current_size = 4177920; - $dimm_size = 65536; - } - - return if $current_size == $memory; - - my @numa_map = get_numa_node_list($conf); - - for (my $j = 0; $j < 8; $j++) { - for (my $i = 0; $i < 32; $i++) { - my $name = "dimm${dimm_id}"; - $dimm_id--; - my $numanode = $numa_map[(31-$i) % @numa_map]; - $current_size -= $dimm_size; - &$func($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory); - return $current_size if $current_size <= $memory; - } - $dimm_size /= 2; - } -} - sub qemu_memory_hotplug { my ($vmid, $conf, $defaults, $value) = @_; @@ -230,29 +198,35 @@ sub qemu_memory_hotplug { } else { - foreach_reverse_dimm($conf, $vmid, $value, $sockets, sub { - my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_; + my $dimms = qemu_memdevices_list($vmid, 'dimm'); - return if $current_size >= $conf->{memory}; - print "try to unplug memory dimm $name\n"; - - my $retry = 0; - while (1) { - eval { PVE::QemuServer::qemu_devicedel($vmid, $name) }; - sleep 3; - my $dimm_list = qemu_memdevices_list($vmid, 'dimm'); - last if !$dimm_list->{$name}; - raise_param_exc({ $name => "error unplug memory module" }) if $retry > 5; - $retry++; - } + my $current_size = $memory; + for my $name (sort { $dimms->{$b}->{slot} <=> $dimms->{$a}->{slot} } keys %$dimms) { - #update conf after each succesful module unplug - $conf->{memory} = $current_size; + my $dimm_size = $dimms->{$name}->{size} / 1024 / 1024; - eval { PVE::QemuServer::qemu_objectdel($vmid, "mem-$name"); }; - PVE::QemuConfig->write_config($vmid, $conf); - }); + last if $current_size <= $value; + + print "try to unplug memory dimm $name\n"; + + my $retry = 0; + while (1) { + eval { PVE::QemuServer::qemu_devicedel($vmid, $name) }; + sleep 3; + my $dimm_list = qemu_memdevices_list($vmid, 'dimm'); + last if !$dimm_list->{$name}; + raise_param_exc({ $name => "error unplug memory module" }) if $retry > 5; + $retry++; + } + $current_size -= $dimm_size; + #update conf after each succesful module unplug + $conf->{memory} = $current_size; + + eval { PVE::QemuServer::qemu_objectdel($vmid, "mem-$name"); }; + PVE::QemuConfig->write_config($vmid, $conf); + } } + return $conf->{memory}; } sub qemu_memdevices_list { -- 2.39.5