Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc1386b6 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Andres Oportus
Browse files

UPSTREAM: sched/fair: Apply more PELT fixes 



One additional 'rule' for using update_cfs_rq_load_avg() is that one
should call update_tg_load_avg() if it returns true.

Add a bunch of comments to hopefully clarify some of the rules:

 o  You need to update cfs_rq _before_ any entity attach/detach,
    this is important, because while for mathmatical consisency this
    isn't strictly needed, it is required for the physical
    interpretation of the model, you attach/detach _now_.

 o  When you modify the cfs_rq avg, you have to then call
    update_tg_load_avg() in order to propagate changes upwards.

 o  (Fair) entities are always attached, switched_{to,from}_fair()
    deal with !fair. This directly follows from the definition of the
    cfs_rq averages, namely that they are a direct sum of all
    (runnable or blocked) entities on that rq.

It is the second rule that this patch enforces, but it adds comments
pertaining to all of them.

Change-Id: Icdc906e98c67b84cb9582c893bc761a9886be57a
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
(cherry picked from commit 3d30544f02120b884bba2a9466c87dba980e3be5)
Signed-off-by: default avatarChris Redpath <chris.redpath@arm.com>
parent 3fd734a8

kernel/sched/fair.c

+80 −5
Original line number Diff line number Diff line
@@ -718,6 +718,11 @@ void init_entity_runnable_average(struct sched_entity *se) 
	/* when this task enqueue'ed, it will contribute to its cfs_rq's load_avg */

}



static inline u64 cfs_rq_clock_task(struct cfs_rq *cfs_rq);

static int update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq, bool update_freq);

static void update_tg_load_avg(struct cfs_rq *cfs_rq, int force);

static void attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se);



/*

 * With new tasks being created, their initial util_avgs are extrapolated

 * based on the cfs_rq's current util_avg:
@@ -747,7 +752,9 @@ void post_init_entity_util_avg(struct sched_entity *se) 
{

	struct cfs_rq *cfs_rq = cfs_rq_of(se);

	struct sched_avg *sa = &se->avg;

	long cap = (long)(scale_load_down(SCHED_LOAD_SCALE) - cfs_rq->avg.util_avg) / 2;

	long cap = (long)(SCHED_CAPACITY_SCALE - cfs_rq->avg.util_avg) / 2;

	u64 now = cfs_rq_clock_task(cfs_rq);

	int tg_update;



	if (cap > 0) {

		if (cfs_rq->avg.util_avg != 0) {
@@ -765,6 +772,29 @@ void post_init_entity_util_avg(struct sched_entity *se) 
		 */

		sa->util_sum = sa->util_avg * LOAD_AVG_MAX;

	}



	if (entity_is_task(se)) {

		struct task_struct *p = task_of(se);

		if (p->sched_class != &fair_sched_class) {

			/*

			 * For !fair tasks do:

			 *

			update_cfs_rq_load_avg(now, cfs_rq, false);

			attach_entity_load_avg(cfs_rq, se);

			switched_from_fair(rq, p);

			 *

			 * such that the next switched_to_fair() has the

			 * expected state.

			 */

			se->avg.last_update_time = now;

			return;

		}

	}



	tg_update = update_cfs_rq_load_avg(now, cfs_rq, false);

	attach_entity_load_avg(cfs_rq, se);

	if (tg_update)

		update_tg_load_avg(cfs_rq, false);

}



static inline unsigned long cfs_rq_runnable_load_avg(struct cfs_rq *cfs_rq);
@@ -776,7 +806,10 @@ void init_entity_runnable_average(struct sched_entity *se) 
void post_init_entity_util_avg(struct sched_entity *se)

{

}

#endif

static void update_tg_load_avg(struct cfs_rq *cfs_rq, int force)

{

}

#endif /* CONFIG_SMP */



