| Message ID | 20200512132937.19295-3-srikar@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Offline memoryless cpuless node 0 | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (78263190ec9727216ca715bfc0ee8b58b657d1ea) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (1f12096aca212af8fad3ef58d5673cde691a1452) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (152036d1379ffd6985262743dcf6b0f9c75f83a4) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (c44dc6323cd49d8d742c37e234b952e822c35de4) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linux-next (e098d7762d602be640c53565ceca342f81e55ad2) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
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: linuxppc-dev@lists.ozlabs.org > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Cc: Michal Hocko <mhocko@suse.com> > Cc: Mel Gorman <mgorman@suse.de> > Cc: Vlastimil Babka <vbabka@suse.cz> > Cc: "Kirill A. Shutemov" <kirill@shutemov.name> > Cc: Christopher Lameter <cl@linux.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Linus Torvalds <torvalds@linux-foundation.org> > Cc: Gautham R Shenoy <ego@linux.vnet.ibm.com> > Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com> > Cc: David Hildenbrand <david@redhat.com> > Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Looks good to me. Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com> > --- > Changelog v2:->v3: > - Resolved comments from Gautham. > Link v2: https://lore.kernel.org/linuxppc-dev/20200428093836.27190-1-srikar@linux.vnet.ibm.com/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 >
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); }
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: linuxppc-dev@lists.ozlabs.org Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Cc: Michal Hocko <mhocko@suse.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: Christopher Lameter <cl@linux.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Gautham R Shenoy <ego@linux.vnet.ibm.com> Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com> Cc: David Hildenbrand <david@redhat.com> Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> --- Changelog v2:->v3: - Resolved comments from Gautham. Link v2: https://lore.kernel.org/linuxppc-dev/20200428093836.27190-1-srikar@linux.vnet.ibm.com/t/#u Changelog v1:->v2: - Rebased to v5.7-rc3 arch/powerpc/mm/numa.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) get_n_mem_cells(&n_mem_addr_cells, &n_mem_size_cells);