[tip: timers/core] timers/itimer: Preserve nonzero remaining time for active timers

From: tip-bot2 for Avi Weiss

Date: Mon Nov 09 2026 - 14:58:34 EST


The following commit has been merged into the timers/core branch of tip:

Commit-ID: 043c11572276048d458bee94773432241d4bdd3c
Gitweb: https://git.kernel.org/tip/043c11572276048d458bee94773432241d4bdd3c
Author: Avi Weiss <thnkslprpt@xxxxxxxxx>
AuthorDate: Mon, 02 Nov 2026 09:01:49 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxx>
CommitterDate: Mon, 09 Nov 2026 20:50:03 +01:00

timers/itimer: Preserve nonzero remaining time for active timers

itimer_get_remtime() preserves positive remainders below one
microsecond, but struct timeval only stores whole microseconds.
So, for example, the conversion to tv_usec truncates a 500 ns
remainder to zero, causing getitimer(ITIMER_REAL) to report an
active timer as disarmed.

Clamp active remainders below one microsecond to one microsecond
so they remain nonzero after conversion.

Fixes: 2ff678b8da64 ("[PATCH] hrtimer: switch itimers to hrtimer")
Signed-off-by: Avi Weiss <thnkslprpt@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Link: https://patch.msgid.link/20261102070148.1064849-2-thnkslprpt@xxxxxxxxx
---
kernel/time/itimer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index f7de397..38ffbc5 100644
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -36,7 +36,7 @@ static struct timespec64 itimer_get_remtime(struct hrtimer *timer)
* then we return 0 - which is correct.
*/
if (hrtimer_active(timer)) {
- if (rem <= 0)
+ if (rem < NSEC_PER_USEC)
rem = NSEC_PER_USEC;
} else
rem = 0;