diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches-rt/0294-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/debian/patches-rt/0294-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch b/debian/patches-rt/0294-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch new file mode 100644 index 000000000..2d81ae91d --- /dev/null +++ b/debian/patches-rt/0294-hrtimer-Don-t-grab-the-expiry-lock-for-non-soft-hrti.patch @@ -0,0 +1,41 @@ +From cec8a994798fd0bebd900d555590ab684d4c7edc Mon Sep 17 00:00:00 2001 +From: Julien Grall <julien.grall@arm.com> +Date: Wed, 21 Aug 2019 10:24:08 +0100 +Subject: [PATCH 294/347] hrtimer: Don't grab the expiry lock for non-soft + hrtimer +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz + +[ 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 <julien.grall@arm.com> +Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +[bigeasy: rewrite changelog] +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + 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); + } +-- +2.36.1 + |