Skip to content

Commit 0f0b33d

Browse files
Brendan Jackmanpundiramit
authored andcommitted
UPSTREAM: sched/fair: Fix usage of find_idlest_group() when no groups are allowed
When 'p' is not allowed on any of the CPUs in the sched_domain, we currently return NULL from find_idlest_group(), and pointlessly continue the search on lower sched_domain levels (where 'p' is also not allowed) before returning prev_cpu regardless (as we have not updated new_cpu). Add an explicit check for this case, and add a comment to find_idlest_group(). Now when find_idlest_group() returns NULL, it always means that the local group is allowed and idlest. Change-Id: I5f2648d2f7fb0465677961ecb7473df3d06f0057 Signed-off-by: Brendan Jackman <brendan.jackman@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org> Reviewed-by: Josef Bacik <jbacik@fb.com> Cc: Dietmar Eggemann <dietmar.eggemann@arm.com> Cc: Josef Bacik <josef@toxicpanda.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Morten Rasmussen <morten.rasmussen@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20171005114516.18617-5-brendan.jackman@arm.com Signed-off-by: Ingo Molnar <mingo@kernel.org> (cherry-picked-from: commit 6fee85ccbc76 tip:sched/core) Signed-off-by: Chris Redpath <chris.redpath@arm.com>
1 parent 5fdbc79 commit 0f0b33d

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

kernel/sched/fair.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5976,6 +5976,8 @@ static unsigned long capacity_spare_wake(int cpu, struct task_struct *p)
59765976
/*
59775977
* find_idlest_group finds and returns the least busy CPU group within the
59785978
* domain.
5979+
*
5980+
* Assumes p is allowed on at least one CPU in sd.
59795981
*/
59805982
static struct sched_group *
59815983
find_idlest_group(struct sched_domain *sd, struct task_struct *p,
@@ -6136,6 +6138,9 @@ static inline int find_idlest_cpu(struct sched_domain *sd, struct task_struct *p
61366138
schedstat_inc(this_rq(), eas_stats.cas_attempts);
61376139
}
61386140

6141+
if (!cpumask_intersects(sched_domain_span(sd), &p->cpus_allowed))
6142+
return prev_cpu;
6143+
61396144
while (sd) {
61406145
struct sched_group *group;
61416146
struct sched_domain *tmp;

0 commit comments

Comments
 (0)