sched: Make sure task has correct sched_class after policy change
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 sched: Make sure task has correct sched_class after policy change
Quoted 4 lines · Ingo Molnar
Quoted 3 lines
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 <[email protected]>
Subject: sched: Make sure task has correct sched_class after policy change
Quoted 1 line
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.
--- kernel/sched.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
kernel/sched.c +4 -12
@@ -6188,22 +6188,14 @@ __setscheduler(struct rq *rq, struct tasBUG_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); }
Commit-ID: ffd44db5f02af32bcc25a8eb5981bf02a141cdab Gitweb: http://git.kernel.org/tip/ffd44db5f02af32bcc25a8eb5981bf02a141cdab Author: Peter Zijlstra <[email protected]> AuthorDate: Tue, 10 Nov 2009 20:12:01 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 10 Nov 2009 20:22:31 +0100
sched: Make sure task has correct sched_class after policy change
Quoted 1 line
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.
LKML-Reference: <1257880321.4108.457.camel@laptop>
--- kernel/sched.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-)
kernel/sched.c +4 -12
@@ -6159,22 +6159,14 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio)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); }