From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Dave Jones <davej@codemonkey.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Richard Cochran <richardcochran@gmail.com>,
Prarit Bhargava <prarit@redhat.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 05/12] time: Add debugging checks to warn if we see delays
Date: Fri, 6 Mar 2015 18:49:56 -0800 [thread overview]
Message-ID: <1425696603-16878-6-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1425696603-16878-1-git-send-email-john.stultz@linaro.org>
Recently there's been some request for better sanity
checking in the time code, so that its more clear
when something is going wrong since timekeeping issues
could manifest in a large number of strange ways with
various subsystems.
Thus, this patch adds some extra infrastructure to
add a check update_wall_time to print warnings if we
see the call delayed beyond the max_cycles overflow
point, or beyond the clocksource max_idle_ns value
which is currently 50% of the overflow point.
This extra infrastructure is conditionalized
behind a new CONFIG_DEBUG_TIMEKEEPING option
also added in this patch.
Tested this a bit by halting qemu for specified
lengths of time to trigger the warnings.
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
kernel/time/jiffies.c | 1 +
kernel/time/timekeeping.c | 26 ++++++++++++++++++++++++++
lib/Kconfig.debug | 12 ++++++++++++
3 files changed, 39 insertions(+)
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index a6a5bf5..7e41390 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -71,6 +71,7 @@ static struct clocksource clocksource_jiffies = {
.mask = 0xffffffff, /*32bits*/
.mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */
.shift = JIFFIES_SHIFT,
+ .max_cycles = 10,
};
__cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 91db941..7e9d433 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -118,6 +118,29 @@ static inline void tk_update_sleep_time(struct timekeeper *tk, ktime_t delta)
tk->offs_boot = ktime_add(tk->offs_boot, delta);
}
+#ifdef CONFIG_DEBUG_TIMEKEEPING
+static void timekeeping_check_update(struct timekeeper *tk, cycle_t offset)
+{
+
+ cycle_t max_cycles = tk->tkr.clock->max_cycles;
+ const char *name = tk->tkr.clock->name;
+
+ if (offset > max_cycles)
+ printk_deferred("ERROR: cycle offset (%lld) is larger then"
+ " allowed %s max_cycles (%lld)\n",
+ offset, name, max_cycles);
+ else if (offset > (max_cycles >> 1))
+ printk_deferred("WARNING: cycle offset (%lld) is past"
+ " the %s 50%% safety margin (%lld)\n",
+ offset, name, max_cycles>>1);
+}
+#else
+static inline
+void timekeeping_check_update(struct timekeeper *tk, cycle_t offset)
+{
+}
+#endif
+
/**
* tk_setup_internals - Set up internals to use clocksource clock.
*
@@ -1630,6 +1653,9 @@ void update_wall_time(void)
if (offset < real_tk->cycle_interval)
goto out;
+ /* Do some additional sanity checking */
+ timekeeping_check_update(real_tk, offset);
+
/*
* With NO_HZ we may have to accumulate many cycle_intervals
* (think "ticks") worth of time at once. To do this efficiently,
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c5cefb3..32065f6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -865,6 +865,18 @@ config SCHED_STACK_END_CHECK
data corruption or a sporadic crash at a later stage once the region
is examined. The runtime overhead introduced is minimal.
+config DEBUG_TIMEKEEPING
+ bool "Enable extra timekeeping sanity checking"
+ help
+ This option will enable additional timekeeping sanity checks
+ which may be helpful when diagnoising issues where timekeeping
+ problems are suspected.
+
+ This may include checks in the timekeeping hotpaths, so this
+ option may have a performance impact to some workloads.
+
+ If unsure, say N.
+
config TIMER_STATS
bool "Collect kernel timers statistics"
depends on DEBUG_KERNEL && PROC_FS
--
1.9.1
next prev parent reply other threads:[~2015-03-07 2:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-07 2:49 [PATCH 00/12] Increased clocksource validation and cleanups (v3) John Stultz
2015-03-07 2:49 ` [PATCH 01/12] clocksource: Simplify clocks_calc_max_nsecs logic John Stultz
2015-03-07 9:20 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 02/12] clocksource: Simplify logic around clocksource wrapping saftey margins John Stultz
2015-03-07 9:22 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 03/12] clocksource: Remove clocksource_max_deferment() John Stultz
2015-03-07 9:18 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 04/12] clocksource: Add max_cycles to clocksource structure John Stultz
2015-03-07 9:54 ` Ingo Molnar
2015-03-07 2:49 ` John Stultz [this message]
2015-03-07 9:22 ` [PATCH 05/12] time: Add debugging checks to warn if we see delays Paul Bolle
2015-03-07 9:29 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 06/12] time: Add infrastructure to cap clocksource reads to the max_cycles value John Stultz
2015-03-07 9:32 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 07/12] time: Try to catch clocksource delta underflows John Stultz
2015-03-07 9:34 ` Ingo Molnar
2015-03-07 2:49 ` [PATCH 08/12] time: Add warnings when overflows or underflows are observed John Stultz
2015-03-07 9:40 ` Ingo Molnar
2015-03-09 16:50 ` John Stultz
2015-03-10 5:05 ` Ingo Molnar
2015-03-07 2:50 ` [PATCH 09/12] clocksource: Improve clocksource watchdog reporting John Stultz
2015-03-07 2:50 ` [PATCH 10/12] clocksource: Mostly kill clocksource_register() John Stultz
2015-03-07 9:45 ` Ingo Molnar
2015-03-07 2:50 ` [PATCH 11/12] sparc: Convert to using clocksource_register_hz() John Stultz
2015-03-07 9:46 ` Ingo Molnar
2015-03-07 2:50 ` [PATCH 12/12] clocksource: Add some debug info about clocksources being registered John Stultz
2015-03-07 9:50 ` Ingo Molnar
2015-03-12 3:16 ` John Stultz
-- strict thread matches above, loose matches on Subject: below --
2015-01-23 0:09 [PATCH 00/12][RFC] Increased clocksource validation and cleanups (v2) John Stultz
2015-01-23 0:09 ` [PATCH 05/12] time: Add debugging checks to warn if we see delays John Stultz
2015-01-23 14:27 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425696603-16878-6-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=davej@codemonkey.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=sboyd@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®