The patch titled
dynticks: extend next_timer_interrupt() to use a reference jiffy
has been added to the -mm tree. Its filename is
dynticks-extend-next_timer_interrupt-to-use-a.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: dynticks: extend next_timer_interrupt() to use a reference jiffy
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
For CONFIG_NO_HZ we need to calculate the next timer wheel event based to a
given jiffie value. Extend the existing code to allow the extra now argument.
Provide a compability function for the existing implementations to call the
function with now = jiffies. This also solves the racyness of the original
code vs. jiffies changing during the iteration.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/timer.h | 10 ++++
kernel/timer.c | 97 +++++++++++++++++++++++++++++-----------
2 files changed, 81 insertions(+), 26 deletions(-)
diff -puN include/linux/timer.h~dynticks-extend-next_timer_interrupt-to-use-a include/linux/timer.h
--- a/include/linux/timer.h~dynticks-extend-next_timer_interrupt-to-use-a
+++ a/include/linux/timer.h
@@ -61,7 +61,17 @@ extern int del_timer(struct timer_list *
extern int __mod_timer(struct timer_list *timer, unsigned long expires);
extern int mod_timer(struct timer_list *timer, unsigned long expires);
+/*
+ * Return when the next timer-wheel timeout occurs (in absolute jiffies),
+ * locks the timer base:
+ */
extern unsigned long next_timer_interrupt(void);
+/*
+ * Return when the next timer-wheel timeout occurs (in absolute jiffies),
+ * locks the timer base and does the comparison against the given
+ * jiffie.
+ */
+extern unsigned long get_next_timer_interrupt(unsigned long now);
/***
* add_timer - start a timer
diff -puN kernel/timer.c~dynticks-extend-next_timer_interrupt-to-use-a kernel/timer.c
--- a/kernel/timer.c~dynticks-extend-next_timer_interrupt-to-use-a
+++ a/kernel/timer.c
@@ -468,29 +468,14 @@ static inline void __run_timers(tvec_bas
* is used on S/390 to stop all activity when a cpus is idle.
* This functions needs to be called disabled.
*/
-unsigned long next_timer_interrupt(void)
+unsigned long __next_timer_interrupt(tvec_base_t *base, unsigned long now)
{
- tvec_base_t *base;
struct list_head *list;
- struct timer_list *nte;
+ struct timer_list *nte, *found = NULL;
unsigned long expires;
- unsigned long hr_expires = MAX_JIFFY_OFFSET;
- ktime_t hr_delta;
tvec_t *varray[4];
int i, j;
- hr_delta = hrtimer_get_next_event();
- if (hr_delta.tv64 != KTIME_MAX) {
- struct timespec tsdelta;
- tsdelta = ktime_to_timespec(hr_delta);
- hr_expires = timespec_to_jiffies(&tsdelta);
- if (hr_expires < 3)
- return hr_expires + jiffies;
- }
- hr_expires += jiffies;
-
- base = __get_cpu_var(tvec_bases);
- spin_lock(&base->lock);
expires = base->timer_jiffies + (LONG_MAX >> 1);
list = NULL;
@@ -499,6 +484,7 @@ unsigned long next_timer_interrupt(void)
do {
list_for_each_entry(nte, base->tv1.vec + j, entry) {
expires = nte->expires;
+ found = nte;
if (j < (base->timer_jiffies & TVR_MASK))
list = base->tv2.vec + (INDEX(0));
goto found;
@@ -518,9 +504,12 @@ unsigned long next_timer_interrupt(void)
j = (j + 1) & TVN_MASK;
continue;
}
- list_for_each_entry(nte, varray[i]->vec + j, entry)
- if (time_before(nte->expires, expires))
+ list_for_each_entry(nte, varray[i]->vec + j, entry) {
+ if (time_before(nte->expires, expires)) {
expires = nte->expires;
+ found = nte;
+ }
+ }
if (j < (INDEX(i)) && i < 3)
list = varray[i + 1]->vec + (INDEX(i + 1));
goto found;
@@ -534,10 +523,59 @@ found:
* where we found the timer element.
*/
list_for_each_entry(nte, list, entry) {
- if (time_before(nte->expires, expires))
+ if (time_before(nte->expires, expires)) {
expires = nte->expires;
+ found = nte;
+ }
}
}
+ WARN_ON(!found);
+
+ return expires;
+}
+
+#ifdef CONFIG_NO_HZ
+
+unsigned long get_next_timer_interrupt(unsigned long now)
+{
+ tvec_base_t *base = __get_cpu_var(tvec_bases);
+ unsigned long expires;
+
+ spin_lock(&base->lock);
+ expires = __next_timer_interrupt(base, now);
+ spin_unlock(&base->lock);
+
+ /*
+ * 'Timer wheel time' can lag behind 'jiffies time' due to
+ * delayed processing, so make sure we return a value that
+ * makes sense externally. base->timer_jiffies is unchanged,
+ * so it is safe to access it outside the lock.
+ */
+
+ return expires - (now - base->timer_jiffies);
+}
+
+#else
+
+unsigned long next_timer_interrupt(void)
+{
+ tvec_base_t *base = __get_cpu_var(tvec_bases);
+ unsigned long expires;
+ unsigned long now = jiffies;
+ unsigned long hr_expires = MAX_JIFFY_OFFSET;
+ ktime_t hr_delta = hrtimer_get_next_event();
+
+ if (hr_delta.tv64 != KTIME_MAX) {
+ struct timespec tsdelta;
+ tsdelta = ktime_to_timespec(hr_delta);
+ hr_expires = timespec_to_jiffies(&tsdelta);
+ if (hr_expires < 3)
+ return hr_expires + now;
+ }
+ hr_expires += now;
+
+ spin_lock(&base->lock);
+ expires = __next_timer_interrupt(base, now);
spin_unlock(&base->lock);
/*
@@ -553,16 +591,23 @@ found:
* would falsely evaluate to true. If that is the case, just
* return jiffies so that we can immediately fire the local timer
*/
- if (time_before(expires, jiffies))
- return jiffies;
+ if (time_before(expires, now))
+ expires = now;
+ else if (time_before(hr_expires, expires))
+ expires = hr_expires;
- if (time_before(hr_expires, expires))
- return hr_expires;
-
- return expires;
+ /*
+ * 'Timer wheel time' can lag behind 'jiffies time' due to
+ * delayed processing, so make sure we return a value that
+ * makes sense externally. base->timer_jiffies is unchanged,
+ * so it is safe to access it outside the lock.
+ */
+ return expires - (now - base->timer_jiffies);
}
#endif
+#endif
+
/******************************************************************/
/*
_
Patches currently in -mm which might be from tglx@xxxxxxxxxxxxx are
origin.patch
genirq-convert-the-x86_64-architecture-to-irq-chips.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-irq-convert-the-move_irq-flag-from-a-32bit-word-to-a-single-bit.patch
genirq-irq-add-moved_masked_irq.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-msi-make-the-msi-boolean-tests-return-either-0-or-1.patch
genirq-msi-implement-helper-functions-read_msi_msg-and-write_msi_msg.patch
genirq-msi-refactor-the-msi_ops.patch
genirq-msi-simplify-the-msi-irq-limit-policy.patch
genirq-irq-add-a-dynamic-irq-creation-api.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-i386-irq-dynamic-irq-support.patch
genirq-x86_64-irq-dynamic-irq-support.patch
genirq-msi-make-the-msi-code-irq-based-and-not-vector-based.patch
genirq-x86_64-irq-move-msi-message-composition-into-io_apicc.patch
genirq-i386-irq-move-msi-message-composition-into-io_apicc.patch
genirq-msi-only-build-msi-apicc-on-ia64.patch
genirq-x86_64-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-irq-remove-msi-hacks.patch
genirq-irq-generalize-the-check-for-hardirq_bits.patch
genirq-x86_64-irq-make-the-external-irq-handlers-report-their-vector-not-the-irq-number.patch
genirq-x86_64-irq-make-vector_irq-per-cpu.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
genirq-x86_64-irq-kill-gsi_irq_sharing.patch
genirq-x86_64-irq-kill-irq-compression.patch
msi-simplify-msi-sanity-checks-by-adding-with-generic-irq-code.patch
msi-only-use-a-single-irq_chip-for-msi-interrupts.patch
msi-refactor-and-move-the-msi-irq_chip-into-the-arch-code.patch
msi-move-the-ia64-code-into-arch-ia64.patch
htirq-tidy-up-the-htirq-code.patch
genirq-clean-up-irq-flow-type-naming.patch
gtod-exponential-update_wall_time.patch
gtod-persistent-clock-support-core.patch
gtod-persistent-clock-support-i386.patch
time-uninline-jiffiesh.patch
time-fix-msecs_to_jiffies-bug.patch
time-fix-timeout-overflow.patch
cleanup-uninline-irq_enter-and-move-it-into-a.patch
dynticks-extend-next_timer_interrupt-to-use-a.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-state-tracking.patch
hrtimers-clean-up-callback-tracking.patch
hrtimers-move-and-add-documentation.patch
clockevents-core.patch
clockevents-drivers-for-i386.patch
high-res-timers-core.patch
high-res-timers-core-fix.patch
dynticks-core.patch
dyntick-add-nohz-stats-to-proc-stat.patch
dynticks-i386-arch-code.patch
high-res-timers-dynticks-enable-i386-support.patch
debugging-feature-timer-stats.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
