[PATCH v2 4/4] powerpc/numa: Set fallback nodes for offline nodes
From: Srikar Dronamraju <hidden>
Date: 2020-03-18 07:28:48
Also in:
linux-mm
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Linus Torvalds
Currently fallback nodes for offline nodes aren't set. Hence by default node 0 ends up being the default node. However node 0 might be offline. Fix this by explicitly setting fallback node. Ensure first_memory_node is set before kernel does explicit setting of fallback node. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org Cc: Mel Gorman <mgorman@suse.de> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Sachin Sant <redacted> Cc: Michal Hocko <mhocko@kernel.org> Cc: Christopher Lameter <redacted> Cc: linuxppc-dev@lists.ozlabs.org Cc: Joonsoo Kim <redacted> Cc: Kirill Tkhai <redacted> Cc: Vlastimil Babka <redacted> Cc: Srikar Dronamraju <redacted> Cc: Bharata B Rao <redacted> Cc: Nathan Lynch <redacted> Reported-by: Sachin Sant <redacted> Tested-by: Sachin Sant <redacted> Signed-off-by: Srikar Dronamraju <redacted> --- Changelog v1 -> v2: - Handled comments from Bharata B Rao - Dont use dump_numa_cpu_topology to set fallback nodes arch/powerpc/include/asm/topology.h | 16 ++++++++++++++++ arch/powerpc/kernel/smp.c | 1 + 2 files changed, 17 insertions(+)
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index 2db7ba789720..baa89364197c 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h@@ -62,6 +62,21 @@ static inline int early_cpu_to_node(int cpu) */ return (nid < 0) ? 0 : nid; } + +static inline int update_default_numa_mem(void) +{ + unsigned int node; + + for_each_node(node) { + /* + * For all possible but not yet online nodes, ensure their + * node_numa_mem is set correctly so that kmalloc_node works + * for such nodes. + */ + if (!node_online(node)) + reset_numa_mem(node); + } +} #else static inline int early_cpu_to_node(int cpu) { return 0; }
@@ -90,6 +105,7 @@ static inline int cpu_distance(__be32 *cpu1_assoc, __be32 *cpu2_assoc) return 0; } +static inline int update_default_numa_mem(void) {} #endif /* CONFIG_NUMA */ #if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 37c12e3bab9e..d23faa70ea2d 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c@@ -1383,6 +1383,7 @@ void __init smp_cpus_done(unsigned int max_cpus) if (smp_ops && smp_ops->bringup_done) smp_ops->bringup_done(); + update_default_numa_mem(); dump_numa_cpu_topology(); #ifdef CONFIG_SCHED_SMT
--
2.18.1