posix-timers: Make lock_timer() use guard()

The lookup and locking of posix timers requires the same repeating pattern
at all usage sites:

   tmr = lock_timer(tiner_id);
   if (!tmr)
   	return -EINVAL;
   ....
   unlock_timer(tmr);

Solve this with a guard implementation, which works in most places out of
the box except for those, which need to unlock the timer inside the guard
scope.

Though the only places where this matters are timer_delete() and
timer_settime(). In both cases the timer pointer needs to be preserved
across the end of the scope, which is solved by storing the pointer in a
variable outside of the scope.

timer_settime() also has to protect the timer with RCU before unlocking,
which obviously can't use guard(rcu) before leaving the guard scope as that
guard is cleaned up before the unlock. Solve this by providing the RCU
protection open coded.

[ tglx: Made it work and added change log ]

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20250224162103.GD11590@noisy.programming.kicks-ass.net
Link: https://lore.kernel.org/all/20250308155624.087465658@linutronix.de

diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h
index ec00e3f7af2b3472f8c43c651402f3477fbb329c..a176abfccba88a5362bebf2496782c3fc7fb8df9 100644 (file)
--- a/include/linux/cleanup.h
+++ b/include/linux/cleanup.h
@@ -291,11 +291,21 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \
 #define __DEFINE_CLASS_IS_CONDITIONAL(_name, _is_cond) \
 static __maybe_unused const bool class_##_name##_is_conditional = _is_cond
 
-#define DEFINE_GUARD(_name, _type, _lock, _unlock) \
+#define __DEFINE_GUARD_LOCK_PTR(_name, _exp) \
+       static inline void * class_##_name##_lock_ptr(class_##_name##_t *_T) \
+       { return (void *)(__force unsigned long)*(_exp); }
+
+#define DEFINE_CLASS_IS_GUARD(_name) \
        __DEFINE_CLASS_IS_CONDITIONAL(_name, false); \
+       __DEFINE_GUARD_LOCK_PTR(_name, _T)
+
+#define DEFINE_CLASS_IS_COND_GUARD(_name) \
+       __DEFINE_CLASS_IS_CONDITIONAL(_name, true); \
+       __DEFINE_GUARD_LOCK_PTR(_name, _T)
+
+#define DEFINE_GUARD(_name, _type, _lock, _unlock) \
        DEFINE_CLASS(_name, _type, if (_T) { _unlock; }, ({ _lock; _T; }), _type _T); \
-       static inline void * class_##_name##_lock_ptr(class_##_name##_t *_T) \
-       { return (void *)(__force unsigned long)*_T; }
+       DEFINE_CLASS_IS_GUARD(_name)
 
 #define DEFINE_GUARD_COND(_name, _ext, _condlock) \
        __DEFINE_CLASS_IS_CONDITIONAL(_name##_ext, true); \
@@ -375,11 +385,7 @@ static inline void class_##_name##_destructor(class_##_name##_t *_T)       \
        if (_T->lock) { _unlock; }                                      \
 }                                                                      \
                                                                        \
-static inline void *class_##_name##_lock_ptr(class_##_name##_t *_T)    \
-{                                                                      \
-       return (void *)(__force unsigned long)_T->lock;                 \
-}
-
+__DEFINE_GUARD_LOCK_PTR(_name, &_T->lock)
 
 #define __DEFINE_LOCK_GUARD_1(_name, _type, _lock)                     \
 static inline class_##_name##_t class_##_name##_constructor(_type *l)  \

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index dff414bde48cc925e4f6985ecfedaf5dfd150e05..991d12abae45d2a9d0329f25033ab7846520e0b6 100644 (file)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -63,9 +63,18 @@ static struct k_itimer *__lock_timer(timer_t timer_id);
 
 static inline void unlock_timer(struct k_itimer *timr)
 {
-       spin_unlock_irq(&timr->it_lock);
+       if (likely((timr)))
+               spin_unlock_irq(&timr->it_lock);
 }
 
