dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

posix-cpu-timers: Handle interval timers correctly in timer_get()

Browse Source 
timer_gettime() must return the remaining time to the next expiry of a
timer or 0 if the timer is not armed and no signal pending, but posix CPU
timers fail to forward a timer which is already expired.

Add the required logic to address that.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
This commit is contained in:
Thomas Gleixner
2024-07-29 21:57:34 +02:00
committed by Frederic Weisbecker
parent b3e866b2df
commit 1c50284257
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/time/posix-cpu-timers.c
+17 -1
View File
@@ -787,8 +787,24 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
static void __posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp, u64 now)
{
u64 expires = cpu_timer_getexpires(&timer->it.cpu);
u64 expires, iv = timer->it_interval;
/*
* Make sure that interval timers are moved forward for the
* following cases:
* - Timers which expired, but the signal has not yet been
* delivered
*/
if (iv && (timer->it_requeue_pending & REQUEUE_PENDING))
expires = bump_cpu_timer(timer, now);
else
expires = cpu_timer_getexpires(&timer->it.cpu);
/*
* Expired interval timers cannot have a remaining time <= 0.
* The kernel has to move them forward so that the next
* timer expiry is > @now.
*/
if (now < expires) {
itp->it_value = ns_to_timespec64(expires - now);
} else {