powerpc/numa: Associate numa node to its cpu earlier
Subsystems (2)
PATCH 1/1 powerpc/numa: Associate numa node to its cpu earlier
powerpc is the only platform that do not rely on cpu_up()->try_online_node() to bring up a numa node, and special cases it, instead, deep in its own machinery:
dlpar_online_cpu
find_and_online_cpu_nid
try_online_node
This should not be needed, but the thing is that the try_online_node() from cpu_up() will not apply on the right node, because cpu_to_node() will return the old mapping numa<->cpu that gets set on boot stage for all possible cpus.
That can be seen easily if we try to print out the numa node passed to try_online_node() in cpu_up().
The thing is that the numa<->cpu mapping does not get updated till a much later stage in start_secondary:
start_secondary:
set_numa_node(numa_cpu_lookup_table[cpu])
But we do not really care, as we already now the
CPU <-> NUMA associativity back in find_and_online_cpu_nid(), so let us make use of that and set the proper numa<->cpu mapping, so cpu_to_node() in cpu_up() returns the right node and try_online_node() can do its work.
--- arch/powerpc/include/asm/topology.h | 8 ++----- arch/powerpc/mm/numa.c | 31 +++++++--------------------- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- 3 files changed, 11 insertions(+), 30 deletions(-)
arch/powerpc/include/asm/topology.h +2 -6
@@ -111,14 +111,10 @@ static inline void unmap_cpu_from_node(unsigned long cpu) {}#endif /* CONFIG_NUMA */ #if defined(CONFIG_NUMA ) && defined(CONFIG_PPC_SPLPAR ) -extern int find_and_online_cpu_nid (int cpu); +extern void find_and_update_cpu_nid (int cpu);extern int cpu_to_coregroup_id (int cpu);#else -static inline int find_and_online_cpu_nid (int cpu) -{ -return 0 ; -} - +static inline void find_and_update_cpu_nid (int cpu) {}static inline int cpu_to_coregroup_id (int cpu) {#ifdef CONFIG_SMP
arch/powerpc/mm/numa.c +8 -23
@@ -1423,43 +1423,28 @@ static long vphn_get_associativity(unsigned long cpu,return rc; } -int find_and_online_cpu_nid (int cpu) +void find_and_update_cpu_nid (int cpu) {__be32 associativity[VPHN_ASSOC_BUFSIZE ] = {0 };int new_nid;/* Use associativity from first thread for all siblings */ if (vphn_get_associativity (cpu, associativity)) -return cpu_to_node (cpu); +return ; +/* Do not have previous associativity, so find it now. */ new_nid =associativity_to_nid (associativity); +if (new_nid <0 || !node_possible (new_nid)) new_nid = first_online_node; - -if (NODE_DATA (new_nid) ==NULL ) { -#ifdef CONFIG_MEMORY_HOTPLUG -/* -* Need to ensure that NODE_DATA is initialized for a node from -* available memory (see memblock_alloc_try_nid). If unable to -* init the node, then default to nearest node that has memory -* installed. Skip onlining a node if the subsystems are not -* yet initialized. -*/ -if (!topology_inited ||try_online_node (new_nid)) - new_nid = first_online_node; -#else -/* -* Default to using the nearest node that has memory installed. -* Otherwise, it would be necessary to patch the kernel MM code -* to deal with more memoryless-node error conditions. +else +/* Associate node <-> cpu, so cpu_up() calls +* try_online_node() on the right node. */ - new_nid = first_online_node; -#endif - } +set_cpu_numa_node (cpu, new_nid);pr_debug ("%s:%d cpu %d nid %d\n" , __FUNCTION__, __LINE__, cpu, new_nid); -return new_nid; }int cpu_to_coregroup_id (int cpu)
arch/powerpc/platforms/pseries/hotplug-cpu.c +1 -1
@@ -398,7 +398,7 @@ static int dlpar_online_cpu(struct device_node *dn)if (get_hard_smp_processor_id (cpu) != thread)continue ;cpu_maps_update_done (); -find_and_online_cpu_nid (cpu); +find_and_update_cpu_nid (cpu); rc =device_online (get_cpu_device (cpu));if (rc) {dlpar_offline_cpu (dn);
Signature · 1 line
2.16.4
Quoted 74 lines · Oscar Salvador
powerpc is the only platform that do not rely on cpu_up()->try_online_node() to bring up a numa node, and special cases it, instead, deep in its own machinery:
dlpar_online_cpu
find_and_online_cpu_nid
try_online_nodeThis should not be needed, but the thing is that the
try_online_node()fromcpu_up()will not apply on the right node, becausecpu_to_node()will return the old mapping numa<->cpu that gets set on boot stage for all possible cpus.That can be seen easily if we try to print out the numa node passed to
try_online_node()incpu_up().The thing is that the numa<->cpu mapping does not get updated till a much later stage in
start_secondary:
start_secondary:
set_numa_node(numa_cpu_lookup_table[cpu])But we do not really care, as we already now the
CPU <-> NUMA associativity back infind_and_online_cpu_nid(), so let us make use of that and set the proper numa<->cpu mapping, socpu_to_node()incpu_up()returns the right node andtry_online_node()can do its work.Signed-off-by Oscar Salvador <[email protected]>Reviewed-by Srikar Dronamraju <[email protected]>Tested-by Geetika Moolchandani <[email protected]>--- arch/powerpc/include/asm/topology.h | 8 ++----- arch/powerpc/mm/numa.c | 31 +++++++--------------------- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- 3 files changed, 11 insertions(+), 30 deletions(-)arch/powerpc/include/asm/topology.h +2
-6@@ -111,14 +111,10 @@ static inline void unmap_cpu_from_node(unsigned long cpu) {}#endif /* CONFIG_NUMA */ #if defined(CONFIG_NUMA ) && defined(CONFIG_PPC_SPLPAR ) -extern int find_and_online_cpu_nid (int cpu); +extern void find_and_update_cpu_nid (int cpu);extern int cpu_to_coregroup_id (int cpu);#else -static inline int find_and_online_cpu_nid (int cpu) -{ -return 0 ; -} - +static inline void find_and_update_cpu_nid (int cpu) {}static inline int cpu_to_coregroup_id (int cpu) {#ifdef CONFIG_SMP arch/powerpc/mm/numa.c +1
-1@@ -1423,43 +1423,28 @@ static long vphn_get_associativity(unsigned long cpu,return rc; } -int find_and_online_cpu_nid (int cpu) +void find_and_update_cpu_nid (int cpu) {__be32 associativity[VPHN_ASSOC_BUFSIZE ] = {0 };int new_nid;/* Use associativity from first thread for all siblings */ if (vphn_get_associativity (cpu, associativity))
arch/powerpc/mm/numa.c static long vphn_get_associativity(unsigned long cpu, · line 1439
Quoted 10 lines
arch/powerpc/mm/numa.c +3
-3-return cpu_to_node (cpu); +return ; +/* Do not have previous associativity, so find it now. */ new_nid =associativity_to_nid (associativity); +if (new_nid <0 || !node_possible (new_nid)) new_nid = first_online_node; - -if (NODE_DATA (new_nid) ==NULL ) {
Given that my patch got accepted into powerpc tree
https://git.kernel.org/powerpc/c/e4ff77598a109bd36789ad5e80aba66fc53d0ffb
is now part of Linus tree, this line may need a slight tweak.
Quoted 46 lines
arch/powerpc/mm/numa.c +4
-19-#ifdef CONFIG_MEMORY_HOTPLUG -/* -* Need to ensure that NODE_DATA is initialized for a node from -* available memory (see memblock_alloc_try_nid). If unable to -* init the node, then default to nearest node that has memory -* installed. Skip onlining a node if the subsystems are not -* yet initialized. -*/ -if (!topology_inited ||try_online_node (new_nid)) - new_nid = first_online_node; -#else -/* -* Default to using the nearest node that has memory installed. -* Otherwise, it would be necessary to patch the kernel MM code -* to deal with more memoryless-node error conditions. +else +/* Associate node <-> cpu, so cpu_up() calls +* try_online_node() on the right node. */ - new_nid = first_online_node; -#endif - } +set_cpu_numa_node (cpu, new_nid);pr_debug ("%s:%d cpu %d nid %d\n" , __FUNCTION__, __LINE__, cpu, new_nid); -return new_nid; }int cpu_to_coregroup_id (int cpu)arch/powerpc/platforms/pseries/hotplug-cpu.c +1
-1@@ -398,7 +398,7 @@ static int dlpar_online_cpu(struct device_node *dn)if (get_hard_smp_processor_id (cpu) != thread)continue ;cpu_maps_update_done (); -find_and_online_cpu_nid (cpu); +find_and_update_cpu_nid (cpu); rc =device_online (get_cpu_device (cpu));if (rc) {dlpar_offline_cpu (dn);Signature · 1 line
2.16.4
Quoted 3 lines · Srikar Dronamraju
Given that my patch got accepted into powerpc tree
https://git.kernel.org/powerpc/c/e4ff77598a109bd36789ad5e80aba66fc53d0ffb
is now part of Linus tree, this line may need a slight tweak.
Right.
@Michael: Will you resolve the conflict, or you would rather want me to send v2 with the amendment?
Signature · 2 lines
Oscar Salvador SUSE Labs
Michael Ellerman
reviewerQuoted 9 lines · Oscar Salvador
Quoted 3 lines · Srikar Dronamraju
Given that my patch got accepted into powerpc tree
https://git.kernel.org/powerpc/c/e4ff77598a109bd36789ad5e80aba66fc53d0ffb
is now part of Linus tree, this line may need a slight tweak.Right.
@Michael: Will you resolve the conflict, or you would rather want me to send v2 with the amendment?
I can resolve the conflict, it should be trivial. If there's any trouble I'll let you know.
cheers
Michael Ellerman
AppliedQuoted 9 lines · Oscar Salvador
powerpc is the only platform that do not rely on cpu_up()->try_online_node() to bring up a numa node, and special cases it, instead, deep in its own machinery:
dlpar_online_cpu
find_and_online_cpu_nid
try_online_node[...]
Applied to powerpc/next.
[1/1] powerpc/numa: Associate numa node to its cpu earlier
https://git.kernel.org/powerpc/c/48b63961c84671df4c4a4451c40057e34b26df1a
cheers