]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Fix leapsecond triggered hrtimer/futex load spike issue
authorJohn Stultz <john.stultz@linaro.org>
Mon, 2 Jul 2012 00:00:54 +0000 (20:00 -0400)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Thu, 5 Jul 2012 10:02:04 +0000 (03:02 -0700)
Backport for 3.0.36

As widely reported on the internet, some Linux systems after
the leapsecond was inserted are experiencing futex related load
spikes (usually connected to MySQL, Firefox, Thunderbird, Java, etc).

An apparent  workaround for this issue is running:
$ date -s "`date`"

Credit: http://www.sheeri.com/content/mysql-and-leap-second-high-cpu-and-fix

I believe this issue is due to the leapsecond being added without
calling clock_was_set() to notify the hrtimer subsystem of the
change. (Although I've not yet chased all the way down to the
hrtimer code to validate exactly what's going on there).

The workaround functions as it forces a clock_was_set()
call from settimeofday().

This fix adds the required clock_was_set() calls to where
we adjust for leapseconds.

NOTE: This fix *depends* on the previous fix, which allows
clock_was_set to be called from atomic context. Do not try
to apply just this patch.

CC: Prarit Bhargava <prarit@redhat.com>
CC: stable@vger.kernel.org
CC: Thomas Gleixner <tglx@linutronix.de>
Reported-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
kernel/time/timekeeping.c

index 5f458310668a5ac02e5475bdcb383d0947bc878d..0c433a0b331c60b582d14bf800d04b4031b30ba0 100644 (file)
@@ -176,6 +176,7 @@ void timekeeping_leap_insert(int leapsecond)
        wall_to_monotonic.tv_sec -= leapsecond;
        update_vsyscall(&xtime, &wall_to_monotonic, timekeeper.clock,
                        timekeeper.mult);
+       clock_was_set();
 }
 
 /**