Revert "ANDROID: sched: Prevent unnecessary active balance of single task in sched group"

This reverts commit 7846cccba0.

We want to back-out the eas-dev merge that happened in the tree after
5.3-rc1 as those patches "should" all be in Linus's tree now.

This is done to handle the merge conflicts with 5.4-rc1.

Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idb2a1eeb907c2ecbf29c71462594f5966a268a5a
This commit is contained in:
Greg Kroah-Hartman
2019-09-19 20:49:12 +02:00
committed by Alistair Delva
parent 9212f0e499
commit e99623b31d

View File

@@ -7146,7 +7146,6 @@ struct lb_env {
int new_dst_cpu;
enum cpu_idle_type idle;
long imbalance;
unsigned int src_grp_nr_running;
/* The set of CPUs under consideration for load-balancing */
struct cpumask *cpus;
@@ -8331,8 +8330,6 @@ next_group:
if (env->sd->flags & SD_NUMA)
env->fbq_type = fbq_classify_group(&sds->busiest_stat);
env->src_grp_nr_running = sds->busiest_stat.sum_nr_running;
if (!env->sd->parent) {
struct root_domain *rd = env->dst_rq->rd;
@@ -9027,8 +9024,7 @@ more_balance:
* excessive cache_hot migrations and active balances.
*/
if (idle != CPU_NEWLY_IDLE)
if (env.src_grp_nr_running > 1)
sd->nr_balance_failed++;
sd->nr_balance_failed++;
if (need_active_balance(&env)) {
unsigned long flags;