]> git.karo-electronics.de Git - karo-tx-linux.git/commit
clocksource: Avoid selecting mult values that might overflow when adjusted
authorJohn Stultz <john.stultz@linaro.org>
Mon, 31 Oct 2011 21:06:35 +0000 (17:06 -0400)
committerJohn Stultz <john.stultz@linaro.org>
Thu, 10 Nov 2011 19:27:08 +0000 (11:27 -0800)
commitd65670a78cdbfae94f20a9e05ec705871d7cdf2b
tree3c16dedb75fa5ab6c0fdc072cc8d73df01d43a17
parente35f95b36e43f67a6f806172555a152c11ea0a78
clocksource: Avoid selecting mult values that might overflow when adjusted

For some frequencies, the clocks_calc_mult_shift() function will
unfortunately select mult values very close to 0xffffffff.  This
has the potential to overflow when NTP adjusts the clock, adding
to the mult value.

This patch adds a clocksource.maxadj value, which provides
an approximation of an 11% adjustment(NTP limits adjustments to
500ppm and the tick adjustment is limited to 10%), which could
be made to the clocksource.mult value. This is then used to both
check that the current mult value won't overflow/underflow, as
well as warning us if the timekeeping_adjust() code pushes over
that 11% boundary.

v2: Fix max_adjustment calculation, and improve WARN_ONCE
messages.

v3: Don't warn before maxadj has actually been set

CC: Yong Zhang <yong.zhang0@gmail.com>
CC: David Daney <ddaney.cavm@gmail.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Chen Jie <chenj@lemote.com>
CC: zhangfx <zhangfx@lemote.com>
CC: stable@kernel.org
Reported-by: Chen Jie <chenj@lemote.com>
Reported-by: zhangfx <zhangfx@lemote.com>
Tested-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
include/linux/clocksource.h
kernel/time/clocksource.c
kernel/time/timekeeping.c