The following commit has been merged into the timers/core branch of tip:
Commit-ID: b3e866b2dffbc36b31be7811ebded91ce82ecd10
Gitweb: https://git.kernel.org/tip/b3e866b2dffbc36b31be7811ebded91ce82ecd10
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Mon, 10 Jun 2024 18:42:15 +02:00
Committer: Frederic Weisbecker <frederic@xxxxxxxxxx>
CommitterDate: Mon, 29 Jul 2024 21:57:34 +02:00
posix-cpu-timers: Save interval only for armed timers
There is no point to return the interval for timers which have been
disarmed.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <frederic@xxxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
---
kernel/time/posix-cpu-timers.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 558be8d..5aac088 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -809,17 +809,15 @@ static void posix_cpu_timer_get(struct k_itimer *timer, struct itimerspec64 *itp
rcu_read_lock();
p = cpu_timer_task_rcu(timer);
- if (p) {
+ if (p && cpu_timer_getexpires(&timer->it.cpu)) {
itp->it_interval = ktime_to_timespec64(timer->it_interval);
- if (cpu_timer_getexpires(&timer->it.cpu)) {
- if (CPUCLOCK_PERTHREAD(timer->it_clock))
- now = cpu_clock_sample(clkid, p);
- else
- now = cpu_clock_sample_group(clkid, p, false);
+ if (CPUCLOCK_PERTHREAD(timer->it_clock))
+ now = cpu_clock_sample(clkid, p);
+ else
+ now = cpu_clock_sample_group(clkid, p, false);
- __posix_cpu_timer_get(timer, itp, now);
- }
+ __posix_cpu_timer_get(timer, itp, now);
}
rcu_read_unlock();
}
|