[PATCH] timekeeping: Fix overflow in rawtime tv_nsec on 32 bit archs
in [Kernel]
|
Prev: [PATCHv2] fixed resource leak in scripts/mod/modpost.c
Next: [PATCH 5/5] U6715 16550A serial driver support
From: Jason Wessel on 5 Aug 2010 08:30 The tv_nsec is a long and when added to the shift value it can wrap and become negative which later causes looping problems in the getrawmonotonic(). The edge case occurs when the system has slept for a short period of time of ~2 seconds. A trace printk of the values in this patch illustrate the problem: ftrace time stamp: log 43.716079: logarithmic_accumulation: raw_shift: 3d0913 tv_nsec d687faa 43.718513: logarithmic_accumulation: raw_shift: 3d0913 tv_nsec da588bd 43.722161: logarithmic_accumulation: raw_shift: 3d0913 tv_nsec de291d0 46.349925: logarithmic_accumulation: raw_shift: 7a122600 tv_nsec e1f9ae3 46.349930: logarithmic_accumulation: raw_shift: 1e848980 tv_nsec 8831c0e3 The kernel starts looping at 46.349925 in the getrawmonotonic() due to the negative value from adding the raw_shift to tv_nsec. A simple solution is to process the raw_shift separately from the tv_nsec using the same type of loop in logarithmic_accumulation(). Signed-off-by: Jason Wessel <jason.wessel(a)windriver.com> CC: John Stultz <johnstul(a)us.ibm.com> CC: Thomas Gleixner <tglx(a)linutronix.de> CC: H. Peter Anvin <hpa(a)zytor.com> --- kernel/time/timekeeping.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index caf8d4d..1762282 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -736,6 +736,7 @@ static void timekeeping_adjust(s64 offset) static cycle_t logarithmic_accumulation(cycle_t offset, int shift) { u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift; + u64 raw_shift; /* If the offset is smaller then a shifted interval, do nothing */ if (offset < timekeeper.cycle_interval<<shift) @@ -753,7 +754,12 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) } /* Accumulate into raw time */ - raw_time.tv_nsec += timekeeper.raw_interval << shift;; + raw_shift = timekeeper.raw_interval << shift; + while (raw_shift >= NSEC_PER_SEC) { + raw_shift -= NSEC_PER_SEC; + raw_time.tv_sec++; + } + raw_time.tv_nsec += raw_shift; while (raw_time.tv_nsec >= NSEC_PER_SEC) { raw_time.tv_nsec -= NSEC_PER_SEC; raw_time.tv_sec++; -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |