]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hrtimers: Make hrtimer_update_function() less expensive
authorThomas Gleixner <tglx@linutronix.de>
Fri, 7 Feb 2025 21:16:09 +0000 (22:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Jan 2026 09:15:03 +0000 (10:15 +0100)
commit 2ea97b76d6712bfb0408e5b81ffd7bc4551d3153 upstream.

The sanity checks in hrtimer_update_function() are expensive for high
frequency usage like in the io/uring code due to locking.

Hide the sanity checks behind CONFIG_PROVE_LOCKING, which has a decent
chance to be enabled on a regular basis for testing.

Fixes: 8f02e3563bb5 ("hrtimers: Introduce hrtimer_update_function()")
Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/87ikpllali.ffs@tglx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/hrtimer.h

index 39fbeb64a7da8d2dcb4cf0308db343111f3f8647..1e186449dd04f965894da42c380f9f3283536124 100644 (file)
@@ -348,6 +348,7 @@ static inline int hrtimer_callback_running(struct hrtimer *timer)
 static inline void hrtimer_update_function(struct hrtimer *timer,
                                           enum hrtimer_restart (*function)(struct hrtimer *))
 {
+#ifdef CONFIG_PROVE_LOCKING
        guard(raw_spinlock_irqsave)(&timer->base->cpu_base->lock);
 
        if (WARN_ON_ONCE(hrtimer_is_queued(timer)))
@@ -355,7 +356,7 @@ static inline void hrtimer_update_function(struct hrtimer *timer,
 
        if (WARN_ON_ONCE(!function))
                return;
-
+#endif
        timer->function = function;
 }