At node hotplug, cpu can be added before memory depends on evaluation order of
firmware(ACPI) information.
Current ia64's cpu hotplug make an assumption at binding cpu to node.
/*
* Assuming that the container driver would have set the proximity
* domain and would have initialized pxm_to_node(pxm_id) && pxm_flag
*/
If nid is invalid here, cpu is bound to node 0.
So, all cpus on the new node goes to node 0 if cpu is evaluated before memory.
We have node hotplug in -mm now. The container doesn't fixes pxm<->nid
conversion but acpi_map_pxm_to_nid() does it. cpu hotplug should call
acpi_map_pxm_to_nid() to map cpu to new nid. This patch makes cpu hotplug
to call acpi_map_pxm_to_nid().
This fix will map cpus to the correct node.
As a side effect, this shows another problem. node_to_cpu_mask[] should be
updated correctly. This patch also fixes it.
Signed-Off-By: KAMEZAWA Hiroyuki <[email protected]>
arch/ia64/kernel/acpi.c | 10 +++++-----
arch/ia64/kernel/numa.c | 15 ++++++++++++---
include/asm-ia64/topology.h | 1 +
3 files changed, 18 insertions(+), 8 deletions(-)
Index: linux-2.6.17-rc4-mm3/arch/ia64/kernel/numa.c
===================================================================
--- linux-2.6.17-rc4-mm3.orig/arch/ia64/kernel/numa.c 2006-05-26 16:37:50.000000000 +0900
+++ linux-2.6.17-rc4-mm3/arch/ia64/kernel/numa.c 2006-05-26 17:08:14.000000000 +0900
@@ -30,6 +30,17 @@
cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
+/* called by cpu hotplug. */
+void __cpuinit arch_update_cpu_to_node(int cpu, int newnode)
+{
+ int oldnode = cpu_to_node(cpu);
+ cpu_to_node_map[cpu] = (newnode >= 0)? newnode : 0;
+ cpu_clear(cpu, node_to_cpu_mask[oldnode]);
+ if (newnode >= 0)
+ cpu_set(cpu, node_to_cpu_mask[newnode]);
+}
+
+
/**
* build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
*
@@ -50,8 +61,6 @@
node = node_cpuid[i].nid;
break;
}
- cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
- if (node >= 0)
- cpu_set(cpu, node_to_cpu_mask[node]);
+ arch_update_cpu_to_node(cpu, node);
}
}
Index: linux-2.6.17-rc4-mm3/arch/ia64/kernel/acpi.c
===================================================================
--- linux-2.6.17-rc4-mm3.orig/arch/ia64/kernel/acpi.c 2006-05-26 16:38:35.000000000 +0900
+++ linux-2.6.17-rc4-mm3/arch/ia64/kernel/acpi.c 2006-05-26 17:05:35.000000000 +0900
@@ -812,16 +812,16 @@
{
#ifdef CONFIG_ACPI_NUMA
int pxm_id;
+ int nid;
pxm_id = acpi_get_pxm(handle);
+ nid = acpi_map_pxm_to_node(pxm_id);
- /*
- * Assuming that the container driver would have set the proximity
- * domain and would have initialized pxm_to_node(pxm_id) && pxm_flag
- */
- node_cpuid[cpu].nid = (pxm_id < 0) ? 0 : pxm_to_node(pxm_id);
+ node_cpuid[cpu].nid = nid;
node_cpuid[cpu].phys_id = physid;
+
+ arch_update_cpu_to_node(cpu, nid);
#endif
return (0);
}
Index: linux-2.6.17-rc4-mm3/include/asm-ia64/topology.h
===================================================================
--- linux-2.6.17-rc4-mm3.orig/include/asm-ia64/topology.h 2006-05-26 16:37:50.000000000 +0900
+++ linux-2.6.17-rc4-mm3/include/asm-ia64/topology.h 2006-05-26 17:05:35.000000000 +0900
@@ -54,6 +54,7 @@
*/
#define pcibus_to_node(bus) PCI_CONTROLLER(bus)->node
+void arch_update_cpu_to_node(int cpu, int nid);
void build_cpu_to_node_map(void);
#define SD_CPU_INIT (struct sched_domain) { \
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
