mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Yury Norov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Yury Norov <yury.norov@gmail.com>, Ingo Molnar <mingo@kernel.org>,
	Mel Gorman <mgorman@suse.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] numa: Generalize numa_map_to_online_node()
Date: Fri, 15 Sep 2023 12:03:29 -0000	[thread overview]
Message-ID: <169477940958.27769.18027179711579051058.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230819141239.287290-2-yury.norov@gmail.com>

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     b1f099b1cf51d553c510c6c8141c27d9ba7ea1fe
Gitweb:        https://git.kernel.org/tip/b1f099b1cf51d553c510c6c8141c27d9ba7ea1fe
Author:        Yury Norov <yury.norov@gmail.com>
AuthorDate:    Sat, 19 Aug 2023 07:12:33 -07:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 15 Sep 2023 13:48:09 +02:00

numa: Generalize numa_map_to_online_node()

The function in fact searches the nearest node for a given one,
based on a N_ONLINE state. This is a common pattern to search
for a nearest node.

This patch converts numa_map_to_online_node() to numa_nearest_node()
so that others won't need to opencode the logic.

Signed-off-by: Yury Norov <yury.norov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Mel Gorman <mgorman@suse.de>
Link: https://lore.kernel.org/r/20230819141239.287290-2-yury.norov@gmail.com
---
 include/linux/numa.h |  7 +++++--
 mm/mempolicy.c       | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/include/linux/numa.h b/include/linux/numa.h
index 59df211..fb30a42 100644
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -25,7 +25,7 @@
 #include <asm/sparsemem.h>
 
 /* Generic implementation available */
-int numa_map_to_online_node(int node);
+int numa_nearest_node(int node, unsigned int state);
 
 #ifndef memory_add_physaddr_to_nid
 static inline int memory_add_physaddr_to_nid(u64 start)
@@ -44,10 +44,11 @@ static inline int phys_to_target_node(u64 start)
 }
 #endif
 #else /* !CONFIG_NUMA */
-static inline int numa_map_to_online_node(int node)
+static inline int numa_nearest_node(int node, unsigned int state)
 {
 	return NUMA_NO_NODE;
 }
+
 static inline int memory_add_physaddr_to_nid(u64 start)
 {
 	return 0;
@@ -58,6 +59,8 @@ static inline int phys_to_target_node(u64 start)
 }
 #endif
 
+#define numa_map_to_online_node(node) numa_nearest_node(node, N_ONLINE)
+
 #ifdef CONFIG_HAVE_ARCH_NODE_DEV_GROUP
 extern const struct attribute_group arch_node_dev_group;
 #endif
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 42b5567..d4c0fff 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -131,22 +131,26 @@ static struct mempolicy default_policy = {
 static struct mempolicy preferred_node_policy[MAX_NUMNODES];
 
 /**
- * numa_map_to_online_node - Find closest online node
+ * numa_nearest_node - Find nearest node by state
  * @node: Node id to start the search
+ * @state: State to filter the search
  *
- * Lookup the next closest node by distance if @nid is not online.
+ * Lookup the closest node by distance if @nid is not in state.
  *
- * Return: this @node if it is online, otherwise the closest node by distance
+ * Return: this @node if it is in state, otherwise the closest node by distance
  */
-int numa_map_to_online_node(int node)
+int numa_nearest_node(int node, unsigned int state)
 {
 	int min_dist = INT_MAX, dist, n, min_node;
 
-	if (node == NUMA_NO_NODE || node_online(node))
+	if (state >= NR_NODE_STATES)
+		return -EINVAL;
+
+	if (node == NUMA_NO_NODE || node_state(node, state))
 		return node;
 
 	min_node = node;
-	for_each_online_node(n) {
+	for_each_node_state(n, state) {
 		dist = node_distance(node, n);
 		if (dist < min_dist) {
 			min_dist = dist;
@@ -156,7 +160,7 @@ int numa_map_to_online_node(int node)
 
 	return min_node;
 }
-EXPORT_SYMBOL_GPL(numa_map_to_online_node);
+EXPORT_SYMBOL_GPL(numa_nearest_node);
 
 struct mempolicy *get_task_policy(struct task_struct *p)
 {

  reply	other threads:[~2023-09-15 12:08 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-19 14:12 [PATCH v2 0/6] sched fixes Yury Norov
2023-08-19 14:12 ` [PATCH v2 1/6] numa: generalize numa_map_to_online_node() Yury Norov
2023-09-15 12:03   ` tip-bot2 for Yury Norov [this message]
2023-08-19 14:12 ` [PATCH v2 2/6] sched/fair: fix opencoded numa_nearest_node() Yury Norov
2023-09-15 12:03   ` [tip: sched/core] sched/fair: Fix open-coded numa_nearest_node() tip-bot2 for Yury Norov
2023-08-19 14:12 ` [PATCH v2 3/6] sched: fix sched_numa_find_nth_cpu() in CPU-less case Yury Norov
2023-09-15 12:03   ` [tip: sched/core] sched/topology: Fix " tip-bot2 for Yury Norov
2023-08-19 14:12 ` [PATCH v2 4/6] sched: fix sched_numa_find_nth_cpu() in non-NUMA case Yury Norov
2023-09-15 12:03   ` [tip: sched/core] sched/topology: Fix " tip-bot2 for Yury Norov
2023-08-19 14:12 ` [PATCH v2 5/6] sched: handle NUMA_NO_NODE in sched_numa_find_nth_cpu() Yury Norov
2023-09-15 12:03   ` [tip: sched/core] sched/topology: Handle " tip-bot2 for Yury Norov
2023-08-19 14:12 ` [PATCH v2 6/6] sched: fix sched_numa_find_nth_cpu() comment Yury Norov
2023-09-15 12:03   ` [tip: sched/core] sched/topology: Fix " tip-bot2 for Yury Norov
2023-08-25 11:31 ` [PATCH v2 0/6] sched fixes Yury Norov
2023-09-13  0:01   ` Yury Norov

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=169477940958.27769.18027179711579051058.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mgorman@suse.de \
    --cc=mingo@kernel.org \
    --cc=x86@kernel.org \
    --cc=yury.norov@gmail.com \
    /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

all inboxes | Powered by JetHome®