scheduler fixes
Linus,
please pull the latest scheduler fixes git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
(note: i included the related wait_for_completion_timeout() cleanup from Oleg as well because it was tested together.)
Ingo
------------------>
Oleg Nesterov (1):
sched: refactor wait_for_completion_timeout()
Peter Zijlstra (1):
sched: rt: dont stop the period timer when there are tasks wanting to run
Roland Dreier (1):
sched: fix wait_for_completion_timeout() spurious failure under heavy load
kernel/sched.c | 14 ++++++-------- kernel/sched_rt.c | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-)
kernel/sched.c +6 -8
@@ -4398,22 +4398,20 @@ do_wait_for_common(struct completion *x, long timeout, int state) signal_pending(current)) || (state == TASK_KILLABLE && fatal_signal_pending(current))) { -__remove_wait_queue (&x->wait, &wait); -return -ERESTARTSYS ; + timeout = -ERESTARTSYS ; +break ; }__set_current_state (state);spin_unlock_irq (&x->wait.lock); timeout =schedule_timeout (timeout);spin_lock_irq (&x->wait.lock); -if (!timeout) { -__remove_wait_queue (&x->wait, &wait); -return timeout; - } - }while (!x->done); + }while (!x->done && timeout);__remove_wait_queue (&x->wait, &wait); +if (!x->done) +return timeout; } x->done--; -return timeout; +return timeout ?:1 ; }static long __sched
kernel/sched_rt.c +2 -1
@@ -250,7 +250,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)if (rt_rq->rt_time || rt_rq->rt_nr_running) idle =0 ;spin_unlock (&rt_rq->rt_runtime_lock); - } + }else if (rt_rq->rt_nr_running) + idle =0 ;if (enqueue)sched_rt_rq_enqueue (rt_rq);