Since only the root cfs_rq runnable_load_avg field is used any more, we can move the field from struct sched_avg, which every sched_entity has one of, directly into the struct cfs_rq, of which we have way fewer.
No functional changes. Suggested-by: Dietmar Eggemann <dietmar.eggem...@arm.com> Signed-off-by: Rik van Riel <r...@surriel.com> --- include/linux/sched.h | 1 - kernel/sched/debug.c | 3 +-- kernel/sched/fair.c | 8 ++++---- kernel/sched/sched.h | 1 + 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index f5bb6948e40c..84a6cc6f5c47 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -394,7 +394,6 @@ struct sched_avg { u32 util_sum; u32 period_contrib; unsigned long load_avg; - unsigned long runnable_load_avg; unsigned long util_avg; struct util_est util_est; } ____cacheline_aligned; diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index cefc1b171c0b..6e7c8ff210a8 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -539,7 +539,7 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) SEQ_printf(m, " .%-30s: %lu\n", "load_avg", cfs_rq->avg.load_avg); SEQ_printf(m, " .%-30s: %lu\n", "runnable_load_avg", - cfs_rq->avg.runnable_load_avg); + cfs_rq->runnable_load_avg); SEQ_printf(m, " .%-30s: %lu\n", "util_avg", cfs_rq->avg.util_avg); SEQ_printf(m, " .%-30s: %u\n", "util_est_enqueued", @@ -960,7 +960,6 @@ void proc_sched_show_task(struct task_struct *p, struct pid_namespace *ns, P(se.avg.load_sum); P(se.avg.util_sum); P(se.avg.load_avg); - P(se.avg.runnable_load_avg); P(se.avg.util_avg); P(se.enqueued_h_load); P(se.avg.last_update_time); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 860708b687a7..63cb40253b26 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2768,7 +2768,7 @@ enqueue_runnable_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) struct cfs_rq *root_cfs_rq = &cfs_rq->rq->cfs; se->enqueued_h_load = task_se_h_load(se); - root_cfs_rq->avg.runnable_load_avg += se->enqueued_h_load; + root_cfs_rq->runnable_load_avg += se->enqueued_h_load; } } @@ -2777,7 +2777,7 @@ dequeue_runnable_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) { if (entity_is_task(se)) { struct cfs_rq *root_cfs_rq = &cfs_rq->rq->cfs; - sub_positive(&root_cfs_rq->avg.runnable_load_avg, + sub_positive(&root_cfs_rq->runnable_load_avg, se->enqueued_h_load); } } @@ -2795,7 +2795,7 @@ update_runnable_load_avg(struct sched_entity *se) new_h_load = task_se_h_load(se); delta = new_h_load - se->enqueued_h_load; - root_cfs_rq->avg.runnable_load_avg += delta; + root_cfs_rq->runnable_load_avg += delta; se->enqueued_h_load = new_h_load; } @@ -3559,7 +3559,7 @@ static void remove_entity_load_avg(struct sched_entity *se) static inline unsigned long cfs_rq_runnable_load_avg(struct cfs_rq *cfs_rq) { - return cfs_rq->avg.runnable_load_avg; + return cfs_rq->runnable_load_avg; } static inline unsigned long cfs_rq_load_avg(struct cfs_rq *cfs_rq) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 5be14cee61f9..32978a8de8ce 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -516,6 +516,7 @@ struct cfs_rq { * CFS load tracking */ struct sched_avg avg; + unsigned long runnable_load_avg; #ifndef CONFIG_64BIT u64 load_last_update_time_copy; #endif -- 2.20.1