linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Stultz <john.stultz@linaro.org>
To: Linux Kernel Mailing List <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/10] time: Add debugging checks to warn if we see delays
Date: Fri,  9 Jan 2015 16:34:23 -0800	[thread overview]
Message-ID: <1420850068-27828-6-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1420850068-27828-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.

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 | 18 ++++++++++++++++++
 2 files changed, 19 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 6a93185..0dcceba 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1319,6 +1319,22 @@ static int __init timekeeping_init_ops(void)
 }
 device_initcall(timekeeping_init_ops);
 
+static void timekeeping_check_offset(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("ERROR: cycle offset (%lld) is larger then"
+			" allowed %s max_cycles (%lld)\n",
+			offset, name, max_cycles);
+	else if (offset > (max_cycles >> 1))
+		printk("WARNING: cycle offset (%lld) is past"
+			" the %s 50%% safety margin (%lld)\n",
+			offset, name, max_cycles>>1);
+}
+
 /*
  * Apply a multiplier adjustment to the timekeeper
  */
@@ -1602,6 +1618,8 @@ void update_wall_time(void)
 	if (offset < real_tk->cycle_interval)
 		goto out;
 
+	timekeeping_check_offset(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,
-- 
1.9.1


  parent reply	other threads:[~2015-01-10  0:34 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-10  0:34 [PATCH 00/10][RFC] Increased clocksource validation and cleanups John Stultz
2015-01-10  0:34 ` [PATCH 01/10] clocksource: Simplify clocks_calc_max_nsecs logic John Stultz
2015-01-10  0:34 ` [PATCH 02/10] clocksource: Simplify logic around clocksource wrapping saftey margins John Stultz
2015-01-10  2:03   ` Stephen Boyd
2015-01-10  0:34 ` [PATCH 03/10] clocksource: Remove clocksource_max_deferment() John Stultz
2015-01-11 11:47   ` Richard Cochran
2015-01-12 18:36     ` John Stultz
2015-01-12 20:16       ` Richard Cochran
2015-01-10  0:34 ` [PATCH 04/10] clocksource: Add max_cycles to clocksource structure John Stultz
2015-01-10  2:06   ` Stephen Boyd
2015-01-10  0:34 ` John Stultz [this message]
2015-01-10  0:34 ` [PATCH 06/10] time: Cap clocksource reads to the clocksource max_cycles value John Stultz
2015-01-11 12:41   ` Richard Cochran
2015-01-12 18:54     ` John Stultz
2015-01-12 19:02       ` Linus Torvalds
2015-01-12 20:37         ` Richard Cochran
2015-01-12 20:30       ` Richard Cochran
2015-01-12 20:49         ` Richard Cochran
2015-01-13 11:11   ` Peter Zijlstra
2015-01-13 21:33     ` John Stultz
2015-01-13 22:51       ` Linus Torvalds
2015-01-14  9:35       ` Peter Zijlstra
2015-01-22 20:55         ` John Stultz
2015-01-10  0:34 ` [PATCH 07/10] time: Try to catch clocksource delta underflows John Stultz
2015-01-10  0:34 ` [PATCH 08/10] clocksource: Mostly kill clocksource_register() John Stultz
2015-01-10  0:34 ` [PATCH 09/10] sparc: Convert to using clocksource_register_hz() John Stultz
2015-01-10  0:34 ` [PATCH 10/10] clocksource: Add some debug info about clocksources being registered John Stultz
2015-01-10  2:02   ` Stephen Boyd
2015-01-22  0:51     ` John Stultz
2015-01-22 12:27       ` Prarit Bhargava
2015-01-11 11:41 ` [PATCH 00/10][RFC] Increased clocksource validation and cleanups Richard Cochran
2015-01-12 18:22   ` John Stultz
2015-01-12 20:45     ` Richard Cochran

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=1420850068-27828-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;
as well as URLs for NNTP newsgroup(s).