Prev: [patch 120/123] sched: Fix sched_mv_power_savings for !SMT
Next: [patch 105/123] drm/radeon/kms/atom: fix shr/shl ops
From: Greg KH on 12 Mar 2010 19:30
2.6.33-stable review patch. If anyone has any objections, please let me know.

-----------------

From: Thomas Gleixner <tglx(a)linutronix.de>

commit 83ab0aa0d5623d823444db82c3b3c34d7ec364ae upstream.

setscheduler() saves task->sched_class outside of the rq->lock held
region for a check after the setscheduler changes have become
effective. That might result in checking a stale value.

rtmutex_setprio() has the same problem, though it is protected by
p->pi_lock against setscheduler(), but for correctness sake (and to
avoid bad examples) it needs to be fixed as well.

Retrieve task->sched_class inside of the rq->lock held region.

Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de>
Acked-by: Peter Zijlstra <peterz(a)infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
kernel/sched.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6065,7 +6065,7 @@ void rt_mutex_setprio(struct task_struct
unsigned long flags;
int oldprio, on_rq, running;
struct rq *rq;
- const struct sched_class *prev_class = p->sched_class;
+ const struct sched_class *prev_class;

BUG_ON(prio < 0 || prio > MAX_PRIO);

@@ -6073,6 +6073,7 @@ void rt_mutex_setprio(struct task_struct
update_rq_clock(rq);

oldprio = p->prio;
+ prev_class = p->sched_class;
on_rq = p->se.on_rq;
running = task_current(rq, p);
if (on_rq)
@@ -6292,7 +6293,7 @@ static int __sched_setscheduler(struct t
{
int retval, oldprio, oldpolicy = -1, on_rq, running;
unsigned long flags;
- const struct sched_class *prev_class = p->sched_class;
+ const struct sched_class *prev_class;
struct rq *rq;
int reset_on_fork;

@@ -6406,6 +6407,7 @@ recheck:
p->sched_reset_on_fork = reset_on_fork;

oldprio = p->prio;
+ prev_class = p->sched_class;
__setscheduler(rq, p, policy, param->sched_priority);

if (running)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [patch 120/123] sched: Fix sched_mv_power_savings for !SMT
Next: [patch 105/123] drm/radeon/kms/atom: fix shr/shl ops