]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
timekeeping: Repair ktime_get_coarse*() granularity
authorThomas Gleixner <tglx@linutronix.de>
Thu, 13 Jun 2019 19:40:45 +0000 (21:40 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 14 Jun 2019 09:51:44 +0000 (11:51 +0200)
Jason reported that the coarse ktime based time getters advance only once
per second and not once per tick as advertised.

The code reads only the monotonic base time, which advances once per
second. The nanoseconds are accumulated on every tick in xtime_nsec up to
a second and the regular time getters take this nanoseconds offset into
account, but the ktime_get_coarse*() implementation fails to do so.

Add the accumulated xtime_nsec value to the monotonic base time to get the
proper per tick advancing coarse tinme.

Fixes: b9ff604cff11 ("timekeeping: Add ktime_get_coarse_with_offset")
Reported-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Sultan Alsawaf <sultan@kerneltoast.com>
Cc: Waiman Long <longman@redhat.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1906132136280.1791@nanos.tec.linutronix.de
kernel/time/timekeeping.c

index 85f5912d8f704e42ced9f2c0c889a0855671df38..44b726bab4bd973d8d77d25a6bba354427be18ad 100644 (file)
@@ -808,17 +808,18 @@ ktime_t ktime_get_coarse_with_offset(enum tk_offsets offs)
        struct timekeeper *tk = &tk_core.timekeeper;
        unsigned int seq;
        ktime_t base, *offset = offsets[offs];
+       u64 nsecs;
 
        WARN_ON(timekeeping_suspended);
 
        do {
                seq = read_seqcount_begin(&tk_core.seq);
                base = ktime_add(tk->tkr_mono.base, *offset);
+               nsecs = tk->tkr_mono.xtime_nsec >> tk->tkr_mono.shift;
 
        } while (read_seqcount_retry(&tk_core.seq, seq));
 
-       return base;
-
+       return base + nsecs;
 }
 EXPORT_SYMBOL_GPL(ktime_get_coarse_with_offset);