Commit 7074badb authored by Dmitry Adamushko's avatar Dmitry Adamushko Committed by Ingo Molnar

sched: add set_curr_task() calls

p->sched_class->set_curr_task() has to be called before 
activate_task()/enqueue_task() in rt_mutex_setprio(), 
sched_setschedule() and sched_move_task() in order to set up 
'cfs_rq->curr'. The logic of enqueueing depends on whether a task to be 
inserted is 'current' or not.
Signed-off-by: default avatarDmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d02e5ed8
...@@ -3915,8 +3915,8 @@ EXPORT_SYMBOL(sleep_on_timeout); ...@@ -3915,8 +3915,8 @@ EXPORT_SYMBOL(sleep_on_timeout);
*/ */
void rt_mutex_setprio(struct task_struct *p, int prio) void rt_mutex_setprio(struct task_struct *p, int prio)
{ {
int oldprio, on_rq, running;
unsigned long flags; unsigned long flags;
int oldprio, on_rq;
struct rq *rq; struct rq *rq;
BUG_ON(prio < 0 || prio > MAX_PRIO); BUG_ON(prio < 0 || prio > MAX_PRIO);
...@@ -3926,9 +3926,10 @@ void rt_mutex_setprio(struct task_struct *p, int prio) ...@@ -3926,9 +3926,10 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
oldprio = p->prio; oldprio = p->prio;
on_rq = p->se.on_rq; on_rq = p->se.on_rq;
running = task_running(rq, p);
if (on_rq) { if (on_rq) {
dequeue_task(rq, p, 0); dequeue_task(rq, p, 0);
if (task_running(rq, p)) if (running)
p->sched_class->put_prev_task(rq, p); p->sched_class->put_prev_task(rq, p);
} }
...@@ -3940,16 +3941,17 @@ void rt_mutex_setprio(struct task_struct *p, int prio) ...@@ -3940,16 +3941,17 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
p->prio = prio; p->prio = prio;
if (on_rq) { if (on_rq) {
if (running)
p->sched_class->set_curr_task(rq);
enqueue_task(rq, p, 0); enqueue_task(rq, p, 0);
/* /*
* Reschedule if we are currently running on this runqueue and * Reschedule if we are currently running on this runqueue and
* our priority decreased, or if we are not currently running on * our priority decreased, or if we are not currently running on
* this runqueue and our priority is higher than the current's * this runqueue and our priority is higher than the current's
*/ */
if (task_running(rq, p)) { if (running) {
if (p->prio > oldprio) if (p->prio > oldprio)
resched_task(rq->curr); resched_task(rq->curr);
p->sched_class->set_curr_task(rq);
} else { } else {
check_preempt_curr(rq, p); check_preempt_curr(rq, p);
} }
...@@ -4153,7 +4155,7 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio) ...@@ -4153,7 +4155,7 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio)
int sched_setscheduler(struct task_struct *p, int policy, int sched_setscheduler(struct task_struct *p, int policy,
struct sched_param *param) struct sched_param *param)
{ {
int retval, oldprio, oldpolicy = -1, on_rq; int retval, oldprio, oldpolicy = -1, on_rq, running;
unsigned long flags; unsigned long flags;
struct rq *rq; struct rq *rq;
...@@ -4235,24 +4237,26 @@ int sched_setscheduler(struct task_struct *p, int policy, ...@@ -4235,24 +4237,26 @@ int sched_setscheduler(struct task_struct *p, int policy,
} }
update_rq_clock(rq); update_rq_clock(rq);
on_rq = p->se.on_rq; on_rq = p->se.on_rq;
running = task_running(rq, p);
if (on_rq) { if (on_rq) {
deactivate_task(rq, p, 0); deactivate_task(rq, p, 0);
if (task_running(rq, p)) if (running)
p->sched_class->put_prev_task(rq, p); p->sched_class->put_prev_task(rq, p);
} }
oldprio = p->prio; oldprio = p->prio;
__setscheduler(rq, p, policy, param->sched_priority); __setscheduler(rq, p, policy, param->sched_priority);
if (on_rq) { if (on_rq) {
if (running)
p->sched_class->set_curr_task(rq);
activate_task(rq, p, 0); activate_task(rq, p, 0);
/* /*
* Reschedule if we are currently running on this runqueue and * Reschedule if we are currently running on this runqueue and
* our priority decreased, or if we are not currently running on * our priority decreased, or if we are not currently running on
* this runqueue and our priority is higher than the current's * this runqueue and our priority is higher than the current's
*/ */
if (task_running(rq, p)) { if (running) {
if (p->prio > oldprio) if (p->prio > oldprio)
resched_task(rq->curr); resched_task(rq->curr);
p->sched_class->set_curr_task(rq);
} else { } else {
check_preempt_curr(rq, p); check_preempt_curr(rq, p);
} }
...@@ -6861,9 +6865,9 @@ static void sched_move_task(struct container_subsys *ss, struct container *cont, ...@@ -6861,9 +6865,9 @@ static void sched_move_task(struct container_subsys *ss, struct container *cont,
set_task_cfs_rq(tsk); set_task_cfs_rq(tsk);
if (on_rq) { if (on_rq) {
enqueue_task(rq, tsk, 0);
if (unlikely(running)) if (unlikely(running))
tsk->sched_class->set_curr_task(rq); tsk->sched_class->set_curr_task(rq);
enqueue_task(rq, tsk, 0);
} }
done: done:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment