From 390260086ce2c0f3dc32c7b5506913458cc2cd45 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Sep 2019 20:48:36 +0200 Subject: [PATCH] Revert "ANDROID: sched/fair: Attempt to improve throughput for asym cap systems" This reverts commit 1a1d22a3d8f3ddf2c30db2aa6b083e67ae1ba732. 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 Signed-off-by: Greg Kroah-Hartman Change-Id: I4f3a3b047d2c81f2f6de6da633964f009717a1cf --- kernel/sched/fair.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 057795ca09d6..9478e0e0e4f1 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -8461,22 +8461,7 @@ void fix_small_imbalance(struct lb_env *env, struct sd_lb_stats *sds) capa_move /= SCHED_CAPACITY_SCALE; /* Move if we gain throughput */ - if (capa_move > capa_now) { - env->imbalance = busiest->load_per_task; - return; - } - - /* We can't see throughput improvement with the load-based - * method, but it is possible depending upon group size and - * capacity range that there might still be an underutilized - * cpu available in an asymmetric capacity system. Do one last - * check just in case. - */ - if (env->sd->flags & SD_ASYM_CPUCAPACITY && - busiest->group_type == group_overloaded && - busiest->sum_nr_running > busiest->group_weight && - local->sum_nr_running < local->group_weight && - local->group_capacity < busiest->group_capacity) + if (capa_move > capa_now) env->imbalance = busiest->load_per_task; }