[pve-devel] [PATCH v3 qemu-server 01/13] memory: extract some code to their own sub for mocking

[Fiona Ebner]

Am 02.02.23 um 12:03 schrieb Alexandre Derumier:
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
> ---
>  PVE/QemuServer/Memory.pm | 25 ++++++++++++++++++-------
>  1 file changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
> index 3eb1c7c..5a7c1b7 100644
> --- a/PVE/QemuServer/Memory.pm
> +++ b/PVE/QemuServer/Memory.pm
> @@ -348,7 +348,7 @@ sub config {
>  	    my $numa_memory = ($static_memory / $sockets);
>  
>  	    for (my $i = 0; $i < $sockets; $i++)  {
> -		die "host NUMA node$i doesn't exist\n" if ! -d "/sys/devices/system/node/node$i/" && $conf->{hugepages};
> +		die "host NUMA node$i doesn't exist\n" if !host_numanode_exist($i) && $conf->{hugepages};
>  
>  		my $mem_object = print_mem_object($conf, "ram-node$i", $numa_memory);
>  		push @$cmd, '-object', $mem_object;
> @@ -391,6 +391,12 @@ sub print_mem_object {
>  
>  }
>  
> +sub host_numanode_exist {

Nit: host_numanode_exists sounds more grammatically correct and the
function could be moved above its first usage

> +    my ($id) = @_;
> +
> +    return -d "/sys/devices/system/node/node$id/";
> +}
> +
>  sub print_numa_hostnodes {
>      my ($hostnodelists) = @_;
>  
> @@ -402,7 +408,7 @@ sub print_numa_hostnodes {
>  	$hostnodes .= "-$end" if defined($end);
>  	$end //= $start;
>  	for (my $i = $start; $i <= $end; ++$i ) {
> -	    die "host NUMA node$i doesn't exist\n" if ! -d "/sys/devices/system/node/node$i/";
> +	    die "host NUMA node$i doesn't exist\n" if !host_numanode_exist($i);
>  	}
>      }
>      return $hostnodes;
> @@ -445,21 +451,26 @@ sub hugepages_nr {
>    return $size / $hugepages_size;
>  }
>  
> +my sub page_chunk {

This needs a more descriptive name. How about
hugepages_chunk_size_supported?

> +    my ($size) = @_;
> +
> +    return -d "/sys/kernel/mm/hugepages/hugepages-". ($size * 1024) ."kB";
> +}
> +
>  sub hugepages_size {
>      my ($conf, $size) = @_;
>      die "hugepages option is not enabled" if !$conf->{hugepages};
>      die "memory size '$size' is not a positive even integer; cannot use for hugepages\n"
>  	if $size <= 0 || $size & 1;
>  
> -    my $page_chunk = sub { -d  "/sys/kernel/mm/hugepages/hugepages-". ($_[0] * 1024) ."kB" };
> -    die "your system doesn't support hugepages\n" if !$page_chunk->(2) && !$page_chunk->(1024);
> +    die "your system doesn't support hugepages\n" if !page_chunk(2) && !page_chunk(1024);
>  
>      if ($conf->{hugepages} eq 'any') {
>  
>  	# try to use 1GB if available && memory size is matching
> -	if ($page_chunk->(1024) && ($size & 1023) == 0) {
> +	if (page_chunk(1024) && ($size & 1023) == 0) {
>  	    return 1024;
> -	} elsif ($page_chunk->(2)) {
> +	} elsif (page_chunk(2)) {
>  	    return 2;
>  	} else {
>  	    die "host only supports 1024 GB hugepages, but requested size '$size' is not a multiple of 1024 MB\n"
> @@ -468,7 +479,7 @@ sub hugepages_size {
>  
>  	my $hugepagesize = $conf->{hugepages};
>  
> -	if (!$page_chunk->($hugepagesize)) {
> +	if (!page_chunk($hugepagesize)) {
>  	    die "your system doesn't support hugepages of $hugepagesize MB\n";
>  	} elsif (($size % $hugepagesize) != 0) {
>  	    die "Memory size $size is not a multiple of the requested hugepages size $hugepagesize\n";