diff options
| author | Peter Hilber <peter.hilber@opensynergy.com> | 2023-12-18 08:38:39 +0100 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-26 18:19:19 -0400 |
| commit | c56317c7ed4655f462d4af09e40e56e5b7a5329e (patch) | |
| tree | 6d89599f455d319a4dc8fd8ced4a31fa76314a9a /kernel/time | |
| parent | 835ae8a07a2a3da13ca3c60a5c873fac0362e89e (diff) | |
| download | linux-c56317c7ed4655f462d4af09e40e56e5b7a5329e.tar.gz linux-c56317c7ed4655f462d4af09e40e56e5b7a5329e.tar.bz2 linux-c56317c7ed4655f462d4af09e40e56e5b7a5329e.zip | |
timekeeping: Fix cross-timestamp interpolation on counter wrap
[ Upstream commit 84dccadd3e2a3f1a373826ad71e5ced5e76b0c00 ]
cycle_between() decides whether get_device_system_crosststamp() will
interpolate for older counter readings.
cycle_between() yields wrong results for a counter wrap-around where after
< before < test, and for the case after < test < before.
Fix the comparison logic.
Fixes: 2c756feb18d9 ("time: Add history to cross timestamp interface supporting slower devices")
Signed-off-by: Peter Hilber <peter.hilber@opensynergy.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <jstultz@google.com>
Link: https://lore.kernel.org/r/20231218073849.35294-2-peter.hilber@opensynergy.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 266d02809dbb..8f35455b6250 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1186,7 +1186,7 @@ static bool cycle_between(u64 before, u64 test, u64 after) { if (test > before && test < after) return true; - if (test < before && before > after) + if (before > after && (test > before || test < after)) return true; return false; } |