|
@@ -570,16 +570,38 @@ out:
|
|
|
return nid;
|
|
|
}
|
|
|
|
|
|
+static void verify_cpu_node_mapping(int cpu, int node)
|
|
|
+{
|
|
|
+ int base, sibling, i;
|
|
|
+
|
|
|
+ /* Verify that all the threads in the core belong to the same node */
|
|
|
+ base = cpu_first_thread_sibling(cpu);
|
|
|
+
|
|
|
+ for (i = 0; i < threads_per_core; i++) {
|
|
|
+ sibling = base + i;
|
|
|
+
|
|
|
+ if (sibling == cpu || cpu_is_offline(sibling))
|
|
|
+ continue;
|
|
|
+
|
|
|
+ if (cpu_to_node(sibling) != node) {
|
|
|
+ WARN(1, "CPU thread siblings %d and %d don't belong"
|
|
|
+ " to the same node!\n", cpu, sibling);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
static int cpu_numa_callback(struct notifier_block *nfb, unsigned long action,
|
|
|
void *hcpu)
|
|
|
{
|
|
|
unsigned long lcpu = (unsigned long)hcpu;
|
|
|
- int ret = NOTIFY_DONE;
|
|
|
+ int ret = NOTIFY_DONE, nid;
|
|
|
|
|
|
switch (action) {
|
|
|
case CPU_UP_PREPARE:
|
|
|
case CPU_UP_PREPARE_FROZEN:
|
|
|
- numa_setup_cpu(lcpu);
|
|
|
+ nid = numa_setup_cpu(lcpu);
|
|
|
+ verify_cpu_node_mapping((int)lcpu, nid);
|
|
|
ret = NOTIFY_OK;
|
|
|
break;
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|