Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sched_urgent_for_v5.11_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Borislav Petkov:
"Revert an attempt to not spread IRQ threads on isolated CPUs which has
a bunch of problems"
* tag 'sched_urgent_for_v5.11_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "lib: Restrict cpumask_local_spread to houskeeping CPUs"
+5
-11
+5
-11
lib/cpumask.c
+5
-11
lib/cpumask.c
···
6
6
#include <linux/export.h>
7
7
#include <linux/memblock.h>
8
8
#include <linux/numa.h>
9
-
#include <linux/sched/isolation.h>
10
9
11
10
/**
12
11
* cpumask_next - get the next cpu in a cpumask
···
205
206
*/
206
207
unsigned int cpumask_local_spread(unsigned int i, int node)
207
208
{
208
-
int cpu, hk_flags;
209
-
const struct cpumask *mask;
209
+
int cpu;
210
210
211
-
hk_flags = HK_FLAG_DOMAIN | HK_FLAG_MANAGED_IRQ;
212
-
mask = housekeeping_cpumask(hk_flags);
213
211
/* Wrap: we always want a cpu. */
214
-
i %= cpumask_weight(mask);
212
+
i %= num_online_cpus();
215
213
216
214
if (node == NUMA_NO_NODE) {
217
-
for_each_cpu(cpu, mask) {
215
+
for_each_cpu(cpu, cpu_online_mask)
218
216
if (i-- == 0)
219
217
return cpu;
220
-
}
221
218
} else {
222
219
/* NUMA first. */
223
-
for_each_cpu_and(cpu, cpumask_of_node(node), mask) {
220
+
for_each_cpu_and(cpu, cpumask_of_node(node), cpu_online_mask)
224
221
if (i-- == 0)
225
222
return cpu;
226
-
}
227
223
228
-
for_each_cpu(cpu, mask) {
224
+
for_each_cpu(cpu, cpu_online_mask) {
229
225
/* Skip NUMA nodes, done above. */
230
226
if (cpumask_test_cpu(cpu, cpumask_of_node(node)))
231
227
continue;