Attachment 603550 Details for Bug 836803 – RHEL PATCH 2/7

[patch] RHEL PATCH 2/7

0002-timekeeping-Fix-leapsecond-triggered-load-spike-issu.patch (text/plain), 2.56 KB, created by Prarit Bhargava on 2012-08-10 13:56:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2012-08-10 13:56:54 UTC

Size: 2.56 KB

patch

obsolete

>From 24b89ed38e829e8aad5637c278268e5550534903 Mon Sep 17 00:00:00 2001
>From: Prarit Bhargava <prarit@redhat.com>
>Date: Tue, 24 Jul 2012 10:23:22 -0400
>Subject: timekeeping: Fix leapsecond triggered load spike issue
>
>commit 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51
>Author: John Stultz <johnstul@us.ibm.com>
>Date:   Tue Jul 10 18:43:20 2012 -0400
>
>    timekeeping: Fix leapsecond triggered load spike issue
>
>    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>
>---
> kernel/time/timekeeping.c |    4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
>index ae372f1..2e7e692 100644
>--- a/kernel/time/timekeeping.c
>+++ b/kernel/time/timekeeping.c
>@@ -930,6 +930,8 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
> 		leap = second_overflow(timekeeper.xtime.tv_sec);
> 		timekeeper.xtime.tv_sec += leap;
> 		timekeeper.wall_to_monotonic.tv_sec -= leap;
>+		if (leap)
>+			clock_was_set_delayed();
> 	}
> 
> 	/* Accumulate raw time */
>@@ -1045,6 +1047,8 @@ static void update_wall_time(void)
> 		leap = second_overflow(timekeeper.xtime.tv_sec);
> 		timekeeper.xtime.tv_sec += leap;
> 		timekeeper.wall_to_monotonic.tv_sec -= leap;
>+		if (leap)
>+			clock_was_set_delayed();
> 	}
> 
> 	timekeeping_update(false);
>-- 
>1.7.9.3
>

Actions: View | Diff

Attachments on bug 836803: 597663 | 603549 | 603550 | 603551 | 603552 | 603553 | 603554 | 603555