Commit 729288bc authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Peter Zijlstra
Browse files

kernel/sched: Fix util_est accounting for DELAY_DEQUEUE 



Remove delayed tasks from util_est even they are runnable.

Exclude delayed task which are (a) migrating between rq's or (b) in a
SAVE/RESTORE dequeue/enqueue.

Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/c49ef5fe-a909-43f1-b02f-a765ab9cedbf@arm.com
parent 6b9ccbc0

kernel/sched/fair.c

+9 −7
Original line number Diff line number Diff line
@@ -6948,19 +6948,20 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags) 
	int rq_h_nr_running = rq->cfs.h_nr_running;

	u64 slice = 0;



	if (flags & ENQUEUE_DELAYED) {

		requeue_delayed_entity(se);

		return;

	}



	/*

	 * The code below (indirectly) updates schedutil which looks at

	 * the cfs_rq utilization to select a frequency.

	 * Let's add the task's estimated utilization to the cfs_rq's

	 * estimated utilization, before we update schedutil.

	 */

	if (!(p->se.sched_delayed && (task_on_rq_migrating(p) || (flags & ENQUEUE_RESTORE))))

		util_est_enqueue(&rq->cfs, p);



	if (flags & ENQUEUE_DELAYED) {

		requeue_delayed_entity(se);

		return;

	}



	/*

	 * If in_iowait is set, the code below may not trigger any cpufreq

	 * utilization updates, so do it here explicitly with the IOWAIT flag
@@ -7177,6 +7178,7 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags) 
 */

static bool dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)

{

	if (!(p->se.sched_delayed && (task_on_rq_migrating(p) || (flags & DEQUEUE_SAVE))))

		util_est_dequeue(&rq->cfs, p);



	if (dequeue_entities(rq, &p->se, flags) < 0) {