mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Stultz <john.stultz@linaro.org>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
	Ingo Molnar <mingo@kernel.org>,
	Prarit Bhargava <prarit@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	stable@vger.kernel.org
Subject: [PATCH 4/4] time: Avoid making adjustments if we havne't accumulated anything
Date: Tue, 21 Aug 2012 20:30:49 -0400	[thread overview]
Message-ID: <1345595449-34965-5-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1345595449-34965-1-git-send-email-john.stultz@linaro.org>

If update_wall_time() is called and the current offset isn't
large enough to accumulate, avoid re-calling timekeeping_adjust
which may change the clock freq and can cause 1ns inconsistencies
with CLOCK_REALTIME_COARSE/CLOCK_MONOTONIC_COARSE.

Cc: Ingo Molnar <mingo@kernel.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 kernel/time/timekeeping.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index a5a9389..0c1485e 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1152,6 +1152,10 @@ static void update_wall_time(void)
 	offset = (clock->read(clock) - clock->cycle_last) & clock->mask;
 #endif
 
+	/* Check if there's really nothing to do */
+	if (offset < tk->cycle_interval)
+		goto out;
+
 	/*
 	 * With NO_HZ we may have to accumulate many cycle_intervals
 	 * (think "ticks") worth of time at once. To do this efficiently,
-- 
1.7.9.5


  parent reply	other threads:[~2012-08-22  0:31 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-22  0:30 [PATCH 0/4] Time fixes for 3.6 John Stultz
2012-08-22  0:30 ` [PATCH 1/4] time: Ensure we normalize the timekeeper in tk_xtime_add John Stultz
2012-08-22  8:50   ` [tip:timers/urgent] " tip-bot for John Stultz
2012-08-22  0:30 ` [PATCH 2/4] time: Fix casting issue in timekeeping_forward_now John Stultz
2012-08-22  8:51   ` [tip:timers/urgent] " tip-bot for Andreas Schwab
2012-08-22  0:30 ` [PATCH 3/4] time: Avoid potential shift-overflow with large shift values John Stultz
2012-08-22  8:11   ` Geert Uytterhoeven
2012-08-22  8:52   ` [tip:timers/urgent] time: Avoid potential shift overflow " tip-bot for John Stultz
2012-08-22  0:30 ` John Stultz [this message]
2012-08-22  8:52   ` [tip:timers/urgent] time: Avoid making adjustments if we haven' t accumulated anything tip-bot for John Stultz

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=1345595449-34965-5-git-send-email-john.stultz@linaro.org \
    --to=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=prarit@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /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

Powered by JetHome