Messages in this thread Patch in this message | | | Date | Wed, 06 Jan 2010 15:55:15 +1100 | From | Anton Blanchard <> | Subject | [patch 6/6] x86: cpumask_of_node() should handle -1 as a node |
| |
pcibus_to_node can return -1 if we cannot determine which node a pci bus is on. If passed -1, cpumask_of_node will negatively index the lookup array and pull in random data:
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus 00000000,00000003,00000000,00000000 # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist 64-65
Change cpumask_of_node to check for -1 and return cpu_all_mask in this case:
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus ffffffff,ffffffff,ffffffff,ffffffff # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist 0-127
Signed-off-by: Anton Blanchard <anton@samba.org> ---
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index c5087d7..cc4f136 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -99,7 +99,8 @@ extern const struct cpumask *cpumask_of_node(int node); /* Returns a pointer to the cpumask of CPUs on Node 'node'. */ static inline const struct cpumask *cpumask_of_node(int node) { - return node_to_cpumask_map[node]; + return (node == -1) ? cpu_all_mask : + node_to_cpumask_map[node]; } #endif diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 550df48..e57a7f5 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -47,6 +47,9 @@ void __init setup_node_to_cpumask_map(void) */ const struct cpumask *cpumask_of_node(int node) { + if (node == -1) + return cpu_all_mask; + if (node >= nr_node_ids) { printk(KERN_WARNING "cpumask_of_node(%d): node > nr_node_ids(%d)\n", --
| |