3.2-stable timekeeping fixes merged in 3.6
cover 3.2-stable timekeeping fixes merged in 3.6
Just wanted to send out a few timekeeping fixes that were merged in 3.6 which are appropriate for -stable.
This queue backports the following fixes:
-----------------------------------------
cee58483cf56e0ba355fdd97ff5e8925329aa936 time: Move ktime_t overflow checking into timespec_valid_strict bf2ac312195155511a0f79325515cbb61929898a time: Avoid making adjustments if we haven't accumulated anything 4e8b14526ca7fb046a81c94002c1c43b6fdf0e9b time: Improve sanity checking of timekeeping inputs
I've run these through my timetest suite w/ kvm on both i386 & x86_64. But more testing would be of course appreciated.
https://github.com/johnstultz-work/timetests
This is the last of what I've backported.
John Stultz (3):
2.6.32.y: time: Improve sanity checking of timekeeping inputs 2.6.32.y: time: Avoid making adjustments if we haven't accumulated
anything
2.6.32.y: time: Move ktime_t overflow checking into
timespec_valid_strict
include/linux/ktime.h | 7 ------- include/linux/time.h | 29 +++++++++++++++++++++++++++-- kernel/time/timekeeping.c | 19 ++++++++++++++++++- 3 files changed, 45 insertions(+), 10 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 2.6.32.y: time: Improve sanity checking of timekeeping inputs
This is a -stable backport of 4e8b14526ca7fb046a81c94002c1c43b6fdf0e9b
Unexpected behavior could occur if the time is set to a value large enough to overflow a 64bit ktime_t (which is something larger then the year 2262).
Also unexpected behavior could occur if large negative offsets are injected via adjtimex.
So this patch improves the sanity check timekeeping inputs by improving the timespec_valid() check, and then makes better use of timespec_valid() to make sure we don't set the time to an invalid negative value or one that overflows ktime_t.
Note: This does not protect from setting the time close to overflowing ktime_t and then letting natural accumulation cause the overflow.
--- include/linux/ktime.h | 7 ------- include/linux/time.h | 22 ++++++++++++++++++++-- kernel/time/timekeeping.c | 15 ++++++++++++++- 3 files changed, 34 insertions(+), 10 deletions(-)
include/linux/ktime.h +0 -7
@@ -58,13 +58,6 @@ union ktime {typedef union ktime ktime_t ;/* Kill this */ -#define KTIME_MAX ((s64)~((u64)1 << 63)) -#if (BITS_PER_LONG ==64 ) -# define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) -#else -# define KTIME_SEC_MAX LONG_MAX -#endif -/* * ktime_t definitions when using the 64-bit scalar representation: */
include/linux/time.h +20 -2
@@ -91,11 +91,29 @@ static inline struct timespec timespec_sub(struct timespec lhs,return ts_delta; } +#define KTIME_MAX ((s64)~((u64)1 << 63)) +#if (BITS_PER_LONG ==64 ) +# define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) +#else +# define KTIME_SEC_MAX LONG_MAX +#endif +/* * Returns true if the timespec is norm, false if denorm: */ -#define timespec_valid (ts) \ - (((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC)) +static inline bool timespec_valid (const struct timespec *ts) +{ +/* Dates before 1970 are bogus */ +if (ts->tv_sec <0 ) +return false; +/* Can't have more nanoseconds then a second */ +if ((unsigned long )ts->tv_nsec >=NSEC_PER_SEC ) +return false; +/* Disallow values that could overflow ktime_t */ +if ((unsigned long long )ts->tv_sec >=KTIME_SEC_MAX ) +return false; +return true; +}extern struct timespec xtime;extern struct timespec wall_to_monotonic;
kernel/time/timekeeping.c +14 -1
@@ -354,7 +354,7 @@ int do_settimeofday(struct timespec *tv)struct timespec ts_delta;unsigned long flags; -if ((unsigned long )tv->tv_nsec >=NSEC_PER_SEC ) +if (!timespec_valid (tv))return -EINVAL ;write_seqlock_irqsave (&xtime_lock, flags);
@@ -570,7 +570,20 @@ void __init timekeeping_init(void)struct timespec now, boot;read_persistent_clock (&now); +if (!timespec_valid (&now)) { +printk ("WARNING: Persistent clock returned invalid value!\n" +" Check your CMOS/BIOS settings.\n" ); + now.tv_sec =0 ; + now.tv_nsec =0 ; + } +read_boot_clock (&boot); +if (!timespec_valid (&boot)) { +printk ("WARNING: Boot clock returned invalid value!\n" +" Check your CMOS/BIOS settings.\n" ); + boot.tv_sec =0 ; + boot.tv_nsec =0 ; + }write_seqlock_irqsave (&xtime_lock, flags);
Signature · 1 line
1.7.9.5
PATCH 2/3 2.6.32.y: time: Avoid making adjustments if we haven't accumulated anything
In reply to John StultzThis is a -stable backport of bf2ac312195155511a0f79325515cbb61929898a
If update_wall_time() is called and the current offset isn't large enough to accumulate, avoid re-calling timekeeping_adjust which may change the clock freq and can cause 1ns inconsistencies with CLOCK_REALTIME_COARSE/CLOCK_MONOTONIC_COARSE.
--- kernel/time/timekeeping.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/time/timekeeping.c +4 -0
@@ -807,6 +807,10 @@ void update_wall_time(void)#else offset = timekeeper.cycle_interval;#endif +/* Check if there's really nothing to do */ +if (offset < timekeeper.cycle_interval) +return ; + timekeeper.xtime_nsec = (s64 )xtime.tv_nsec << timekeeper.shift;/* normally this loop will run just once, however in the
Signature · 1 line
1.7.9.5
PATCH 3/3 2.6.32.y: time: Move ktime_t overflow checking into timespec_valid_strict
In reply to John StultzThis is a -stable backport of cee58483cf56e0ba355fdd97ff5e8925329aa936
Andreas Bombe reported that the added ktime_t overflow checking added to timespec_valid in commit 4e8b14526ca7 ("time: Improve sanity checking of timekeeping inputs") was causing problems with X.org because it caused timeouts larger then KTIME_T to be invalid.
Previously, these large timeouts would be clamped to KTIME_MAX and would never expire, which is valid.
This patch splits the ktime_t overflow checking into a new timespec_valid_strict function, and converts the timekeeping codes internal checking to use this more strict function.
--- include/linux/time.h | 7 +++++++ kernel/time/timekeeping.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-)
include/linux/time.h +7 -0
@@ -109,6 +109,13 @@ static inline bool timespec_valid(const struct timespec *ts)/* Can't have more nanoseconds then a second */ if ((unsigned long )ts->tv_nsec >=NSEC_PER_SEC )return false; +return true; +} + +static inline bool timespec_valid_strict (const struct timespec *ts) +{ +if (!timespec_valid (ts)) +return false;/* Disallow values that could overflow ktime_t */ if ((unsigned long long )ts->tv_sec >=KTIME_SEC_MAX )return false;
kernel/time/timekeeping.c +3 -3
@@ -354,7 +354,7 @@ int do_settimeofday(struct timespec *tv)struct timespec ts_delta;unsigned long flags; -if (!timespec_valid (tv)) +if (!timespec_valid_strict (tv))return -EINVAL ;write_seqlock_irqsave (&xtime_lock, flags);
@@ -570,7 +570,7 @@ void __init timekeeping_init(void)struct timespec now, boot;read_persistent_clock (&now); -if (!timespec_valid (&now)) { +if (!timespec_valid_strict (&now)) {printk ("WARNING: Persistent clock returned invalid value!\n" " Check your CMOS/BIOS settings.\n" ); now.tv_sec =0 ;
@@ -578,7 +578,7 @@ void __init timekeeping_init(void) }read_boot_clock (&boot); -if (!timespec_valid (&boot)) { +if (!timespec_valid_strict (&boot)) {printk ("WARNING: Boot clock returned invalid value!\n" " Check your CMOS/BIOS settings.\n" ); boot.tv_sec =0 ;
Signature · 1 line
1.7.9.5
Quoted 3 lines · John Stultz
Just wanted to send out a few timekeeping fixes that were merged in 3.6 which are appropriate for -stable.
And I did it again.
The subject of this should have been:
"2.6.32-stable timekeeping fixes merged in 3.6"
Apologies for any confusion.
thanks
-john
Hi John,
Quoted 2 lines · John Stultz
Just wanted to send out a few timekeeping fixes that were merged in 3.6 which are appropriate for -stable.
Thank you very much, I'm adding them to your last ones. I have not released the version yet but they're not lost. I will then release all of them at once.
Best regards,
Willy