On Tue, May 12, 2020 at 06:59:36PM +0530, Srikar Dronamraju wrote: > Node id queried from the static device tree may not > be correct. For example: it may always show 0 on a shared processor. > Hence prefer the node id queried from vphn and fallback on the device tree > based node id if vphn query fails. > > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Cc: Michal Hocko <[email protected]> > Cc: Mel Gorman <[email protected]> > Cc: Vlastimil Babka <[email protected]> > Cc: "Kirill A. Shutemov" <[email protected]> > Cc: Christopher Lameter <[email protected]> > Cc: Michael Ellerman <[email protected]> > Cc: Andrew Morton <[email protected]> > Cc: Linus Torvalds <[email protected]> > Cc: Gautham R Shenoy <[email protected]> > Cc: Satheesh Rajendran <[email protected]> > Cc: David Hildenbrand <[email protected]> > Signed-off-by: Srikar Dronamraju <[email protected]>
Looks good to me. Reviewed-by: Gautham R. Shenoy <[email protected]> > --- > Changelog v2:->v3: > - Resolved comments from Gautham. > Link v2: > https://lore.kernel.org/linuxppc-dev/[email protected]/t/#u > > Changelog v1:->v2: > - Rebased to v5.7-rc3 > > arch/powerpc/mm/numa.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index b3615b7..2815313 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -719,20 +719,20 @@ static int __init parse_numa_properties(void) > */ > for_each_present_cpu(i) { > struct device_node *cpu; > - int nid; > - > - cpu = of_get_cpu_node(i, NULL); > - BUG_ON(!cpu); > - nid = of_node_to_nid_single(cpu); > - of_node_put(cpu); > + int nid = vphn_get_nid(i); > > /* > * Don't fall back to default_nid yet -- we will plug > * cpus into nodes once the memory scan has discovered > * the topology. > */ > - if (nid < 0) > - continue; > - node_set_online(nid); > + if (nid == NUMA_NO_NODE) { > + cpu = of_get_cpu_node(i, NULL); > + BUG_ON(!cpu); > + nid = of_node_to_nid_single(cpu); > + of_node_put(cpu); > + } > + > + if (likely(nid > 0)) > + node_set_online(nid); > } > > get_n_mem_cells(&n_mem_addr_cells, &n_mem_size_cells); > -- > 1.8.3.1 >
