From: Julien Grall Date: Wed, 21 Aug 2019 10:24:08 +0100 Subject: [PATCH 293/351] hrtimer: Don't grab the expiry lock for non-soft hrtimer Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=257d3ed6a99a9055a4b7725652f0608a0c19dfab [ Upstream commit fd420354bea2f57c11f3de191dffdeea76531e76 ] Acquiring the lock in hrtimer_grab_expiry_lock() is designed for sleeping-locks and should not be used with disabled interrupts. hrtimer_cancel() may invoke hrtimer_grab_expiry_lock() also for locks which expire in hard-IRQ context. Let hrtimer_cancel() invoke hrtimer_grab_expiry_lock() only for locks which expire in softirq context. Signed-off-by: Julien Grall Signed-off-by: Steven Rostedt (VMware) [bigeasy: rewrite changelog] Signed-off-by: Sebastian Andrzej Siewior --- kernel/time/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index dff440fd968b..24bfae0e92e2 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -961,7 +961,7 @@ void hrtimer_grab_expiry_lock(const struct hrtimer *timer) { struct hrtimer_clock_base *base = READ_ONCE(timer->base); - if (base && base->cpu_base) { + if (timer->is_soft && base && base->cpu_base) { spin_lock(&base->cpu_base->softirq_expiry_lock); spin_unlock(&base->cpu_base->softirq_expiry_lock); }