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

Commit 16453c46 authored by Syed Rameez Mustafa's avatar Syed Rameez Mustafa
Browse files

sched: remove temporary demand fixups in fixup_busy_time() 



On older kernel versions p->on_rq was a binary value that did not
allow distinguishing between enqueued and migrating tasks. As a result
fixup_busy_time would have to do temporary load adjustments to ensure
that update_history does not do incorrect demand adjustments for
migrating tasks. Since p->on_rq can now be used make a distinction
between migrating and enqueued tasks, there is no need to do these
temporary load calculations. Instead make sure update_history() only
does load adjustments on enqueued tasks.

Change-Id: I1f800ac61a045a66ab44b9219516c39aa08db087
Signed-off-by: default avatarSyed Rameez Mustafa <rameezmustafa@codeaurora.org>
parent 9f5234bb

kernel/sched/core.c

+2 −19
Original line number Diff line number Diff line
@@ -1712,7 +1712,8 @@ static void update_history(struct rq *rq, struct task_struct *p, 
	 * changing p->on_rq. Since the dequeue decrements hmp stats

	 * avoid decrementing it here again.

	 */

	if (p->on_rq && (!task_has_dl_policy(p) || !p->dl.dl_throttled))

	if (task_on_rq_queued(p) && (!task_has_dl_policy(p) ||

						!p->dl.dl_throttled))

		p->sched_class->fixup_hmp_sched_stats(rq, p, demand);

	else

		p->ravg.demand = demand;
@@ -2300,27 +2301,9 @@ static void fixup_busy_time(struct task_struct *p, int new_cpu) 
	update_task_ravg(dest_rq->curr, dest_rq,

			 TASK_UPDATE, wallclock, 0);



	/*

	 * In case of migration of task on runqueue, on_rq =1,

	 * however its load is removed from its runqueue.

	 * update_task_ravg() below can update its demand, which

	 * will require its load on runqueue to be adjusted to

	 * reflect new demand. Restore load temporarily for such

	 * task on its runqueue

	 */

	if (p->on_rq)

		p->sched_class->inc_hmp_sched_stats(src_rq, p);



	update_task_ravg(p, task_rq(p), TASK_MIGRATE,

			 wallclock, 0);



	/*

	 * Remove task's load from rq as its now migrating to

	 * another cpu.

	 */

	if (p->on_rq)

		p->sched_class->dec_hmp_sched_stats(src_rq, p);



	if (p->ravg.curr_window) {

		src_rq->curr_runnable_sum -= p->ravg.curr_window;

		dest_rq->curr_runnable_sum += p->ravg.curr_window;