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: Yicong Yang <yangyicong@hisilicon.com>,
	Guenter Roeck <linux@roeck-us.net>,
	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] sched/topology: Fix sched_numa_find_nth_cpu() in CPU-less case
Date: Fri, 15 Sep 2023 12:03:28 -0000	[thread overview]
Message-ID: <169477940847.27769.15320684535553252937.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230819141239.287290-4-yury.norov@gmail.com>

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

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

sched/topology: Fix sched_numa_find_nth_cpu() in CPU-less case

When the node provided by user is CPU-less, corresponding record in
sched_domains_numa_masks is not set. Trying to dereference it in the
following code leads to kernel crash.

To avoid it, start searching from the nearest node with CPUs.

Fixes: cd7f55359c90 ("sched: add sched_numa_find_nth_cpu()")
Reported-by: Yicong Yang <yangyicong@hisilicon.com>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Yury Norov <yury.norov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: Mel Gorman <mgorman@suse.de>
Link: https://lore.kernel.org/r/20230819141239.287290-4-yury.norov@gmail.com

Closes: https://lore.kernel.org/lkml/CAAH8bW8C5humYnfpW3y5ypwx0E-09A3QxFE1JFzR66v+mO4XfA@mail.gmail.com/T/
Closes: https://lore.kernel.org/lkml/ZMHSNQfv39HN068m@yury-ThinkPad/T/#mf6431cb0b7f6f05193c41adeee444bc95bf2b1c4
---
 kernel/sched/topology.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 05a5bc6..423d089 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -2122,12 +2122,16 @@ static int hop_cmp(const void *a, const void *b)
  */
 int sched_numa_find_nth_cpu(const struct cpumask *cpus, int cpu, int node)
 {
-	struct __cmp_key k = { .cpus = cpus, .node = node, .cpu = cpu };
+	struct __cmp_key k = { .cpus = cpus, .cpu = cpu };
 	struct cpumask ***hop_masks;
 	int hop, ret = nr_cpu_ids;
 
 	rcu_read_lock();
 
+	/* CPU-less node entries are uninitialized in sched_domains_numa_masks */
+	node = numa_nearest_node(node, N_CPU);
+	k.node = node;
+
 	k.masks = rcu_dereference(sched_domains_numa_masks);
 	if (!k.masks)
 		goto unlock;

  reply	other threads:[~2023-09-15 12:06 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: sched/core] numa: Generalize numa_map_to_online_node() tip-bot2 for Yury Norov
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-bot2 for Yury Norov [this message]
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=169477940847.27769.15320684535553252937.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=mgorman@suse.de \
    --cc=mingo@kernel.org \
    --cc=x86@kernel.org \
    --cc=yangyicong@hisilicon.com \
    --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®