aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-02-13 18:58:36 -0500
committerThomas Gleixner <tglx@linutronix.de>2008-02-14 16:08:30 -0500
commit63070a79ba482c274bad10ac8c4b587a3e011f2c (patch)
tree1ecb5e104d343d3e533b2469c54e6a1bcb19a9ac /kernel
parent5a7780e725d1bb4c3094fcc12f1c5c5faea1e988 (diff)
hrtimer: catch expired CLOCK_REALTIME timers early
A CLOCK_REALTIME timer, which has an absolute expiry time less than the clock realtime offset calls with a negative delta into the clock events code and triggers the WARN_ON() there. This is a false positive and needs to be prevented. Check the result of timer->expires - timer->base->offset right away and return -ETIME right away. Thanks to Frans Pop, who reported the problem and tested the fixes. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Frans Pop <elendil@planet.nl>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/hrtimer.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index c2893af9479e..98bee013f71f 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -442,6 +442,8 @@ static int hrtimer_reprogram(struct hrtimer *timer,
442 ktime_t expires = ktime_sub(timer->expires, base->offset); 442 ktime_t expires = ktime_sub(timer->expires, base->offset);
443 int res; 443 int res;
444 444
445 WARN_ON_ONCE(timer->expires.tv64 < 0);
446
445 /* 447 /*
446 * When the callback is running, we do not reprogram the clock event 448 * When the callback is running, we do not reprogram the clock event
447 * device. The timer callback is either running on a different CPU or 449 * device. The timer callback is either running on a different CPU or
@@ -452,6 +454,15 @@ static int hrtimer_reprogram(struct hrtimer *timer,
452 if (hrtimer_callback_running(timer)) 454 if (hrtimer_callback_running(timer))
453 return 0; 455 return 0;
454 456
457 /*
458 * CLOCK_REALTIME timer might be requested with an absolute
459 * expiry time which is less than base->offset. Nothing wrong
460 * about that, just avoid to call into the tick code, which
461 * has now objections against negative expiry values.
462 */
463 if (expires.tv64 < 0)
464 return -ETIME;
465
455 if (expires.tv64 >= expires_next->tv64) 466 if (expires.tv64 >= expires_next->tv64)
456 return 0; 467 return 0;
457 468