All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Stultz <johnstul@us.ibm.com>
To: stable@vger.kernel.org
Cc: John Stultz <johnstul@us.ibm.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Prarit Bhargava <prarit@redhat.com>,
	Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH 06/11] 2.6.35.x: timekeeping: Fix leapsecond triggered load spike issue
Date: Tue, 17 Jul 2012 14:05:37 -0400	[thread overview]
Message-ID: <1342548342-19683-7-git-send-email-johnstul@us.ibm.com> (raw)
In-Reply-To: <1342548342-19683-1-git-send-email-johnstul@us.ibm.com>

This is a backport of 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51

The timekeeping code misses an update of the hrtimer subsystem after a
leap second happened. Due to that timers based on CLOCK_REALTIME are
either expiring a second early or late depending on whether a leap
second has been inserted or deleted until an operation is initiated
which causes that update. Unless the update happens by some other
means this discrepancy between the timekeeping and the hrtimer data
stays forever and timers are expired either early or late.

The reported immediate workaround - $ data -s "`date`" - is causing a
call to clock_was_set() which updates the hrtimer data structures.
See: http://www.sheeri.com/content/mysql-and-leap-second-high-cpu-and-fix

Add the missing clock_was_set() call to update_wall_time() in case of
a leap second event. The actual update is deferred to softirq context
as the necessary smp function call cannot be invoked from hard
interrupt context.

Signed-off-by: John Stultz <johnstul@us.ibm.com>
Reported-by: Jan Engelhardt <jengelh@inai.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Prarit Bhargava <prarit@redhat.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1341960205-56738-3-git-send-email-johnstul@us.ibm.com
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 |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 5fbcb9a..eaf1e09 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -760,6 +760,8 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
 		leap = second_overflow(xtime.tv_sec);
 		xtime.tv_sec += leap;
 		wall_to_monotonic.tv_sec -= leap;
+		if (leap)
+			clock_was_set_delayed();
 	}
 
 	/* Accumulate raw time */
@@ -870,6 +872,8 @@ void update_wall_time(void)
 		leap = second_overflow(xtime.tv_sec);
 		xtime.tv_sec += leap;
 		wall_to_monotonic.tv_sec -= leap;
+		if (leap)
+			clock_was_set_delayed();
 	}
 
 	timekeeping_update(false);
-- 
1.7.9.5


  parent reply	other threads:[~2012-07-17 18:12 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-17 18:05 [PATCH 00/11] 2.6.35-stable: Fix for leapsecond deadlock & hrtimer/futex issue John Stultz
2012-07-17 18:05 ` [PATCH 01/11] 2.6.35.x: ntp: Fix leap-second hrtimer livelock John Stultz
2012-07-17 18:05 ` [PATCH 02/11] 2.6.35.x: ntp: Correct TAI offset during leap second John Stultz
2012-07-17 18:05 ` [PATCH 03/11] 2.6.35.x: timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond John Stultz
2012-07-17 18:05 ` [PATCH 04/11] 2.6.35.x: time: Move common updates to a function John Stultz
2012-07-17 18:05 ` [PATCH 05/11] 2.6.35.x: hrtimer: Provide clock_was_set_delayed() John Stultz
2012-07-17 18:05 ` John Stultz [this message]
2012-07-17 18:05 ` [PATCH 07/11] 2.6.35.x: timekeeping: Maintain ktime_t based offsets for hrtimers John Stultz
2012-07-17 18:05 ` [PATCH 08/11] 2.6.35.x: hrtimers: Move lock held region in hrtimer_interrupt() John Stultz
2012-07-17 18:05 ` [PATCH 09/11] 2.6.35.x: timekeeping: Provide hrtimer update function John Stultz
2012-07-17 18:05 ` [PATCH 10/11] 2.6.35.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt John Stultz
2012-07-17 18:05 ` [PATCH 11/11] 2.6.35.x: timekeeping: Add missing update call in timekeeping_resume() 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=1342548342-19683-7-git-send-email-johnstul@us.ibm.com \
    --to=johnstul@us.ibm.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.