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:22:34 -0400 |
| commit | 3c22ef22761ab15b1c32ea5997859c0719fdc14d (patch) | |
| tree | c29fc4b0aa0c5142098c1838fec7c0a6a8d49c30 /kernel/time | |
| parent | ad80c34944d7175fa1f5c7a55066020002921a99 (diff) | |
| download | linux-stable-3c22ef22761ab15b1c32ea5997859c0719fdc14d.tar.gz linux-stable-3c22ef22761ab15b1c32ea5997859c0719fdc14d.tar.bz2 linux-stable-3c22ef22761ab15b1c32ea5997859c0719fdc14d.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 087f71183c3f..7a306bad183b 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1097,7 +1097,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; } |