diff options
| author | Jesse Larrew <jlarrew@linux.vnet.ibm.com> | 2013-04-24 06:03:48 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-26 16:08:24 +1000 |
| commit | 176bbf142461a000901df4ec6b8fac04969dd4e5 (patch) | |
| tree | f1dff35fb025f758f5a49315dfccb09277434f98 /arch/powerpc/mm | |
| parent | 30c05350c39de6c17132cfee649518b842d89dd5 (diff) | |
powerpc/pseries: Update NUMA VDSO information when updating CPU maps
The following patch adds vdso_getcpu_init(), which stores the NUMA node for
a cpu in SPRG3:
Commit 18ad51dd34 ("powerpc: Add VDSO version of getcpu") adds
vdso_getcpu_init(), which stores the NUMA node for a cpu in SPRG3.
This patch ensures that this information is also updated when the NUMA
affinity of a cpu changes.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index e8d1aeb6348..f298a7d4b2c 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -30,6 +30,7 @@ #include <asm/paca.h> #include <asm/hvcall.h> #include <asm/setup.h> +#include <asm/vdso.h> static int numa_enabled = 1; @@ -1434,6 +1435,7 @@ static int update_cpu_topology(void *data) unregister_cpu_under_node(update->cpu, update->old_nid); unmap_cpu_from_node(update->cpu); map_cpu_to_node(update->cpu, update->new_nid); + vdso_getcpu_init(); register_cpu_under_node(update->cpu, update->new_nid); } @@ -1449,6 +1451,7 @@ int arch_update_cpu_topology(void) unsigned int cpu, changed = 0; struct topology_update_data *updates, *ud; unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0}; + cpumask_t updated_cpus; struct device *dev; int weight, i = 0; @@ -1460,6 +1463,8 @@ int arch_update_cpu_topology(void) if (!updates) return 0; + cpumask_clear(&updated_cpus); + for_each_cpu(cpu, &cpu_associativity_changes_mask) { ud = &updates[i++]; ud->cpu = cpu; @@ -1470,12 +1475,13 @@ int arch_update_cpu_topology(void) ud->new_nid = first_online_node; ud->old_nid = numa_cpu_lookup_table[cpu]; + cpumask_set_cpu(cpu, &updated_cpus); if (i < weight) ud->next = &updates[i]; } - stop_machine(update_cpu_topology, &updates[0], cpu_online_mask); + stop_machine(update_cpu_topology, &updates[0], &updated_cpus); for (ud = &updates[0]; ud; ud = ud->next) { dev = get_cpu_device(ud->cpu); |