Skip to content

Commit 8aeaffe

Browse files
mu-mu-muIngo Molnar
authored andcommitted
sched/fair: Take the scheduling domain into account in select_idle_smt()
When picking a CPU on task wakeup, select_idle_smt() has to take into account the scheduling domain of @target. This is because the "isolcpus" kernel command line option can remove CPUs from the domain to isolate them from other SMT siblings. This fix checks if the candidate CPU is in the target scheduling domain. Commit: df3cb4e ("sched/fair: Fix wrong cpu selecting from isolated domain") ... originally introduced this fix by adding the check of the scheduling domain in the loop. However, commit: 3e6efe8 ("sched/fair: Remove redundant check in select_idle_smt()") ... accidentally removed the check. Bring it back. Fixes: 3e6efe8 ("sched/fair: Remove redundant check in select_idle_smt()") Signed-off-by: Keisuke Nishimura <keisuke.nishimura@inria.fr> Signed-off-by: Julia Lawall <julia.lawall@inria.fr> Signed-off-by: Ingo Molnar <mingo@kernel.org> Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org> Link: https://lore.kernel.org/r/20240110131707.437301-1-keisuke.nishimura@inria.fr
1 parent a6965b3 commit 8aeaffe

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

kernel/sched/fair.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7311,13 +7311,19 @@ static int select_idle_core(struct task_struct *p, int core, struct cpumask *cpu
73117311
/*
73127312
* Scan the local SMT mask for idle CPUs.
73137313
*/
7314-
static int select_idle_smt(struct task_struct *p, int target)
7314+
static int select_idle_smt(struct task_struct *p, struct sched_domain *sd, int target)
73157315
{
73167316
int cpu;
73177317

73187318
for_each_cpu_and(cpu, cpu_smt_mask(target), p->cpus_ptr) {
73197319
if (cpu == target)
73207320
continue;
7321+
/*
7322+
* Check if the CPU is in the LLC scheduling domain of @target.
7323+
* Due to isolcpus, there is no guarantee that all the siblings are in the domain.
7324+
*/
7325+
if (!cpumask_test_cpu(cpu, sched_domain_span(sd)))
7326+
continue;
73217327
if (available_idle_cpu(cpu) || sched_idle_cpu(cpu))
73227328
return cpu;
73237329
}
@@ -7341,7 +7347,7 @@ static inline int select_idle_core(struct task_struct *p, int core, struct cpuma
73417347
return __select_idle_cpu(core, p);
73427348
}
73437349

7344-
static inline int select_idle_smt(struct task_struct *p, int target)
7350+
static inline int select_idle_smt(struct task_struct *p, struct sched_domain *sd, int target)
73457351
{
73467352
return -1;
73477353
}
@@ -7591,7 +7597,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target)
75917597
has_idle_core = test_idle_cores(target);
75927598

75937599
if (!has_idle_core && cpus_share_cache(prev, target)) {
7594-
i = select_idle_smt(p, prev);
7600+
i = select_idle_smt(p, sd, prev);
75957601
if ((unsigned int)i < nr_cpumask_bits)
75967602
return i;
75977603
}

0 commit comments

Comments
 (0)