posix-cpu-timers: Consolidate timer base accessor

Remove the ad-hoc timer base accessors and provide a consolidated one.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210726125513.271824-6-frederic@kernel.org

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 4fbbbc89ac4a4180d1fcfa2dc231ceeb912e4a4c..0d918117a3e0d89e9aa050c35135f4e656a441ae 100644 (file)
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -407,6 +407,17 @@ static int posix_cpu_timer_create(struct k_itimer *new_timer)
        return 0;
 }
 
+static struct posix_cputimer_base *timer_base(struct k_itimer *timer,
+                                             struct task_struct *tsk)
+{
+       int clkidx = CPUCLOCK_WHICH(timer->it_clock);
+
+       if (CPUCLOCK_PERTHREAD(timer->it_clock))
+               return tsk->posix_cputimers.bases + clkidx;
+       else
+               return tsk->signal->posix_cputimers.bases + clkidx;
+}
+
 /*
  * Dequeue the timer and reset the base if it was its earliest expiration.
  * It makes sure the next tick recalculates the base next expiration so we
@@ -421,18 +432,11 @@ static void disarm_timer(struct k_itimer *timer, struct task_struct *p)
 {
        struct cpu_timer *ctmr = &timer->it.cpu;
        struct posix_cputimer_base *base;
-       int clkidx;
 
        if (!cpu_timer_dequeue(ctmr))
                return;
 
-       clkidx = CPUCLOCK_WHICH(timer->it_clock);
-
-       if (CPUCLOCK_PERTHREAD(timer->it_clock))
-               base = p->posix_cputimers.bases + clkidx;
-       else
-               base = p->signal->posix_cputimers.bases + clkidx;
-
+       base = timer_base(timer, p);
        if (cpu_timer_getexpires(ctmr) == base->nextevt)
                base->nextevt = 0;
 }
@@ -531,15 +535,9 @@ void posix_cpu_timers_exit_group(struct task_struct *tsk)
  */
 static void arm_timer(struct k_itimer *timer, struct task_struct *p)
 {
-       int clkidx = CPUCLOCK_WHICH(timer->it_clock);
+       struct posix_cputimer_base *base = timer_base(timer, p);
        struct cpu_timer *ctmr = &timer->it.cpu;
        u64 newexp = cpu_timer_getexpires(ctmr);
-       struct posix_cputimer_base *base;
-
-       if (CPUCLOCK_PERTHREAD(timer->it_clock))
-               base = p->posix_cputimers.bases + clkidx;
-       else
-               base = p->signal->posix_cputimers.bases + clkidx;
 
        if (!cpu_timer_enqueue(&base->tqhead, ctmr))
                return;