Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3ff9c36 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

timekeeping: Repair ktime_get_coarse*() granularity 



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: b9ff604c ("timekeeping: Add ktime_get_coarse_with_offset")
Reported-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJason 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
parent 6cb3dd75

kernel/time/timekeeping.c

+3 −2
Original line number Diff line number Diff line
@@ -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);