UPSTREAM: sched/fair: Fix usage of find_idlest_group() when the local group is idlest
find_idlest_group() returns NULL when the local group is idlest. The
caller then continues the find_idlest_group() search at a lower level
of the current CPU's sched_domain hierarchy. find_idlest_group_cpu() is
not consulted and, crucially, @new_cpu is not updated. This means the
search is pointless and we return @prev_cpu from select_task_rq_fair().
This is fixed by initialising @new_cpu to @cpu instead of @prev_cpu.
Change-Id: I8644a35179b00d4833befe237aa443ec840046ec
Signed-off-by: Brendan Jackman <brendan.jackman@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
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-6-brendan.jackman@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 93f50f90247e3e926bbe9830df089c64a5cec236)
Signed-off-by: Brendan Jackman <brendan.jackman@arm.com>
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index e1ef266..52d0da6 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6313,7 +6313,7 @@
{
int wu = sd_flag & SD_BALANCE_WAKE;
int cas_cpu = -1;
- int new_cpu = prev_cpu;
+ int new_cpu = cpu;
if (wu) {
schedstat_inc(p->se.statistics.nr_wakeups_cas_attempts);