diff mbox series

[tip:,sched/core] sched/topology: Fix sched_numa_find_nth_cpu() in non-NUMA case

Message ID 169477940797.27769.5804988700503210268.tip-bot2@tip-bot2
State New
Headers
Series [tip:,sched/core] sched/topology: Fix sched_numa_find_nth_cpu() in non-NUMA case |

Commit Message

tip-bot2 for Thomas Gleixner Sept. 15, 2023, 12:03 p.m. UTC 
  The following commit has been merged into the sched/core branch of tip:

Commit-ID:     8ab63d418d4339d996f80d02a00dbce0aa3ff972
Gitweb:        https://git.kernel.org/tip/8ab63d418d4339d996f80d02a00dbce0aa3ff972
Author:        Yury Norov <yury.norov@gmail.com>
AuthorDate:    Sat, 19 Aug 2023 07:12:36 -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 non-NUMA case

When CONFIG_NUMA is enabled, sched_numa_find_nth_cpu() searches for a
CPU in sched_domains_numa_masks. The masks includes only online CPUs,
so effectively offline CPUs are skipped.

When CONFIG_NUMA is disabled, the fallback function should be consistent.

Fixes: cd7f55359c90 ("sched: add 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-5-yury.norov@gmail.com
---
 include/linux/topology.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/include/linux/topology.h b/include/linux/topology.h
index fea3237..52f5850 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -251,7 +251,7 @@  extern const struct cpumask *sched_numa_hop_mask(unsigned int node, unsigned int
 #else
 static __always_inline int sched_numa_find_nth_cpu(const struct cpumask *cpus, int cpu, int node)
 {
-	return cpumask_nth(cpu, cpus);
+	return cpumask_nth_and(cpu, cpus, cpu_online_mask);
 }
 
 static inline const struct cpumask *