Commit 995f054f2a342f8505fed4f8395d12c0f5966414
Committed by
Linus Torvalds
Linus Torvalds
1 parent
bbef618190
Exists in
master
and in
20 other branches
[PATCH] high-res timers: resume fix
Soeren Sonnenburg reported that upon resume he is getting this backtrace: [<c0119637>] smp_apic_timer_interrupt+0x57/0x90 [<c0142d30>] retrigger_next_event+0x0/0xb0 [<c0104d30>] apic_timer_interrupt+0x28/0x30 [<c0142d30>] retrigger_next_event+0x0/0xb0 [<c0140068>] __kfifo_put+0x8/0x90 [<c0130fe5>] on_each_cpu+0x35/0x60 [<c0143538>] clock_was_set+0x18/0x20 [<c0135cdc>] timekeeping_resume+0x7c/0xa0 [<c02aabe1>] __sysdev_resume+0x11/0x80 [<c02ab0c7>] sysdev_resume+0x47/0x80 [<c02b0b05>] device_power_up+0x5/0x10 it turns out that on resume we mistakenly re-enable interrupts too early. Do the timer retrigger only on the current CPU. Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Soeren Sonnenburg <kernel@nn7.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 3 changed files with 16 additions and 1 deletions Side-by-side Diff
include/linux/hrtimer.h
| ... | ... | @@ -206,6 +206,7 @@ |
| 206 | 206 | struct clock_event_device; |
| 207 | 207 | |
| 208 | 208 | extern void clock_was_set(void); |
| 209 | +extern void hres_timers_resume(void); | |
| 209 | 210 | extern void hrtimer_interrupt(struct clock_event_device *dev); |
| 210 | 211 | |
| 211 | 212 | /* |
| ... | ... | @@ -235,6 +236,8 @@ |
| 235 | 236 | * is expired in the next softirq when the clock was advanced. |
| 236 | 237 | */ |
| 237 | 238 | static inline void clock_was_set(void) { } |
| 239 | + | |
| 240 | +static inline void hres_timers_resume(void) { } | |
| 238 | 241 | |
| 239 | 242 | /* |
| 240 | 243 | * In non high resolution mode the time reference is taken from |
kernel/hrtimer.c
| ... | ... | @@ -459,6 +459,18 @@ |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | 461 | /* |
| 462 | + * During resume we might have to reprogram the high resolution timer | |
| 463 | + * interrupt (on the local CPU): | |
| 464 | + */ | |
| 465 | +void hres_timers_resume(void) | |
| 466 | +{ | |
| 467 | + WARN_ON_ONCE(num_online_cpus() > 1); | |
| 468 | + | |
| 469 | + /* Retrigger the CPU local events: */ | |
| 470 | + retrigger_next_event(NULL); | |
| 471 | +} | |
| 472 | + | |
| 473 | +/* | |
| 462 | 474 | * Check, whether the timer is on the callback pending list |
| 463 | 475 | */ |
| 464 | 476 | static inline int hrtimer_cb_pending(const struct hrtimer *timer) |