[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1257880321.4108.457.camel@laptop>
Date: Tue, 10 Nov 2009 20:12:01 +0100
From: Peter Zijlstra <peterz@...radead.org>
To: Mike Galbraith <efault@....de>
Cc: Ingo Molnar <mingo@...e.hu>,
Peter Williams <pwil3058@...pond.net.au>,
lkml <linux-kernel@...r.kernel.org>
Subject: [PATCH -v2] sched: Make sure task has correct sched_class after
policy change
> On Mon, 2009-11-02 at 17:20 +0100, Ingo Molnar wrote:
> > i zapped the buggy patch from sched/urgent already - mind sending a
> > full, fixed patch? (with lkml and everyone involved cc-ed)
Updated patch below...
git branch -a --contains 67d08dfed042855431dc99c9e0e6f6f7e85737ef
doesn't actually tell me anything other than tip/master, which is
strange... I'd expect one of the tip/sched branches to have it too.
Will you rebase whatever tree its in, getting rid of the initial commit
and revert?
---
From: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Subject: sched: Make sure task has correct sched_class after policy change
>>From the code in rt_mutex_setprio(), it is evident that the
intention is that task's with a RT 'prio' value as a consequence of
receiving a PI boost also have their 'sched_class' field set to
'&rt_sched_class'.
However, Peter noticed that the code in __setscheduler() could
result in this intention being frustrated. Fix it.
Reported-by: Peter Williams <pwil3058@...pond.net.au>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
---
kernel/sched.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
Index: linux-2.6/kernel/sched.c
===================================================================
--- linux-2.6.orig/kernel/sched.c
+++ linux-2.6/kernel/sched.c
@@ -6188,22 +6188,14 @@ __setscheduler(struct rq *rq, struct tas
BUG_ON(p->se.on_rq);
p->policy = policy;
- switch (p->policy) {
- case SCHED_NORMAL:
- case SCHED_BATCH:
- case SCHED_IDLE:
- p->sched_class = &fair_sched_class;
- break;
- case SCHED_FIFO:
- case SCHED_RR:
- p->sched_class = &rt_sched_class;
- break;
- }
-
p->rt_priority = prio;
p->normal_prio = normal_prio(p);
/* we are holding p->pi_lock already */
p->prio = rt_mutex_getprio(p);
+ if (rt_prio(p->prio))
+ p->sched_class = &rt_sched_class;
+ else
+ p->sched_class = &fair_sched_class;
set_load_weight(p);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists