From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 7BBA090637
for <pve-devel@lists.proxmox.com>; Fri, 3 Feb 2023 14:44:24 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 5DB0B5180
for <pve-devel@lists.proxmox.com>; Fri, 3 Feb 2023 14:44:24 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(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>; Fri, 3 Feb 2023 14:44:22 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A6E76452D3;
Fri, 3 Feb 2023 14:44:22 +0100 (CET)
Message-ID: <d41ff642-c173-42ff-1467-2b6d5f744b92@proxmox.com>
Date: Fri, 3 Feb 2023 14:44:20 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
Thunderbird/102.6.0
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, "aderumier@odiso.com" <aderumier@odiso.com>
References: <20230202110344.840195-1-aderumier@odiso.com>
<20230202110344.840195-5-aderumier@odiso.com>
Content-Language: en-US
In-Reply-To: <20230202110344.840195-5-aderumier@odiso.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.043 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -0.09 Looks like a legit reply (A)
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pve-devel] [PATCH v3 qemu-server 04/13] add memory parser
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: Fri, 03 Feb 2023 13:44:24 -0000
Am 02.02.23 um 12:03 schrieb Alexandre Derumier:
> Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
> ---
> PVE/API2/Qemu.pm | 14 +++++--
> PVE/QemuConfig.pm | 4 +-
> PVE/QemuMigrate.pm | 6 ++-
> PVE/QemuServer.pm | 27 +++++++-------
> PVE/QemuServer/Helpers.pm | 3 +-
> PVE/QemuServer/Memory.pm | 78 ++++++++++++++++++++++++++++++---------
> 6 files changed, 92 insertions(+), 40 deletions(-)
>
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 587bb22..6c08280 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -32,6 +32,7 @@ use PVE::QemuServer::Drive;
> use PVE::QemuServer::ImportDisk;
> use PVE::QemuServer::Monitor qw(mon_cmd);
> use PVE::QemuServer::Machine;
> +use PVE::QemuServer::Memory qw(get_current_memory);
> use PVE::QemuMigrate;
> use PVE::RPCEnvironment;
> use PVE::AccessControl;
> @@ -1489,8 +1490,6 @@ my $update_vm_api = sub {
>
> my $storecfg = PVE::Storage::config();
>
> - my $defaults = PVE::QemuServer::load_defaults();
> -
> &$resolve_cdrom_alias($param);
>
> # now try to verify all parameters
> @@ -1608,7 +1607,16 @@ my $update_vm_api = sub {
> }
>
> if ($param->{memory} || defined($param->{balloon})) {
> - my $maxmem = $param->{memory} || $conf->{pending}->{memory} || $conf->{memory} || $defaults->{memory};
> +
> + my $maxmem = undef;
> + if ($param->{memory}) {
> + $maxmem = get_current_memory($param->{memory});
> + } elsif ($conf->{pending}->{memory}) {
> + $maxmem = get_current_memory($conf->{pending}->{memory});
> + } else {
> + $maxmem = get_current_memory($conf->{memory});
> + }
Style nit: could be a one-liner
my $maxmem = get_current_memory($param->{memory} ||
$conf->{pending}->{memory} || $conf->{memory});
> +
> my $balloon = defined($param->{balloon}) ? $param->{balloon} : $conf->{pending}->{balloon} || $conf->{balloon};
>
> die "balloon value too large (must be smaller than assigned memory)\n"
> diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
> index 6bb931e..0704944 100644
> --- a/PVE/QemuServer/Memory.pm
> +++ b/PVE/QemuServer/Memory.pm
> @@ -8,10 +8,42 @@ use PVE::Exception qw(raise raise_param_exc);
>
> use PVE::QemuServer;
> use PVE::QemuServer::Monitor qw(mon_cmd);
> +use base qw(Exporter);
> +
> +our @EXPORT_OK = qw(
> +get_current_memory
> +);
>
> my $MAX_NUMA = 8;
> my $STATICMEM = 1024;
>
> +our $memory_fmt = {
> + current => {
> + description => "Current amount of online RAM for the VM in MiB. This is the maximum available memory when"
> + ." you use the balloon device.",
> + type => 'integer',
> + default_key => 1,
> + minimum => 16,
> + default => 512,
> + }
Style nit: missing comma
> +};
> +
> +sub print_memory {
> + my $memory = shift;
> +
> + return PVE::JSONSchema::print_property_string($memory, $memory_fmt);
> +}
> +
> +sub parse_memory {
> + my ($value) = @_;
> +
> + return { current => $memory_fmt->{current}->{default} } if !defined($value);
> +
> + my $res = PVE::JSONSchema::parse_property_string($memory_fmt, $value)
> + or die "Cannot parse memory properties: $value\n";
Nit: parse_property_string will only return something falsy if the
validator attached to the format does (which also shouldn't), so I don't
think the "or die" is required here.
> + return $res;
> +}
> +
> my $_host_bits;
> my sub get_host_phys_address_bits {
> return $_host_bits if defined($_host_bits);
> @@ -63,6 +95,13 @@ my sub get_max_mem {
> return $bits_to_max_mem > 4*1024*1024 ? 4*1024*1024 : $bits_to_max_mem;
> }
>
> +sub get_current_memory {
> + my ($value) = @_;
> +
> + my $memory = parse_memory($value);
> + return $memory->{current};
> +}
> +
> sub get_numa_node_list {
> my ($conf) = @_;
> my @numa_map;
> @@ -155,16 +194,19 @@ sub foreach_reverse_dimm {
> }
>
> sub qemu_memory_hotplug {
> - my ($vmid, $conf, $defaults, $value) = @_;
> + my ($vmid, $conf, $value) = @_;
>
> return $value if !PVE::QemuServer::check_running($vmid);
>
> - my $sockets = 1;
> - $sockets = $conf->{sockets} if $conf->{sockets};
> + my $oldmem = parse_memory($conf->{memory});
> + my $newmem = parse_memory($value);
> +
> + return $value if $newmem->{current} == $oldmem->{current};
>
> - my $memory = $conf->{memory} || $defaults->{memory};
> - $value = $defaults->{memory} if !$value;
> - return $value if $value == $memory;
> + my $memory = $oldmem->{current};
> + $value = $newmem->{current};
> +
> + my $sockets = $conf->{sockets} || 1;
The refactoring of $sockets and below should be its own patch. While it
is small, it has nothing to do with the rest of the patch and the patch
already has quite a bit going on.
>
> my $static_memory = $STATICMEM;
> $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024);
> @@ -496,12 +543,9 @@ sub hugepages_topology {
>
> return if !$conf->{numa};
>
> - my $defaults = PVE::QemuServer::load_defaults();
> - my $memory = $conf->{memory} || $defaults->{memory};
> + my $memory = get_current_memory($conf->{memory});
> + my $sockets = $conf->{sockets} || 1;
> my $static_memory = 0;
> - my $sockets = 1;
> - $sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused
> - $sockets = $conf->{sockets} if $conf->{sockets};
below here
> my $numa_custom_topology = undef;
> my $hotplug_features = PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1');
>