aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-12-07 13:16:17 -0500
committerIngo Molnar <mingo@elte.hu>2007-12-07 13:16:17 -0500
commit62f0f61e6673e67151a7c8c0f9a09c7ea43fe2b5 (patch)
treec41cc826e53b7ce726e6f343a0ab72ad7e058ca4
parentf194d132e4971111f85c18c96067acffb13cee6d (diff)
hrtimers: avoid overflow for large relative timeouts
Relative hrtimers with a large timeout value might end up as negative timer values, when the current time is added in hrtimer_start(). This in turn is causing the clockevents_set_next() function to set an huge timeout and sleep for quite a long time when we have a clock source which is capable of long sleeps like HPET. With PIT this almost goes unnoticed as the maximum delta is ~27ms. The non-hrt/nohz code sorts this out in the next timer interrupt, so we never noticed that problem which has been there since the first day of hrtimers. This bug became more apparent in 2.6.24 which activates HPET on more hardware. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/hrtimer.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 22a25142e4cf..e65dd0b47cdc 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -850,6 +850,14 @@ hrtimer_start(struct hrtimer *timer, ktime_t tim, const enum hrtimer_mode mode)
850#ifdef CONFIG_TIME_LOW_RES 850#ifdef CONFIG_TIME_LOW_RES
851 tim = ktime_add(tim, base->resolution); 851 tim = ktime_add(tim, base->resolution);
852#endif 852#endif
853 /*
854 * Careful here: User space might have asked for a
855 * very long sleep, so the add above might result in a
856 * negative number, which enqueues the timer in front
857 * of the queue.
858 */
859 if (tim.tv64 < 0)
860 tim.tv64 = KTIME_MAX;
853 } 861 }
854 timer->expires = tim; 862 timer->expires = tim;
855 863