/*

 * Update the current task's runtime statistics.
@@ -2823,9 +2856,25 @@ static inline u64 cfs_rq_clock_task(struct cfs_rq *cfs_rq); 
	WRITE_ONCE(*ptr, res);					\

} while (0)



/* Group cfs_rq's load_avg is used for task_h_load and update_cfs_share */

static inline int update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq,

					 bool update_freq)

/**

 * update_cfs_rq_load_avg - update the cfs_rq's load/util averages

 * @now: current time, as per cfs_rq_clock_task()

 * @cfs_rq: cfs_rq to update

 * @update_freq: should we call cfs_rq_util_change() or will the call do so

 *

 * The cfs_rq avg is the direct sum of all its entities (blocked and runnable)

 * avg. The immediate corollary is that all (fair) tasks must be attached, see

 * post_init_entity_util_avg().

 *

 * cfs_rq->avg is used for task_h_load() and update_cfs_share() for example.

 *

 * Returns true if the load decayed or we removed utilization. It is expected

 * that one calls update_tg_load_avg() on this condition, but after you've

 * modified the cfs_rq avg (attach/detach), such that we propagate the new

 * avg up.

 */

static inline int

update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq, bool update_freq)

{

	struct sched_avg *sa = &cfs_rq->avg;

	int decayed, removed = 0, removed_util = 0;
@@ -2884,6 +2933,14 @@ static inline void update_load_avg(struct sched_entity *se, int update_tg) 
		trace_sched_load_avg_task(task_of(se), &se->avg);

}



/**

 * attach_entity_load_avg - attach this entity to its cfs_rq load avg

 * @cfs_rq: cfs_rq to attach to

 * @se: sched_entity to attach

 *

 * Must call update_cfs_rq_load_avg() before this, since we rely on

 * cfs_rq->avg.last_update_time being current.

 */

static void attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)

{

	if (!sched_feat(ATTACH_AGE_LOAD))
@@ -2913,6 +2970,14 @@ skip_aging: 
	cfs_rq_util_change(cfs_rq);

}



/**

 * detach_entity_load_avg - detach this entity from its cfs_rq load avg

 * @cfs_rq: cfs_rq to detach from

 * @se: sched_entity to detach

 *

 * Must call update_cfs_rq_load_avg() before this, since we rely on

 * cfs_rq->avg.last_update_time being current.

 */

static void detach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)

{

	__update_load_avg(cfs_rq->avg.last_update_time, cpu_of(rq_of(cfs_rq)),
@@ -9322,6 +9387,8 @@ static void detach_task_cfs_rq(struct task_struct *p) 
{

	struct sched_entity *se = &p->se;

	struct cfs_rq *cfs_rq = cfs_rq_of(se);

	u64 now = cfs_rq_clock_task(cfs_rq);

	int tg_update;



	if (!vruntime_normalized(p)) {

		/*
@@ -9333,13 +9400,18 @@ static void detach_task_cfs_rq(struct task_struct *p) 
	}



	/* Catch up with the cfs_rq and remove our load when we leave */

	tg_update = update_cfs_rq_load_avg(now, cfs_rq, false);

	detach_entity_load_avg(cfs_rq, se);

	if (tg_update)

		update_tg_load_avg(cfs_rq, false);

}



static void attach_task_cfs_rq(struct task_struct *p)

{

	struct sched_entity *se = &p->se;

	struct cfs_rq *cfs_rq = cfs_rq_of(se);

	u64 now = cfs_rq_clock_task(cfs_rq);

	int tg_update;



#ifdef CONFIG_FAIR_GROUP_SCHED

	/*
@@ -9350,7 +9422,10 @@ static void attach_task_cfs_rq(struct task_struct *p) 
#endif



	/* Synchronize task with its cfs_rq */

	tg_update = update_cfs_rq_load_avg(now, cfs_rq, false);

	attach_entity_load_avg(cfs_rq, se);

	if (tg_update)

		update_tg_load_avg(cfs_rq, false);



	if (!vruntime_normalized(p))

		se->vruntime += cfs_rq->min_vruntime;