scheduler fixes
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
HEAD: 7e3115ef5149fc502e3a2e80719dba54a8e7409d sched/balancing: Fix cfs_rq->task_h_load calculation
Three small fixes.
Thanks,
Ingo
------------------>
Vladimir Davydov (3):
sched/balancing: Fix 'local->avg_load > sds->avg_load' case in calculate_imbalance()
sched/balancing: Fix 'local->avg_load > busiest->avg_load' case in fix_small_imbalance()
sched/balancing: Fix cfs_rq->task_h_load calculationkernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
kernel/sched/fair.c +5 -4
@@ -4242,7 +4242,7 @@ static void update_cfs_rq_h_load(struct cfs_rq *cfs_rq) }if (!se) { - cfs_rq->h_load = rq->avg.load_avg_contrib; + cfs_rq->h_load = cfs_rq->runnable_load_avg; cfs_rq->last_h_load_update = now; }
@@ -4823,8 +4823,8 @@ void fix_small_imbalance(struct lb_env *env, struct sd_lb_stats *sds) (busiest->load_per_task *SCHED_POWER_SCALE ) / busiest->group_power; -if (busiest->avg_load - local->avg_load + scaled_busy_load_per_task >= - (scaled_busy_load_per_task * imbn)) { +if (busiest->avg_load + scaled_busy_load_per_task >= + local->avg_load + (scaled_busy_load_per_task * imbn)) { env->imbalance = busiest->load_per_task;return ; }
@@ -4896,7 +4896,8 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s* max load less than avg load(as we skip the groups at or below * its cpu_power, while calculating max_load..) */ -if (busiest->avg_load < sds->avg_load) { +if (busiest->avg_load <= sds->avg_load || + local->avg_load >= sds->avg_load) { env->imbalance =0 ;return fix_small_imbalance (env, sds); }