[pve-devel] [PATCH v2 qemu-server 5/9] memory: get_max_mem: use config memory max

[Fiona Ebner]

Am 04.01.23 um 07:42 schrieb Alexandre Derumier:
> verify than defined vm memorymax is not bigger than
> host cpu supported memory
> 
> Add add early check in update vm api
> 
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
> ---
>  PVE/API2/Qemu.pm         | 48 ++++++++++++++++++++++++++--------------
>  PVE/QemuServer/Memory.pm | 23 +++++++++++++++++--
>  2 files changed, 52 insertions(+), 19 deletions(-)
> 
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 4ffa973..cab1e84 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -32,7 +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::QemuServer::Memory qw(get_current_memory parse_memory get_host_max_mem);
>  use PVE::QemuMigrate;
>  use PVE::RPCEnvironment;
>  use PVE::AccessControl;
> @@ -476,6 +476,35 @@ my $create_disks = sub {
>      return ($vollist, $res);
>  };
>  
> +my $check_memory_param = sub {
> +    my ($conf, $param) = @_;
> +
> +    my $mem = parse_memory($param->{memory});
> +    my $host_max_mem = get_host_max_mem($conf);
> +
> +    if ($mem->{max}) {
> +	die "memory max can't be bigger than supported cpu architecture $host_max_mem MB\n"

s/MB/MiB

> +	    if $mem->{max} > $host_max_mem;

Style nit: you could && both conditions to save lines

This could be part of the verifier sub suggested in the last patch

> +    }
> +

(...)

> diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
> index 1c4f356..20b9bf9 100644
> --- a/PVE/QemuServer/Memory.pm
> +++ b/PVE/QemuServer/Memory.pm
> @@ -13,6 +13,8 @@ use base qw(Exporter);
>  
>  our @EXPORT_OK = qw(
>  get_current_memory
> +parse_memory
> +get_host_max_mem
>  );
>  
>  my $MAX_NUMA = 8;
> @@ -94,7 +96,7 @@ my sub get_host_phys_address_bits {
>      return; # undef, cannot really do anything..
>  }
>  
> -my sub get_max_mem {
> +sub get_host_max_mem {
>      my ($conf) = @_;
>  
>      my $cpu = {};
> @@ -125,7 +127,24 @@ my sub get_max_mem {
>      # heuristic: remove 20 bits to get MB and half that as QEMU needs some overhead
>      my $bits_to_max_mem = int(1<<($bits - 21));
>  
> -    return $bits_to_max_mem > 4*1024*1024 ? 4*1024*1024 : $bits_to_max_mem;
> +    my $host_max_mem = $bits_to_max_mem > 4*1024*1024 ? 4*1024*1024 : $bits_to_max_mem;
> +
> +    return $host_max_mem;
> +}

Nit: useless change?

> +
> +my sub get_max_mem {
> +    my ($conf) = @_;
> +
> +    my $host_max_mem = get_host_max_mem($conf);
> +    my $mem = parse_memory($conf->{memory});
> +
> +    if ($mem->{max}) {
> +	die "configured memory max can't be bigger than supported cpu architecture $host_max_mem MB\n"

s/MB/MiB/

> +	    if $mem->{max} > $host_max_mem;
> +	return $mem->{max};
> +    }
> +
> +    return $host_max_mem;
>  }
>  
>  sub get_current_memory {