sched: Fix switch_from_fair()
Commit-ID: da7a735e51f9622eb3e1672594d4a41da01d7e4f Gitweb: http://git.kernel.org/tip/da7a735e51f9622eb3e1672594d4a41da01d7e4f Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 17 Jan 2011 17:03:27 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 26 Jan 2011 12:33:22 +0100
sched: Fix switch_from_fair()
When a task is taken out of the fair class we must ensure the vruntime is properly normalized because when we put it back in it will assume to be normalized.
The case that goes wrong is when changing away from the fair class while sleeping. Sleeping tasks have non-normalized vruntime in order to make sleeper-fairness work. So treat the switch away from fair as a wakeup and preserve the relative vruntime.
Also update sysrq-n to call the ->switch_{to,from} methods.
Reported-by Onkalo Samu <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/sched.h | 8 +++----- kernel/sched.c | 25 ++++++++++++++----------- kernel/sched_fair.c | 42 ++++++++++++++++++++++++++++++++++++------ kernel/sched_idletask.c | 7 +++---- kernel/sched_rt.c | 19 ++++++++++--------- kernel/sched_stoptask.c | 7 +++---- 6 files changed, 69 insertions(+), 39 deletions(-)
include/linux/sched.h +3 -5
@@ -1084,12 +1084,10 @@ struct sched_class {void (*task_tick) (struct rq *rq,struct task_struct *p,int queued);void (*task_fork) (struct task_struct *p); -void (*switched_from) (struct rq *this_rq,struct task_struct *task, -int running); -void (*switched_to) (struct rq *this_rq,struct task_struct *task, -int running); +void (*switched_from) (struct rq *this_rq,struct task_struct *task); +void (*switched_to) (struct rq *this_rq,struct task_struct *task);void (*prio_changed) (struct rq *this_rq,struct task_struct *task, -int oldprio,int running); +int oldprio);unsigned int (*get_rr_interval) (struct rq *rq,struct task_struct *task);
kernel/sched.c +14 -11
@@ -2057,14 +2057,14 @@ inline int task_curr(const struct task_struct *p)static inline void check_class_changed (struct rq *rq,struct task_struct *p,const struct sched_class *prev_class, -int oldprio,int running) +int oldprio) {if (prev_class != p->sched_class) {if (prev_class->switched_from) - prev_class->switched_from (rq, p, running); - p->sched_class->switched_to (rq, p, running); - }else - p->sched_class->prio_changed (rq, p, oldprio, running); + prev_class->switched_from (rq, p); + p->sched_class->switched_to (rq, p); + }else if (oldprio != p->prio) + p->sched_class->prio_changed (rq, p, oldprio); }static void check_preempt_curr (struct rq *rq,struct task_struct *p,int flags)
@@ -2598,6 +2598,7 @@ static void __sched_fork(struct task_struct *p) p->se.sum_exec_runtime =0 ; p->se.prev_sum_exec_runtime =0 ; p->se.nr_migrations =0 ; + p->se.vruntime =0 ;#ifdef CONFIG_SCHEDSTATS memset (&p->se.statistics,0 ,sizeof (p->se.statistics));
@@ -4696,11 +4697,10 @@ void rt_mutex_setprio(struct task_struct *p, int prio)if (running) p->sched_class->set_curr_task (rq); -if (on_rq) { +if (on_rq)enqueue_task (rq, p, oldprio < prio ?ENQUEUE_HEAD :0 ); -check_class_changed (rq, p, prev_class, oldprio, running); - } +check_class_changed (rq, p, prev_class, oldprio);task_rq_unlock (rq, &flags); }
@@ -5028,11 +5028,10 @@ recheck:if (running) p->sched_class->set_curr_task (rq); -if (on_rq) { +if (on_rq)activate_task (rq, p,0 ); -check_class_changed (rq, p, prev_class, oldprio, running); - } +check_class_changed (rq, p, prev_class, oldprio);__task_rq_unlock (rq);raw_spin_unlock_irqrestore (&p->pi_lock, flags);
@@ -8237,6 +8236,8 @@ EXPORT_SYMBOL(__might_sleep);#ifdef CONFIG_MAGIC_SYSRQ static void normalize_task (struct rq *rq,struct task_struct *p) { +const struct sched_class *prev_class = p->sched_class; +int old_prio = p->prio;int on_rq; on_rq = p->se.on_rq;
@@ -8247,6 +8248,8 @@ static void normalize_task(struct rq *rq, struct task_struct *p)activate_task (rq, p,0 );resched_task (rq->curr); } + +check_class_changed (rq, p, prev_class, old_prio); }void normalize_rt_tasks (void )
kernel/sched_fair.c +36 -6
75 lines not on this page · raw message
kernel/sched_idletask.c +3 -4
@@ -52,14 +52,13 @@ static void set_curr_task_idle(struct rq *rq) { } -static void -switched_to_idle (struct rq *rq,struct task_struct *p,int running) +static void switched_to_idle (struct rq *rq,struct task_struct *p) {BUG (); } -static void prio_changed_idle (struct rq *rq,struct task_struct *p, -int oldprio,int running) +static void +prio_changed_idle (struct rq *rq,struct task_struct *p,int oldprio) {BUG (); }
kernel/sched_rt.c +10 -9
@@ -1595,8 +1595,7 @@ static void rq_offline_rt(struct rq *rq)* When switch from the rt queue, we bring ourselves to a position * that we might want to pull RT tasks from other runqueues. */ -static void switched_from_rt (struct rq *rq,struct task_struct *p, -int running) +static void switched_from_rt (struct rq *rq,struct task_struct *p) {/* * If there are other RT tasks then we will reschedule
@@ -1605,7 +1604,7 @@ static void switched_from_rt(struct rq *rq, struct task_struct *p,* we may need to handle the pulling of RT tasks * now. */ -if (!rq->rt.rt_nr_running) +if (p->se.on_rq && !rq->rt.rt_nr_running)pull_rt_task (rq); }
@@ -1624,8 +1623,7 @@ static inline void init_sched_rt_class(void)* with RT tasks. In this case we try to push them off to * other runqueues. */ -static void switched_to_rt (struct rq *rq,struct task_struct *p, -int running) +static void switched_to_rt (struct rq *rq,struct task_struct *p) {int check_resched =1 ;
@@ -1636,7 +1634,7 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p,* If that current running task is also an RT task * then see if we can move to another run queue. */ -if (!running) { +if (p->se.on_rq && rq->curr != p) {#ifdef CONFIG_SMP if (rq->rt.overloaded && push_rt_task(rq) &&/* Don't resched if we changed runqueues */
@@ -1652,10 +1650,13 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p,* Priority of the task has changed. This may cause * us to initiate a push or pull. */ -static void prio_changed_rt (struct rq *rq,struct task_struct *p, -int oldprio,int running) +static void +prio_changed_rt (struct rq *rq,struct task_struct *p,int oldprio) { -if (running) { +if (!p->se.on_rq) +return ; + +if (rq->curr == p) {#ifdef CONFIG_SMP /* * If our priority decreases while running, we
kernel/sched_stoptask.c +3 -4
@@ -59,14 +59,13 @@ static void set_curr_task_stop(struct rq *rq) { } -static void switched_to_stop (struct rq *rq,struct task_struct *p, -int running) +static void switched_to_stop (struct rq *rq,struct task_struct *p) {BUG ();/* its impossible to change to this class */ } -static void prio_changed_stop (struct rq *rq,struct task_struct *p, -int oldprio,int running) +static void +prio_changed_stop (struct rq *rq,struct task_struct *p,int oldprio) {BUG ();/* how!?, what priority? */ }