aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorBodo Stroesser <bstroesser@fujitsu-siemens.com>2008-04-26 17:10:16 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-04-27 12:26:43 -0400
commitd7b41a24bfb5d7fa02f7b49be1293d468814e424 (patch)
tree37c206c5125aca1084b8c4d76f80c5de4dec7c38 /kernel
parentc3bf9bc243092c53946fd6d8ebd6dc2f4e572d48 (diff)
hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ
When using hrtimer with timer->cb_mode == HRTIMER_CB_SOFTIRQ in some cases the clockevent is not programmed. This happens, if: - a timer is rearmed while it's state is HRTIMER_STATE_CALLBACK - hrtimer_reprogram() returns -ETIME, when it is called after CALLBACK is finished. This occurs if the new timer->expires is in the past when CALLBACK is done. In this case, the timer needs to be removed from the tree and put onto the pending list again. The patch is against 2.6.22.5, but AFAICS, it is relevant for 2.6.25 also (in run_hrtimer_pending()). Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com> Cc: stable@kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/hrtimer.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f78777abe769..e379ef0e9c20 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1080,8 +1080,19 @@ static void run_hrtimer_pending(struct hrtimer_cpu_base *cpu_base)
1080 * If the timer was rearmed on another CPU, reprogram 1080 * If the timer was rearmed on another CPU, reprogram
1081 * the event device. 1081 * the event device.
1082 */ 1082 */
1083 if (timer->base->first == &timer->node) 1083 struct hrtimer_clock_base *base = timer->base;
1084 hrtimer_reprogram(timer, timer->base); 1084
1085 if (base->first == &timer->node &&
1086 hrtimer_reprogram(timer, base)) {
1087 /*
1088 * Timer is expired. Thus move it from tree to
1089 * pending list again.
1090 */
1091 __remove_hrtimer(timer, base,
1092 HRTIMER_STATE_PENDING, 0);
1093 list_add_tail(&timer->cb_entry,
1094 &base->cpu_base->cb_pending);
1095 }
1085 } 1096 }
1086 } 1097 }
1087 spin_unlock_irq(&cpu_base->lock); 1098 spin_unlock_irq(&cpu_base->lock);