Commit 8bc93149 authored by Michael Bringmann's avatar Michael Bringmann Committed by Michael Ellerman

powerpc/vphn: Fix numa update end-loop bug

powerpc/vphn: On Power systems with shared configurations of CPUs
and memory, there are some issues with the association of additional
CPUs and memory to nodes when hot-adding resources.  This patch
fixes an end-of-updates processing problem observed occasionally
in numa_update_cpu_topology().
Signed-off-by: default avatarMichael Bringmann <mwb@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent cee5405d
...@@ -1401,16 +1401,22 @@ int numa_update_cpu_topology(bool cpus_locked) ...@@ -1401,16 +1401,22 @@ int numa_update_cpu_topology(bool cpus_locked)
for_each_cpu(sibling, cpu_sibling_mask(cpu)) { for_each_cpu(sibling, cpu_sibling_mask(cpu)) {
ud = &updates[i++]; ud = &updates[i++];
ud->next = &updates[i];
ud->cpu = sibling; ud->cpu = sibling;
ud->new_nid = new_nid; ud->new_nid = new_nid;
ud->old_nid = numa_cpu_lookup_table[sibling]; ud->old_nid = numa_cpu_lookup_table[sibling];
cpumask_set_cpu(sibling, &updated_cpus); cpumask_set_cpu(sibling, &updated_cpus);
if (i < weight)
ud->next = &updates[i];
} }
cpu = cpu_last_thread_sibling(cpu); cpu = cpu_last_thread_sibling(cpu);
} }
/*
* Prevent processing of 'updates' from overflowing array
* where last entry filled in a 'next' pointer.
*/
if (i)
updates[i-1].next = NULL;
pr_debug("Topology update for the following CPUs:\n"); pr_debug("Topology update for the following CPUs:\n");
if (cpumask_weight(&updated_cpus)) { if (cpumask_weight(&updated_cpus)) {
for (ud = &updates[0]; ud; ud = ud->next) { for (ud = &updates[0]; ud; ud = ud->next) {
......
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