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

Commit 98b0a857 authored by Juri Lelli's avatar Juri Lelli Committed by Ingo Molnar
Browse files

sched/deadline: Remove useless parameter from setup_new_dl_entity() 



setup_new_dl_entity() takes two parameters, but it only actually uses
one of them, under a different name, to setup a new dl_entity, after:

  2f9f3fdc928 "sched/deadline: Remove dl_new from struct sched_dl_entity"

as we currently do:

  setup_new_dl_entity(&p->dl, &p->dl)

However, before Luca's change we were doing:

  setup_new_dl_entity(dl_se, pi_se)

in update_dl_entity() for a dl_se->new entity: we were using pi_se's
parameters (the potential PI donor) for setting up a new entity.

This change removes the useless second parameter of setup_new_dl_entity().

While we are at it we also optimize things further calling setup_new_dl_
entity() only for already queued tasks, since (as pointed out by Xunlei)
we already do the very same update at tasks wakeup time anyway. By doing
so, we don't need to worry about a potential PI donor anymore, as
rt_mutex_setprio() takes care of that already for us.

Signed-off-by: default avatarJuri Lelli <juri.lelli@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luca Abeni <luca.abeni@unitn.it>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Xunlei Pang <xpang@redhat.com>
Link: http://lkml.kernel.org/r/1470409675-20935-1-git-send-email-juri.lelli@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9279e0d2

kernel/sched/deadline.c

+16 −6
Original line number Diff line number Diff line
@@ -346,12 +346,12 @@ static void check_preempt_curr_dl(struct rq *rq, struct task_struct *p, 
 * one, and to (try to!) reconcile itself with its own scheduling

 * parameters.

 */

static inline void setup_new_dl_entity(struct sched_dl_entity *dl_se,

				       struct sched_dl_entity *pi_se)

static inline void setup_new_dl_entity(struct sched_dl_entity *dl_se)

{

	struct dl_rq *dl_rq = dl_rq_of_se(dl_se);

	struct rq *rq = rq_of_dl_rq(dl_rq);



	WARN_ON(dl_se->dl_boosted);

	WARN_ON(dl_time_before(rq_clock(rq), dl_se->deadline));



	/*
@@ -367,8 +367,8 @@ static inline void setup_new_dl_entity(struct sched_dl_entity *dl_se, 
	 * future; in fact, we must consider execution overheads (time

	 * spent on hardirq context, etc.).

	 */

	dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline;

	dl_se->runtime = pi_se->dl_runtime;

	dl_se->deadline = rq_clock(rq) + dl_se->dl_deadline;

	dl_se->runtime = dl_se->dl_runtime;

}



/*
@@ -1723,10 +1723,20 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p) 
 */

static void switched_to_dl(struct rq *rq, struct task_struct *p)

{



	/* If p is not queued we will update its parameters at next wakeup. */

	if (!task_on_rq_queued(p))

		return;



	/*

	 * If p is boosted we already updated its params in

	 * rt_mutex_setprio()->enqueue_task(..., ENQUEUE_REPLENISH),

	 * p's deadline being now already after rq_clock(rq).

	 */

	if (dl_time_before(p->dl.deadline, rq_clock(rq)))

		setup_new_dl_entity(&p->dl, &p->dl);

		setup_new_dl_entity(&p->dl);



	if (task_on_rq_queued(p) && rq->curr != p) {

	if (rq->curr != p) {

#ifdef CONFIG_SMP

		if (tsk_nr_cpus_allowed(p) > 1 && rq->dl.overloaded)

			queue_push_tasks(rq);