From: Jesse Larrew <jlar...@linux.vnet.ibm.com>

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 <nf...@linux.vnet.ibm.com>
---
 arch/powerpc/mm/numa.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Index: powerpc/arch/powerpc/mm/numa.c
===================================================================
--- powerpc.orig/arch/powerpc/mm/numa.c 2013-03-20 12:27:43.000000000 -0500
+++ powerpc/arch/powerpc/mm/numa.c      2013-03-20 12:27:46.000000000 -0500
@@ -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;
 
@@ -1426,6 +1427,7 @@
        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);
 
        return 0;
@@ -1440,8 +1442,11 @@
        int cpu, changed = 0;
        struct topology_update_data update;
        unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};
+       cpumask_t updated_cpu;
        struct device *dev;
 
+       cpumask_clear(&updated_cpu);
+
        for_each_cpu(cpu, &cpu_associativity_changes_mask) {
                update.cpu = cpu;
                vphn_get_associativity(cpu, associativity);
@@ -1451,7 +1456,8 @@
                        update.new_nid = first_online_node;
 
                update.old_nid = numa_cpu_lookup_table[cpu];
-               stop_machine(update_cpu_topology, &update, cpu_online_mask);
+               cpumask_set_cpu(cpu, &updated_cpu);
+               stop_machine(update_cpu_topology, &update, &updated_cpu);
                dev = get_cpu_device(cpu);
                if (dev)
                        kobject_uevent(&dev->kobj, KOBJ_CHANGE);

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to