Commit 3212fe15 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds

[PATCH] cpu to node relationship fixup: map cpu to node

Assume that a cpu is *physically* offlined at boot time...

Because smpboot.c::smp_boot_cpu_map() canoot find cpu's sapicid,
numa.c::build_cpu_to_node_map() cannot build cpu<->node map for
offlined cpu.

For such cpus, cpu_to_node map should be fixed at cpu-hot-add.
This mapping should be done before cpu onlining.

This patch also handles cpu hotremove case.
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 08992986
...@@ -29,6 +29,36 @@ EXPORT_SYMBOL(cpu_to_node_map); ...@@ -29,6 +29,36 @@ EXPORT_SYMBOL(cpu_to_node_map);
cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
void __cpuinit map_cpu_to_node(int cpu, int nid)
{
int oldnid;
if (nid < 0) { /* just initialize by zero */
cpu_to_node_map[cpu] = 0;
return;
}
/* sanity check first */
oldnid = cpu_to_node_map[cpu];
if (cpu_isset(cpu, node_to_cpu_mask[oldnid])) {
return; /* nothing to do */
}
/* we don't have cpu-driven node hot add yet...
In usual case, node is created from SRAT at boot time. */
if (!node_online(nid))
nid = first_online_node;
cpu_to_node_map[cpu] = nid;
cpu_set(cpu, node_to_cpu_mask[nid]);
return;
}
void __cpuinit unmap_cpu_from_node(int cpu, int nid)
{
WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));
WARN_ON(cpu_to_node_map[cpu] != nid);
cpu_to_node_map[cpu] = 0;
cpu_clear(cpu, node_to_cpu_mask[nid]);
}
/** /**
* build_cpu_to_node_map - setup cpu to node and node to cpumask arrays * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
* *
...@@ -49,8 +79,6 @@ void __init build_cpu_to_node_map(void) ...@@ -49,8 +79,6 @@ void __init build_cpu_to_node_map(void)
node = node_cpuid[i].nid; node = node_cpuid[i].nid;
break; break;
} }
cpu_to_node_map[cpu] = (node >= 0) ? node : 0; map_cpu_to_node(cpu, node);
if (node >= 0)
cpu_set(cpu, node_to_cpu_mask[node]);
} }
} }
...@@ -36,6 +36,9 @@ int arch_register_cpu(int num) ...@@ -36,6 +36,9 @@ int arch_register_cpu(int num)
*/ */
if (!can_cpei_retarget() && is_cpu_cpei_target(num)) if (!can_cpei_retarget() && is_cpu_cpei_target(num))
sysfs_cpus[num].cpu.no_control = 1; sysfs_cpus[num].cpu.no_control = 1;
#ifdef CONFIG_NUMA
map_cpu_to_node(num, node_cpuid[num].nid);
#endif
#endif #endif
return register_cpu(&sysfs_cpus[num].cpu, num); return register_cpu(&sysfs_cpus[num].cpu, num);
...@@ -45,7 +48,8 @@ int arch_register_cpu(int num) ...@@ -45,7 +48,8 @@ int arch_register_cpu(int num)
void arch_unregister_cpu(int num) void arch_unregister_cpu(int num)
{ {
return unregister_cpu(&sysfs_cpus[num].cpu); unregister_cpu(&sysfs_cpus[num].cpu);
unmap_cpu_from_node(num, cpu_to_node(num));
} }
EXPORT_SYMBOL(arch_register_cpu); EXPORT_SYMBOL(arch_register_cpu);
EXPORT_SYMBOL(arch_unregister_cpu); EXPORT_SYMBOL(arch_unregister_cpu);
......
...@@ -64,6 +64,10 @@ extern int paddr_to_nid(unsigned long paddr); ...@@ -64,6 +64,10 @@ extern int paddr_to_nid(unsigned long paddr);
#define local_nodeid (cpu_to_node_map[smp_processor_id()]) #define local_nodeid (cpu_to_node_map[smp_processor_id()])
extern void map_cpu_to_node(int cpu, int nid);
extern void unmap_cpu_from_node(int cpu, int nid);
#else /* !CONFIG_NUMA */ #else /* !CONFIG_NUMA */
#define paddr_to_nid(addr) 0 #define paddr_to_nid(addr) 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment