diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-01-05 11:28:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 13:14:33 +0100 |
| commit | a6037b61c2f5fc99c57c15b26d7cfa58bbb34008 (patch) | |
| tree | b076de5cc8a75e4227f96dda31a0daa6e895579b /include | |
| parent | 731a55ba0f17064f85903b7bf8e24849ec6cfa20 (diff) | |
| download | linux-stable-a6037b61c2f5fc99c57c15b26d7cfa58bbb34008.tar.gz linux-stable-a6037b61c2f5fc99c57c15b26d7cfa58bbb34008.tar.bz2 linux-stable-a6037b61c2f5fc99c57c15b26d7cfa58bbb34008.zip | |
hrtimer: fix recursion deadlock by re-introducing the softirq
Impact: fix rare runtime deadlock
There are a few sites that do:
spin_lock_irq(&foo)
hrtimer_start(&bar)
__run_hrtimer(&bar)
func()
spin_lock(&foo)
which obviously deadlocks. In order to avoid this, never call __run_hrtimer()
from hrtimer_start*() context, but instead defer this to softirq context.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/interrupt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 0702c4d7bdf0..2062833f5f7a 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -253,7 +253,8 @@ enum BLOCK_SOFTIRQ, TASKLET_SOFTIRQ, SCHED_SOFTIRQ, - RCU_SOFTIRQ, /* Preferable RCU should always be the last softirq */ + HRTIMER_SOFTIRQ, + RCU_SOFTIRQ, /* Preferable RCU should always be the last softirq */ NR_SOFTIRQS }; |