Message ID | 1306260792.27474.133.camel@e102391-lin.cambridge.arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, 2011-05-24 at 19:13 +0100, Marc Zyngier wrote: > Peter, > > I've experienced all kind of lock-ups on ARM SMP platforms recently, and > finally tracked it down to the following patch: > > e4a52bcb9a18142d79e231b6733cabdbf2e67c1f [sched: Remove rq->lock from the first half of ttwu()]. > > Even on moderate load, the machine locks up, often silently, and > sometimes with a few messages like: > INFO: rcu_preempt_state detected stalls on CPUs/tasks: { 0} (detected by 1, t=12002 jiffies) > > Another side effect of this patch is that the load average is always 0, > whatever load I throw at the system. > > Reverting the sched changes up to that patch (included) gives me a > working system again, which happily survives parallel kernel > compilations without complaining. > > My knowledge of the scheduler being rather limited, I haven't been able > to pinpoint the exact problem (though it probably have something to do > with __ARCH_WANT_INTERRUPTS_ON_CTXSW being defined on ARM). The enclosed > patch somehow papers over the load average problem, but the system ends > up locking up anyway: Hurm.. I'll try and make x86 use __ARCH_WANT_INTERRUPTS_ON_CTXSW, IIRC Ingo once said that that is possible and try to see if I can reproduce. No clear ideas atm. Thanks for reporting.
* Peter Zijlstra <a.p.zijlstra@chello.nl> wrote: > On Tue, 2011-05-24 at 19:13 +0100, Marc Zyngier wrote: > > Peter, > > > > I've experienced all kind of lock-ups on ARM SMP platforms recently, and > > finally tracked it down to the following patch: > > > > e4a52bcb9a18142d79e231b6733cabdbf2e67c1f [sched: Remove rq->lock from the first half of ttwu()]. > > > > Even on moderate load, the machine locks up, often silently, and > > sometimes with a few messages like: > > INFO: rcu_preempt_state detected stalls on CPUs/tasks: { 0} (detected by 1, t=12002 jiffies) > > > > Another side effect of this patch is that the load average is always 0, > > whatever load I throw at the system. > > > > Reverting the sched changes up to that patch (included) gives me a > > working system again, which happily survives parallel kernel > > compilations without complaining. > > > > My knowledge of the scheduler being rather limited, I haven't been able > > to pinpoint the exact problem (though it probably have something to do > > with __ARCH_WANT_INTERRUPTS_ON_CTXSW being defined on ARM). The enclosed > > patch somehow papers over the load average problem, but the system ends > > up locking up anyway: > > Hurm.. I'll try and make x86 use __ARCH_WANT_INTERRUPTS_ON_CTXSW, IIRC > Ingo once said that that is possible and try to see if I can reproduce. > No clear ideas atm. Yes, should be possible to just disable it on x86 - no further tricks needed. It's been a long time since i tested that though. Thanks, Ingo
On Tue, 2011-05-24 at 23:39 +0200, Ingo Molnar wrote: > * Peter Zijlstra <a.p.zijlstra@chello.nl> wrote: > > > On Tue, 2011-05-24 at 19:13 +0100, Marc Zyngier wrote: > > > Peter, > > > > > > I've experienced all kind of lock-ups on ARM SMP platforms recently, and > > > finally tracked it down to the following patch: > > > > > > e4a52bcb9a18142d79e231b6733cabdbf2e67c1f [sched: Remove rq->lock from the first half of ttwu()]. > > > > > > Even on moderate load, the machine locks up, often silently, and > > > sometimes with a few messages like: > > > INFO: rcu_preempt_state detected stalls on CPUs/tasks: { 0} (detected by 1, t=12002 jiffies) > > > > > > Another side effect of this patch is that the load average is always 0, > > > whatever load I throw at the system. > > > > > > Reverting the sched changes up to that patch (included) gives me a > > > working system again, which happily survives parallel kernel > > > compilations without complaining. > > > > > > My knowledge of the scheduler being rather limited, I haven't been able > > > to pinpoint the exact problem (though it probably have something to do > > > with __ARCH_WANT_INTERRUPTS_ON_CTXSW being defined on ARM). The enclosed > > > patch somehow papers over the load average problem, but the system ends > > > up locking up anyway: > > > > Hurm.. I'll try and make x86 use __ARCH_WANT_INTERRUPTS_ON_CTXSW, IIRC > > Ingo once said that that is possible and try to see if I can reproduce. > > No clear ideas atm. > > Yes, should be possible to just disable it on x86 - no further tricks needed. > It's been a long time since i tested that though. I can confirm this is SMP only. UP is fine. SMP+nosmp locks up as well. M.
diff --git a/kernel/sched.c b/kernel/sched.c index d3ade54..5ab43c4 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2526,8 +2526,13 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) * to spin on ->on_cpu if p is current, since that would * deadlock. */ - if (p == current) + if (p == current) { + p->sched_contributes_to_load = !!task_contributes_to_load(p); + p->state = TASK_WAKING; + if (p->sched_class->task_waking) + p->sched_class->task_waking(p); goto out_activate; + } #endif cpu_relax(); }