+#define scoped_timer_get_or_fail(_id)                                  \
+       scoped_cond_guard(lock_timer, return -EINVAL, _id)
+
+#define scoped_timer                           (scope)
+
+DEFINE_CLASS(lock_timer, struct k_itimer *, unlock_timer(_T), __lock_timer(id), timer_t id);
+DEFINE_CLASS_IS_COND_GUARD(lock_timer);
+
 static int hash(struct signal_struct *sig, unsigned int nr)
 {
        return hash_32(hash32_ptr(sig) ^ nr, HASH_BITS(posix_timers_hashtable));
@@ -682,18 +691,10 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)
 
 static int do_timer_gettime(timer_t timer_id,  struct itimerspec64 *setting)
 {
-       struct k_itimer *timr;
-       int ret = 0;
-
-       timr = lock_timer(timer_id);
-       if (!timr)
-               return -EINVAL;
-
        memset(setting, 0, sizeof(*setting));
-       timr->kclock->timer_get(timr, setting);
-
-       unlock_timer(timr);
-       return ret;
+       scoped_timer_get_or_fail(timer_id)
+               scoped_timer->kclock->timer_get(scoped_timer, setting);
+       return 0;
 }
 
 /* Get the time remaining on a POSIX.1b interval timer. */
@@ -747,17 +748,8 @@ SYSCALL_DEFINE2(timer_gettime32, timer_t, timer_id,
  */
 SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)
 {
-       struct k_itimer *timr;
-       int overrun;
-
-       timr = lock_timer(timer_id);
-       if (!timr)
-               return -EINVAL;
-
-       overrun = timer_overrun_to_int(timr);
-       unlock_timer(timr);
-
-       return overrun;
+       scoped_timer_get_or_fail(timer_id)
+               return timer_overrun_to_int(scoped_timer);
 }
 
 static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,
@@ -875,12 +867,9 @@ int common_timer_set(struct k_itimer *timr, int flags,
        return 0;
 }
 
-static int do_timer_settime(timer_t timer_id, int tmr_flags,
-                           struct itimerspec64 *new_spec64,
+static int do_timer_settime(timer_t timer_id, int tmr_flags, struct itimerspec64 *new_spec64,
                            struct itimerspec64 *old_spec64)
 {
-       int ret;
-
        if (!timespec64_valid(&new_spec64->it_interval) ||
            !timespec64_valid(&new_spec64->it_value))
                return -EINVAL;
@@ -888,36 +877,28 @@ static int do_timer_settime(timer_t timer_id, int tmr_flags,
        if (old_spec64)
                memset(old_spec64, 0, sizeof(*old_spec64));
 
-       for (;;) {
-               struct k_itimer *timr = lock_timer(timer_id);
+       for (; ; old_spec64 = NULL) {
+               struct k_itimer *timr;
 
-               if (!timr)
-                       return -EINVAL;
+               scoped_timer_get_or_fail(timer_id) {
+                       timr = scoped_timer;
 
-               if (old_spec64)
-                       old_spec64->it_interval = ktime_to_timespec64(timr->it_interval);
+                       if (old_spec64)
+                               old_spec64->it_interval = ktime_to_timespec64(timr->it_interval);
 
-               /* Prevent signal delivery and rearming. */
-               timr->it_signal_seq++;
+                       /* Prevent signal delivery and rearming. */
+                       timr->it_signal_seq++;
 
-               ret = timr->kclock->timer_set(timr, tmr_flags, new_spec64, old_spec64);
-               if (ret != TIMER_RETRY) {
-                       unlock_timer(timr);
-                       break;
-               }
+                       int ret = timr->kclock->timer_set(timr, tmr_flags, new_spec64, old_spec64);
+                       if (ret != TIMER_RETRY)
+                               return ret;
 
-               /* Read the old time only once */
-               old_spec64 = NULL;
-               /* Protect the timer from being freed after the lock is dropped */
-               guard(rcu)();
-               unlock_timer(timr);
-               /*
-                * timer_wait_running() might drop RCU read side protection
-                * so the timer has to be looked up again!
-                */
+                       /* Protect the timer from being freed when leaving the lock scope */
+                       rcu_read_lock();
+               }
                timer_wait_running(timr);
+               rcu_read_unlock();
        }
-       return ret;
 }
 
 /* Set a POSIX.1b interval timer */
@@ -1028,13 +1009,12 @@ static void posix_timer_delete(struct k_itimer *timer)
 /* Delete a POSIX.1b interval timer. */
 SYSCALL_DEFINE1(timer_delete, timer_t, timer_id)
 {
-       struct k_itimer *timer = lock_timer(timer_id);
-
-       if (!timer)
-               return -EINVAL;
+       struct k_itimer *timer;
 
-       posix_timer_delete(timer);
-       unlock_timer(timer);
+       scoped_timer_get_or_fail(timer_id) {
+               timer = scoped_timer;
+               posix_timer_delete(timer);
+       }
        /* Remove it from the hash, which frees up the timer ID */
        posix_timer_unhash_and_free(timer);
        return 0;