From: John Stultz Date: Mon, 2 Jul 2012 00:00:54 +0000 (-0400) Subject: Fix leapsecond triggered hrtimer/futex load spike issue X-Git-Tag: v2.6.39-400.9.0~499^2~12 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=05b3801d5d008ec51a9b9afad9856ce15ee02265;p=users%2Fjedix%2Flinux-maple.git Fix leapsecond triggered hrtimer/futex load spike issue 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 CC: stable@vger.kernel.org CC: Thomas Gleixner Reported-by: Jan Engelhardt Signed-off-by: John Stultz --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 5f458310668a..0c433a0b331c 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -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(); } /**