proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-05 14:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hugepages: use hostnodes value as numanode for topology

Browse Source 
also disallow more than 1 hostnode value

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2016-07-29 05:17:34 +02:00 committed by Wolfgang Bumiller
parent eed2430325
commit ac7b70873a
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PVE/QemuServer/Memory.pm
View File

@ -230,17 +230,8 @@ sub config {
# hostnodes
my $hostnodelists = $numa->{hostnodes};
if (defined($hostnodelists)) {
my $hostnodes;
foreach my $hostnoderange (@$hostnodelists) {
my ($start, $end) = @$hostnoderange;
$hostnodes .= ',' if $hostnodes;
$hostnodes .= $start;
$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/";
}
}
my $hostnodes = print_numa_hostnodes($hostnodelists);
# policy
my $policy = $numa->{policy};
@ -311,6 +302,23 @@ sub print_mem_object {
}
sub print_numa_hostnodes {
my ($hostnodelists) = @_;
my $hostnodes;
foreach my $hostnoderange (@$hostnodelists) {
my ($start, $end) = @$hostnoderange;
$hostnodes .= ',' if $hostnodes;
$hostnodes .= $start;
$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/";
}
}
return $hostnodes;
}
sub hugepages_mount {
my $mountdata = PVE::ProcFSTools::parse_proc_mounts();
@ -406,9 +414,12 @@ sub hugepages_topology {
$numa_custom_topology = 1;
my $numa_memory = $numa->{memory};
my $hostnodelists = $numa->{hostnodes};
my $hostnodes = print_numa_hostnodes($hostnodelists);
die "more than 1 hostnode value in numa node is not supported when hugepages are enabled" if $hostnodes !~ m/^(\d)$/;
my $hugepages_size = hugepages_size($conf, $numa_memory);
$hugepages_topology->{$hugepages_size}->{$i} += hugepages_nr($numa_memory, $hugepages_size);
$hugepages_topology->{$hugepages_size}->{$hostnodes} += hugepages_nr($numa_memory, $hugepages_size);
}