From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Gautham R Shenoy <ego@linux.vnet.ibm.com>,
Michal Hocko <mhocko@suse.com>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
David Hildenbrand <david@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>,
Mel Gorman <mgorman@suse.de>,
"Kirill A. Shutemov" <kirill@shutemov.name>,
Christopher Lameter <cl@linux.com>,
linuxppc-dev@lists.ozlabs.org, Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v5 2/3] powerpc/numa: Prefer node id queried from vphn
Date: Wed, 24 Jun 2020 14:58:45 +0530 [thread overview]
Message-ID: <20200624092846.9194-3-srikar@linux.vnet.ibm.com> (raw)
In-Reply-To: <20200624092846.9194-1-srikar@linux.vnet.ibm.com>
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 v4:->v5:
- rebased to v5.8-rc2
link v4: http://lore.kernel.org/lkml/20200512132937.19295-1-srikar@linux.vnet.ibm.com/t/#u
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 | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 5b7918c132f5..163f5dc8fd46 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -724,21 +724,22 @@ 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);
--
2.18.1
next prev parent reply other threads:[~2020-06-24 9:34 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 9:28 [PATCH v5 0/3] Offline memoryless cpuless node 0 Srikar Dronamraju
2020-06-24 9:28 ` [PATCH v5 1/3] powerpc/numa: Set numa_node for all possible cpus Srikar Dronamraju
2020-06-24 9:48 ` Gautham R Shenoy
2020-06-24 9:28 ` Srikar Dronamraju [this message]
2020-06-24 10:29 ` [PATCH v5 2/3] powerpc/numa: Prefer node id queried from vphn Gautham R Shenoy
2020-06-24 9:28 ` [PATCH v5 3/3] mm/page_alloc: Keep memoryless cpuless node 0 offline Srikar Dronamraju
2020-06-29 14:58 ` Christopher Lameter
2020-06-30 4:01 ` Srikar Dronamraju
2020-07-01 12:23 ` Michal Hocko
2020-07-01 8:42 ` Michal Hocko
2020-07-01 10:04 ` Srikar Dronamraju
2020-07-01 10:15 ` David Hildenbrand
2020-07-01 11:01 ` Srikar Dronamraju
2020-07-01 11:06 ` David Hildenbrand
2020-07-01 11:30 ` David Hildenbrand
2020-07-01 12:21 ` Michal Hocko
2020-07-02 6:44 ` Srikar Dronamraju
2020-07-02 8:41 ` Michal Hocko
2020-07-02 14:32 ` Srikar Dronamraju
2020-07-03 9:10 ` Michal Suchánek
2020-07-03 9:24 ` Michal Hocko
2020-07-03 10:59 ` Michal Hocko
2020-07-03 11:32 ` David Hildenbrand
2020-07-03 11:46 ` Michal Hocko
2020-07-03 12:58 ` Srikar Dronamraju
2020-08-07 4:32 ` Andrew Morton
2020-08-07 6:58 ` David Hildenbrand
2020-08-07 10:04 ` Michal Suchánek
2020-08-12 6:01 ` Srikar Dronamraju
2020-08-18 7:32 ` David Hildenbrand
2020-08-18 7:37 ` Michal Hocko
2020-08-18 7:49 ` Srikar Dronamraju
2020-07-06 16:08 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200624092846.9194-3-srikar@linux.vnet.ibm.com \
--to=srikar@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=david@redhat.com \
--cc=ego@linux.vnet.ibm.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=sathnaga@linux.vnet.ibm.com \
--cc=torvalds@linux-foundation.org \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).