|
 |
dcabb6 |
From 32075635db57c3d5efe12f8fb569af857e01ccad Mon Sep 17 00:00:00 2001
|
|
|
dcabb6 |
From: Petr Holasek <pholasek@redhat.com>
|
|
|
dcabb6 |
Date: Wed, 14 Jan 2015 09:53:47 +0100
|
|
|
dcabb6 |
Subject: [PATCH] libnuma: add check for return value of numa_node_to_cpus
|
|
|
dcabb6 |
|
|
|
dcabb6 |
When numa_node_to_cpu() has been called on machine with non-contiguous
|
|
|
dcabb6 |
nodes, it returned the first node which wasn't present on machine.
|
|
|
dcabb6 |
Now, return code is checked and code skips over non-existing nodes to
|
|
|
dcabb6 |
the right one.
|
|
|
dcabb6 |
|
|
|
dcabb6 |
Also, caching of numa_node_to_cpus_v2() result while non-zero error had
|
|
|
dcabb6 |
been returned was disabled.
|
|
|
dcabb6 |
|
|
|
dcabb6 |
Signed-off-by: Petr Holasek <pholasek@redhat.com>
|
|
|
dcabb6 |
|
|
|
dcabb6 |
Tested by Cliff Wickman (on attica.sgi.com)
|
|
|
dcabb6 |
---
|
|
|
dcabb6 |
libnuma.c | 13 ++++++++++---
|
|
|
dcabb6 |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
dcabb6 |
|
|
|
dcabb6 |
diff -up numactl-2.0.9/libnuma.c.orig numactl-2.0.9/libnuma.c
|
|
|
dcabb6 |
--- numactl-2.0.9/libnuma.c.orig 2013-10-08 23:34:57.000000000 +0200
|
|
|
dcabb6 |
+++ numactl-2.0.9/libnuma.c 2015-07-01 15:14:44.937178134 +0200
|
|
|
dcabb6 |
@@ -1380,8 +1380,12 @@ numa_node_to_cpus_v2(int node, struct bi
|
|
|
dcabb6 |
if (mask != buffer)
|
|
|
dcabb6 |
numa_bitmask_free(mask);
|
|
|
dcabb6 |
} else {
|
|
|
dcabb6 |
- node_cpu_mask_v2[node] = mask;
|
|
|
dcabb6 |
- }
|
|
|
dcabb6 |
+ /* we don't want to cache faulty result */
|
|
|
dcabb6 |
+ if (!err)
|
|
|
dcabb6 |
+ node_cpu_mask_v2[node] = mask;
|
|
|
dcabb6 |
+ else
|
|
|
dcabb6 |
+ numa_bitmask_free(mask);
|
|
|
dcabb6 |
+ }
|
|
|
dcabb6 |
return err;
|
|
|
dcabb6 |
}
|
|
|
dcabb6 |
__asm__(".symver numa_node_to_cpus_v2,numa_node_to_cpus@@libnuma_1.2");
|
|
|
dcabb6 |
@@ -1403,7 +1407,10 @@ int numa_node_of_cpu(int cpu)
|
|
|
dcabb6 |
bmp = numa_bitmask_alloc(ncpus);
|
|
|
dcabb6 |
nnodes = numa_max_node();
|
|
|
dcabb6 |
for (node = 0; node <= nnodes; node++){
|
|
|
dcabb6 |
- numa_node_to_cpus_v2_int(node, bmp);
|
|
|
dcabb6 |
+ if (numa_node_to_cpus_v2_int(node, bmp) < 0) {
|
|
|
dcabb6 |
+ /* It's possible for the node to not exist */
|
|
|
dcabb6 |
+ continue;
|
|
|
dcabb6 |
+ }
|
|
|
dcabb6 |
if (numa_bitmask_isbitset(bmp, cpu)){
|
|
|
dcabb6 |
ret = node;
|
|
|
dcabb6 |
goto end;
|