]> git.karo-electronics.de Git - karo-tx-linux.git/commit
hrtimer: fix rq->lock inversion (again)
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Fri, 13 Mar 2009 11:21:27 +0000 (12:21 +0100)
committerChris Wright <chrisw@sous-sol.org>
Mon, 27 Apr 2009 17:37:00 +0000 (10:37 -0700)
commit7b457a610d6ab4d9bc654948da12968833510b2e
tree97c9fb27b62e74c6ca40122a291a3c4082158ab5
parentcf3c4fa34d08ef32a7fcc390e4c54f6eac92d572
hrtimer: fix rq->lock inversion (again)

upstream commit: 7f1e2ca9f04b02794597f60e7b1d43f0a1317939

It appears I inadvertly introduced rq->lock recursion to the
hrtimer_start() path when I delegated running already expired
timers to softirq context.

This patch fixes it by introducing a __hrtimer_start_range_ns()
method that will not use raise_softirq_irqoff() but
__raise_softirq_irqoff() which avoids the wakeup.

It then also changes schedule() to check for pending softirqs and
do the wakeup then, I'm not quite sure I like this last bit, nor
am I convinced its really needed.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: paulus@samba.org
LKML-Reference: <20090313112301.096138802@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
include/linux/hrtimer.h
include/linux/interrupt.h
kernel/hrtimer.c
kernel/sched.c
kernel/softirq.c