diff options
author | John Stultz <johnstul@us.ibm.com> | 2012-07-17 13:33:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 11:58:37 -0400 |
commit | 62b787f886e2d96cc7c5428aeee05dbe32a9531b (patch) | |
tree | efde1d722f2151d394f693da0790afd16cf6dc1a /kernel | |
parent | c7e2580578671c4d19a1a83e6fdb2482cc136283 (diff) |
hrtimer: Provide clock_was_set_delayed()
This is a backport of f55a6faa384304c89cfef162768e88374d3312cb
clock_was_set() cannot be called from hard interrupt context because
it calls on_each_cpu().
For fixing the widely reported leap seconds issue it is necessary to
call it from hard interrupt context, i.e. the timer tick code, which
does the timekeeping updates.
Provide a new function which denotes it in the hrtimer cpu base
structure of the cpu on which it is called and raise the hrtimer
softirq. We then execute the clock_was_set() notificiation from
softirq context in run_hrtimer_softirq(). The hrtimer softirq is
rarely used, so polling the flag there is not a performance issue.
[ tglx: Made it depend on CONFIG_HIGH_RES_TIMERS. We really should get
rid of all this ifdeffery ASAP ]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Reported-by: Jan Engelhardt <jengelh@inai.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Prarit Bhargava <prarit@redhat.com>
Link: http://lkml.kernel.org/r/1341960205-56738-2-git-send-email-johnstul@us.ibm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/hrtimer.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 2043c08d36c..a256babbaf0 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -717,6 +717,19 @@ static int hrtimer_switch_to_hres(void) | |||
717 | return 1; | 717 | return 1; |
718 | } | 718 | } |
719 | 719 | ||
720 | /* | ||
721 | * Called from timekeeping code to reprogramm the hrtimer interrupt | ||
722 | * device. If called from the timer interrupt context we defer it to | ||
723 | * softirq context. | ||
724 | */ | ||
725 | void clock_was_set_delayed(void) | ||
726 | { | ||
727 | struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases); | ||
728 | |||
729 | cpu_base->clock_was_set = 1; | ||
730 | __raise_softirq_irqoff(HRTIMER_SOFTIRQ); | ||
731 | } | ||
732 | |||
720 | #else | 733 | #else |
721 | 734 | ||
722 | static inline int hrtimer_hres_active(void) { return 0; } | 735 | static inline int hrtimer_hres_active(void) { return 0; } |
@@ -1395,6 +1408,13 @@ void hrtimer_peek_ahead_timers(void) | |||
1395 | 1408 | ||
1396 | static void run_hrtimer_softirq(struct softirq_action *h) | 1409 | static void run_hrtimer_softirq(struct softirq_action *h) |
1397 | { | 1410 | { |
1411 | struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases); | ||
1412 | |||
1413 | if (cpu_base->clock_was_set) { | ||
1414 | cpu_base->clock_was_set = 0; | ||
1415 | clock_was_set(); | ||
1416 | } | ||
1417 | |||
1398 | hrtimer_peek_ahead_timers(); | 1418 | hrtimer_peek_ahead_timers(); |
1399 | } | 1419 | } |
1400 | 1420 | ||