posix-cpu-timers: Make k_itimer::it_active consistent

Posix CPU timers are not updating k_itimer::it_active which makes it
impossible to base decisions in the common posix timer code on it.

Update it when queueing or dequeueing posix CPU timers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 43cf3f63f31b166582399b8ac509e168952f6529..bcc2b83e6666f2c41180be7e386bd01a738e9401 100644 (file)
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -453,6 +453,7 @@ static void disarm_timer(struct k_itimer *timer, struct task_struct *p)
        struct cpu_timer *ctmr = &timer->it.cpu;
        struct posix_cputimer_base *base;
 
+       timer->it_active = 0;
        if (!cpu_timer_dequeue(ctmr))
                return;
 
@@ -559,6 +560,7 @@ static void arm_timer(struct k_itimer *timer, struct task_struct *p)
        struct cpu_timer *ctmr = &timer->it.cpu;
        u64 newexp = cpu_timer_getexpires(ctmr);
 
+       timer->it_active = 1;
        if (!cpu_timer_enqueue(&base->tqhead, ctmr))
                return;
 
@@ -584,6 +586,7 @@ static void cpu_timer_fire(struct k_itimer *timer)
 {
        struct cpu_timer *ctmr = &timer->it.cpu;
 
+       timer->it_active = 0;
        if (unlikely(timer->sigq == NULL)) {
                /*
                 * This a special case for clock_nanosleep,
@@ -668,6 +671,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
                ret = TIMER_RETRY;
        } else {
                cpu_timer_dequeue(ctmr);
+               timer->it_active = 0;
        }
 
        /*