From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Subject: [PATCH v4 3/5] powerpc/numa: Use cpu node map of first sibling thread
Date: Fri, 13 Sep 2019 16:39:43 +0530 [thread overview]
Message-ID: <20190913110945.12564-4-srikar@linux.vnet.ibm.com> (raw)
In-Reply-To: <20190913110945.12564-1-srikar@linux.vnet.ibm.com>
All the sibling threads of a core have to be part of the same node.
To ensure that all the sibling threads map to the same node, always
lookup/update the cpu-to-node map of the first thread in the core.
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
---
Changelog: v3->v4
As suggested by Nathan, add a warning while mapping offline cpu.
arch/powerpc/mm/numa.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 8fbe57c..63ec0c3 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -467,15 +467,20 @@ static int of_drconf_to_nid_single(struct drmem_lmb *lmb)
*/
static int numa_setup_cpu(unsigned long lcpu)
{
- int nid = NUMA_NO_NODE;
struct device_node *cpu;
+ int fcpu = cpu_first_thread_sibling(lcpu);
+ int nid = NUMA_NO_NODE;
/*
* If a valid cpu-to-node mapping is already available, use it
* directly instead of querying the firmware, since it represents
* the most recent mapping notified to us by the platform (eg: VPHN).
+ * Since cpu_to_node binding remains the same for all threads in the
+ * core. If a valid cpu-to-node mapping is already available, for
+ * the first thread in the core, use it.
*/
- if ((nid = numa_cpu_lookup_table[lcpu]) >= 0) {
+ nid = numa_cpu_lookup_table[fcpu];
+ if (nid >= 0) {
map_cpu_to_node(lcpu, nid);
return nid;
}
@@ -496,6 +501,19 @@ static int numa_setup_cpu(unsigned long lcpu)
if (nid < 0 || !node_possible(nid))
nid = first_online_node;
+ /*
+ * Update for the first thread of the core. All threads of a core
+ * have to be part of the same node. This not only avoids querying
+ * for every other thread in the core, but always avoids a case
+ * where virtual node associativity change causes subsequent threads
+ * of a core to be associated with different nid. However if first
+ * thread is already online, expect it to have a valid mapping.
+ */
+ if (fcpu != lcpu) {
+ WARN_ON(cpu_online(fcpu));
+ map_cpu_to_node(fcpu, nid);
+ }
+
map_cpu_to_node(lcpu, nid);
of_node_put(cpu);
out:
--
1.8.3.1
next prev parent reply other threads:[~2019-09-13 11:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 11:09 [PATCH v4 0/5] Early node associativity Srikar Dronamraju
2019-09-13 11:09 ` [PATCH v4 1/5] powerpc/vphn: Check for error from hcall_vphn Srikar Dronamraju
2019-10-02 17:51 ` Nathan Lynch
2019-09-13 11:09 ` [PATCH v4 2/5] powerpc/numa: Handle extra hcall_vphn error cases Srikar Dronamraju
2019-10-02 17:54 ` Nathan Lynch
2019-09-13 11:09 ` Srikar Dronamraju [this message]
2019-10-02 17:55 ` [PATCH v4 3/5] powerpc/numa: Use cpu node map of first sibling thread Nathan Lynch
2019-09-13 11:09 ` [PATCH v4 4/5] powerpc/numa: Early request for home node associativity Srikar Dronamraju
2019-10-02 17:56 ` Nathan Lynch
2019-09-13 11:09 ` [PATCH v4 5/5] powerpc/numa: Remove late " Srikar Dronamraju
2019-10-02 17:57 ` Nathan Lynch
2019-10-02 17:59 ` [PATCH v4 0/5] Early " Nathan Lynch
2019-10-17 12:27 ` Nathan Lynch
2019-11-15 13:37 ` Srikar Dronamraju
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=20190913110945.12564-4-srikar@linux.vnet.ibm.com \
--to=srikar@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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).