Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

timekeeping: Fix overflow in rawtime tv_nsec on 32 bit archs

The tv_nsec is a long and when added to the shifted interval 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: 3d0913 tv_nsec d687faa
43.718513: logarithmic_accumulation: raw: 3d0913 tv_nsec da588bd
43.722161: logarithmic_accumulation: raw: 3d0913 tv_nsec de291d0
46.349925: logarithmic_accumulation: raw: 7a122600 tv_nsec e1f9ae3
46.349930: logarithmic_accumulation: raw: 1e848980 tv_nsec 8831c0e3

The kernel starts looping at 46.349925 in the getrawmonotonic() due to
the negative value from adding the raw value to tv_nsec.

A simple solution is to accumulate into a u64, and then normalize it
to a timespec_t.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
[ Reworked variable names and simplified some of the code. - John ]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Jason Wessel and committed by
Linus Torvalds
deda2e81 95f45727

+7 -4
+7 -4
kernel/time/timekeeping.c
··· 690 690 static cycle_t logarithmic_accumulation(cycle_t offset, int shift) 691 691 { 692 692 u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift; 693 + u64 raw_nsecs; 693 694 694 695 /* If the offset is smaller then a shifted interval, do nothing */ 695 696 if (offset < timekeeper.cycle_interval<<shift) ··· 707 706 second_overflow(); 708 707 } 709 708 710 - /* Accumulate into raw time */ 711 - raw_time.tv_nsec += timekeeper.raw_interval << shift;; 712 - while (raw_time.tv_nsec >= NSEC_PER_SEC) { 713 - raw_time.tv_nsec -= NSEC_PER_SEC; 709 + /* Accumulate raw time */ 710 + raw_nsecs = timekeeper.raw_interval << shift; 711 + raw_nsecs += raw_time.tv_nsec; 712 + while (raw_nsecs >= NSEC_PER_SEC) { 713 + raw_nsecs -= NSEC_PER_SEC; 714 714 raw_time.tv_sec++; 715 715 } 716 + raw_time.tv_nsec = raw_nsecs; 716 717 717 718 /* Accumulate error between NTP and clock interval */ 718 719 timekeeper.ntp_error += tick_length << shift;