forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID

Browse source 
Based off 3bccd996 for ia64, convert powerpc to use the generic per-CPU
topology tracking, specifically:

    initialize per cpu numa_node entry in start_secondary
    remove the powerpc cpu_to_node()
    define CONFIG_USE_PERCPU_NUMA_NODE_ID if NUMA

Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Nishanth Aravamudan 2014-05-19 11:14:23 -07:00 • committed by Benjamin Herrenschmidt
commit 8c27226119
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/powerpc/Kconfig
View file

@ -453,6 +453,10 @@ config NODES_SHIFT
default "4" default "4"
depends on NEED_MULTIPLE_NODES depends on NEED_MULTIPLE_NODES
config USE_PERCPU_NUMA_NODE_ID
def_bool y
depends on NUMA
config ARCH_SELECT_MEMORY_MODEL config ARCH_SELECT_MEMORY_MODEL
def_bool y def_bool y
depends on PPC64 depends on PPC64

13
arch/powerpc/include/asm/topology.h
View file

@ -20,19 +20,6 @@ struct device_node;
#include <asm/mmzone.h> #include <asm/mmzone.h>
static inline int cpu_to_node(int cpu)
{
int nid;
nid = numa_cpu_lookup_table[cpu];
/*
* During early boot, the numa-cpu lookup table might not have been
* setup for all CPUs yet. In such cases, default to node 0.
*/
return (nid < 0) ? 0 : nid;
}
#define parent_node(node) (node) #define parent_node(node) (node)
#define cpumask_of_node(node) ((node) == -1 ? \ #define cpumask_of_node(node) ((node) == -1 ? \

6
arch/powerpc/kernel/smp.c
View file

@ -390,6 +390,7 @@ void smp_prepare_boot_cpu(void)
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
paca[boot_cpuid].__current = current; paca[boot_cpuid].__current = current;
#endif #endif
set_numa_node(numa_cpu_lookup_table[boot_cpuid]);
current_set[boot_cpuid] = task_thread_info(current); current_set[boot_cpuid] = task_thread_info(current);
} }
@ -750,6 +751,11 @@ void start_secondary(void *unused)
} }
traverse_core_siblings(cpu, true); traverse_core_siblings(cpu, true);
/*
* numa_node_id() works after this.
*/
set_numa_node(numa_cpu_lookup_table[cpu]);
smp_wmb(); smp_wmb();
notify_cpu_starting(cpu); notify_cpu_starting(cpu);
set_cpu_online(cpu, true); set_cpu_online(cpu, true);