Commit 6212437f authored Feb 27, 2020 by Vincent Guittot Committed by Ingo Molnar Mar 06, 2020

sched/fair: Fix runnable_avg for throttled cfs



When a cfs_rq is throttled, its group entity is dequeued and its running
tasks are removed. We must update runnable_avg with the old h_nr_running
and update group_se->runnable_weight with the new h_nr_running at each
level of the hierarchy.

Reviewed-by: Ben Segall <bsegall@google.com>
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Fixes: 9f683953 ("sched/pelt: Add a new runnable average signal")
Link: https://lkml.kernel.org/r/20200227154115.8332-1-vincent.guittot@linaro.org

parent ba4f7bc1

kernel/sched/fair.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -4720,8 +4720,13 @@ static void throttle_cfs_rq(struct cfs_rq *cfs_rq)
		if (!se->on_rq)
		break;

		if (dequeue)
		if (dequeue) {
		dequeue_entity(qcfs_rq, se, DEQUEUE_SLEEP);
		} else {
		update_load_avg(qcfs_rq, se, 0);
		se_update_runnable(se);
		}

		qcfs_rq->h_nr_running -= task_delta;
		qcfs_rq->idle_h_nr_running -= idle_task_delta;

		@@ -4789,8 +4794,13 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq)
		enqueue = 0;

		cfs_rq = cfs_rq_of(se);
		if (enqueue)
		if (enqueue) {
		enqueue_entity(cfs_rq, se, ENQUEUE_WAKEUP);
		} else {
		update_load_avg(cfs_rq, se, 0);
		se_update_runnable(se);
		}

		cfs_rq->h_nr_running += task_delta;
		cfs_rq->idle_h_nr_running += idle_task_delta;

Admin message