From: Dietmar Eggemann <[email protected]> Migrate unweighted blocked load of an entity away from the run queue in case it is migrated to another cpu during wake-up.
This patch is the unweighted counterpart of "sched: Account for blocked load waking back up" (commit id aff3e4988444). Note: The unweighted blocked load is not used for energy aware scheduling yet. Signed-off-by: Dietmar Eggemann <[email protected]> --- kernel/sched/fair.c | 9 +++++++-- kernel/sched/sched.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index c6207f7..93c8dbe 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2545,9 +2545,11 @@ static void update_cfs_rq_blocked_load(struct cfs_rq *cfs_rq, int force_update) return; if (atomic_long_read(&cfs_rq->removed_load)) { - unsigned long removed_load; + unsigned long removed_load, uw_removed_load; removed_load = atomic_long_xchg(&cfs_rq->removed_load, 0); - subtract_blocked_load_contrib(cfs_rq, removed_load, 0); + uw_removed_load = atomic_long_xchg(&cfs_rq->uw_removed_load, 0); + subtract_blocked_load_contrib(cfs_rq, removed_load, + uw_removed_load); } if (decays) { @@ -4606,6 +4608,8 @@ migrate_task_rq_fair(struct task_struct *p, int next_cpu) se->avg.decay_count = -__synchronize_entity_decay(se); atomic_long_add(se->avg.load_avg_contrib, &cfs_rq->removed_load); + atomic_long_add(se->avg.uw_load_avg_contrib, + &cfs_rq->uw_removed_load); } /* We have migrated, no longer consider this task hot */ @@ -7553,6 +7557,7 @@ void init_cfs_rq(struct cfs_rq *cfs_rq) #ifdef CONFIG_SMP atomic64_set(&cfs_rq->decay_counter, 1); atomic_long_set(&cfs_rq->removed_load, 0); + atomic_long_set(&cfs_rq->uw_removed_load, 0); #endif } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3f1eeb3..d7d2ee2 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -340,7 +340,7 @@ struct cfs_rq { unsigned long uw_runnable_load_avg, uw_blocked_load_avg; atomic64_t decay_counter; u64 last_decay; - atomic_long_t removed_load; + atomic_long_t removed_load, uw_removed_load; #ifdef CONFIG_FAIR_GROUP_SCHED /* Required to track per-cpu representation of a task_group */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
