45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From bae02b374cefc85b456d4f78b380baf045d8cb44 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <bae02b374cefc85b456d4f78b380baf045d8cb44.1596234184.git.zanussi@kernel.org>
|
|
In-Reply-To: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
References: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
From: Julien Grall <julien.grall@arm.com>
|
|
Date: Wed, 21 Aug 2019 10:24:08 +0100
|
|
Subject: [PATCH 294/329] 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.135-rt60.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 d6026c170c2d..49d20fe8570f 100644
|
|
--- a/kernel/time/hrtimer.c
|
|
+++ b/kernel/time/hrtimer.c
|
|
@@ -943,7 +943,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.17.1
|
|
|