NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-13 00:46:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of sparse NUMA topologies

Browse Source 
When finding a sparse NUMA topology, libnuma will return ENOENT
the first time it is invoked. On subsequent invocations it
will return success, but with an all-1's CPU mask. Check for
this, to avoid polluting the capabilities XML with 4096 bogus
CPUs

* src/nodeinfo.c: Check for all-1s CPU mask
This commit is contained in:
Daniel P. Berrange 2010-08-17 11:09:28 -04:00
parent ac7baddf9d
commit 628c935747
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nodeinfo.c
View File

@ -361,6 +361,7 @@ nodeCapsInitNUMA(virCapsPtr caps)
{ {
int n; int n;
unsigned long *mask = NULL; unsigned long *mask = NULL;
unsigned long *allonesmask = NULL;
int *cpus = NULL; int *cpus = NULL;
int ret = -1; int ret = -1;
int max_n_cpus = NUMA_MAX_N_CPUS; int max_n_cpus = NUMA_MAX_N_CPUS;
@ -371,13 +372,23 @@ nodeCapsInitNUMA(virCapsPtr caps)
int mask_n_bytes = max_n_cpus / 8; int mask_n_bytes = max_n_cpus / 8;
if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof *mask) < 0) if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof *mask) < 0)
goto cleanup; goto cleanup;
if (VIR_ALLOC_N(allonesmask, mask_n_bytes / sizeof *mask) < 0)
goto cleanup;
memset(allonesmask, 0xff, mask_n_bytes);
for (n = 0 ; n <= numa_max_node() ; n++) { for (n = 0 ; n <= numa_max_node() ; n++) {
int i; int i;
int ncpus; int ncpus;
/* The first time this returns -1, ENOENT if node doesn't exist... */
if (numa_node_to_cpus(n, mask, mask_n_bytes) < 0) { if (numa_node_to_cpus(n, mask, mask_n_bytes) < 0) {
VIR_WARN("NUMA topology for cell %d of %d not available, ignoring", VIR_WARN("NUMA topology for cell %d of %d not available, ignoring",
n, numa_max_node()); n, numa_max_node()+1);
continue;
}
/* second, third... times it returns an all-1's mask */
if (memcmp(mask, allonesmask, mask_n_bytes) == 0) {
VIR_DEBUG("NUMA topology for cell %d of %d is all ones, ignoring",
n, numa_max_node()+1);
continue; continue;
} }
@ -406,6 +417,7 @@ nodeCapsInitNUMA(virCapsPtr caps)
cleanup: cleanup:
VIR_FREE(cpus); VIR_FREE(cpus);
VIR_FREE(mask); VIR_FREE(mask);
VIR_FREE(allonesmask);
return ret; return ret;
} }