summaryrefslogtreecommitdiffstats
path: root/kernel/sched/topology.c
diff options
context:
space:
mode:
authorYury Norov <yury.norov@gmail.com>2023-08-19 07:12:37 -0700
committerIngo Molnar <mingo@kernel.org>2023-09-15 13:48:11 +0200
commit9ecea9ae4d3127a09fb5dfcea87f248937a39ff5 (patch)
treebc676d77c146063b8ee461264d4905262692e6d9 /kernel/sched/topology.c
parent8ab63d418d4339d996f80d02a00dbce0aa3ff972 (diff)
downloadlinux-stable-9ecea9ae4d3127a09fb5dfcea87f248937a39ff5.tar.gz
linux-stable-9ecea9ae4d3127a09fb5dfcea87f248937a39ff5.tar.bz2
linux-stable-9ecea9ae4d3127a09fb5dfcea87f248937a39ff5.zip
sched/topology: Handle NUMA_NO_NODE in sched_numa_find_nth_cpu()
sched_numa_find_nth_cpu() doesn't handle NUMA_NO_NODE properly, and may crash kernel if passed with it. On the other hand, the only user of sched_numa_find_nth_cpu() has to check NUMA_NO_NODE case explicitly. It would be easier for users if this logic will get moved into sched_numa_find_nth_cpu(). 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-6-yury.norov@gmail.com
Diffstat (limited to 'kernel/sched/topology.c')
-rw-r--r--kernel/sched/topology.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 423d08947962..a60ecf45360c 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -2126,6 +2126,9 @@ int sched_numa_find_nth_cpu(const struct cpumask *cpus, int cpu, int node)
struct cpumask ***hop_masks;
int hop, ret = nr_cpu_ids;
+ if (node == NUMA_NO_NODE)
+ return cpumask_nth_and(cpu, cpus, cpu_online_mask);
+
rcu_read_lock();
/* CPU-less node entries are uninitialized in sched_domains_numa_masks */