From: John Stultz <johnstul@us.ibm.com>
To: stable@vger.kernel.org
Cc: John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Prarit Bhargava <prarit@redhat.com>,
Linux Kernel <linux-kernel@vger.kernel.org>,
John Stultz <johnstul@us.ibm.com>
Subject: [PATCH 03/11] 2.6.32.x: timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond
Date: Tue, 17 Jul 2012 18:05:27 -0400 [thread overview]
Message-ID: <1342562735-55870-4-git-send-email-johnstul@us.ibm.com> (raw)
In-Reply-To: <1342562735-55870-1-git-send-email-johnstul@us.ibm.com>
From: John Stultz <john.stultz@linaro.org>
This is a backport of fad0c66c4bb836d57a5f125ecd38bed653ca863a
which resolves a bug the previous commit.
Commit 6b43ae8a61 (ntp: Fix leap-second hrtimer livelock) broke the
leapsecond update of CLOCK_MONOTONIC. The missing leapsecond update to
wall_to_monotonic causes discontinuities in CLOCK_MONOTONIC.
Adjust wall_to_monotonic when NTP inserted a leapsecond.
Reported-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Richard Cochran <richardcochran@gmail.com>
Link: http://lkml.kernel.org/r/1338400497-12420-1-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
---
kernel/time/timekeeping.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 00e2fae..6d19a00 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -780,6 +780,7 @@ void update_wall_time(void)
xtime.tv_sec++;
leap = second_overflow(xtime.tv_sec);
xtime.tv_sec += leap;
+ wall_to_monotonic.tv_sec -= leap;
}
raw_time.tv_nsec += timekeeper.raw_interval;
--
1.7.9.5
next prev parent reply other threads:[~2012-07-17 22:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 22:05 [PATCH 00/11] 2.6.32-stable: Fix for leapsecond deadlock & hrtimer/futex issue John Stultz
2012-07-17 22:05 ` [PATCH 01/11] 2.6.32.x: ntp: Fix leap-second hrtimer livelock John Stultz
2012-07-17 22:05 ` [PATCH 02/11] 2.6.32.x: ntp: Correct TAI offset during leap second John Stultz
2012-07-17 22:05 ` John Stultz [this message]
2012-07-17 22:05 ` [PATCH 04/11] 2.6.32.x: time: Move common updates to a function John Stultz
2012-07-17 22:05 ` [PATCH 05/11] 2.6.32.x: hrtimer: Provide clock_was_set_delayed() John Stultz
2012-07-17 22:05 ` [PATCH 06/11] 2.6.32.x: timekeeping: Fix leapsecond triggered load spike issue John Stultz
2012-07-17 22:05 ` [PATCH 07/11] 2.6.32.x: timekeeping: Maintain ktime_t based offsets for hrtimers John Stultz
2012-07-17 22:05 ` [PATCH 08/11] 2.6.32.x: hrtimers: Move lock held region in hrtimer_interrupt() John Stultz
2012-07-17 22:05 ` [PATCH 09/11] 2.6.32.x: timekeeping: Provide hrtimer update function John Stultz
2012-07-17 22:05 ` [PATCH 10/11] 2.6.32.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt John Stultz
2012-07-17 22:05 ` [PATCH 11/11] 2.6.32.x: timekeeping: Add missing update call in timekeeping_resume() John Stultz
2012-07-18 0:34 ` [PATCH 00/11] 2.6.32-stable: Fix for leapsecond deadlock & hrtimer/futex issue John Stultz
2012-07-19 9:53 ` Willy Tarreau
2012-07-19 12:56 ` Willy Tarreau
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=1342562735-55870-4-git-send-email-johnstul@us.ibm.com \
--to=johnstul@us.ibm.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.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;
as well as URLs for NNTP newsgroup(s).