diff options
Diffstat (limited to 'debian/patches-rt/0295-hrtimer-Prevent-using-hrtimer_grab_expiry_lock-on-mi.patch')
| -rw-r--r-- | debian/patches-rt/0295-hrtimer-Prevent-using-hrtimer_grab_expiry_lock-on-mi.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches-rt/0295-hrtimer-Prevent-using-hrtimer_grab_expiry_lock-on-mi.patch b/debian/patches-rt/0295-hrtimer-Prevent-using-hrtimer_grab_expiry_lock-on-mi.patch new file mode 100644 index 000000000..66133c2af --- /dev/null +++ b/debian/patches-rt/0295-hrtimer-Prevent-using-hrtimer_grab_expiry_lock-on-mi.patch @@ -0,0 +1,43 @@ +From 7e9203de23a787ac491b8114acaf5a8c37f60d36 Mon Sep 17 00:00:00 2001 +From: Julien Grall <julien.grall@arm.com> +Date: Wed, 21 Aug 2019 10:24:09 +0100 +Subject: [PATCH 295/347] hrtimer: Prevent using hrtimer_grab_expiry_lock() on + migration_base +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz + +[ Upstream commit cef1b87f98823af923a386f3f69149acb212d4a1 ] + +As tglx puts it: +|If base == migration_base then there is no point to lock soft_expiry_lock +|simply because the timer is not executing the callback in soft irq context +|and the whole lock/unlock dance can be avoided. + +Furthermore, all the path leading to hrtimer_grab_expiry_lock() assumes +timer->base and timer->base->cpu_base are always non-NULL. So it is safe +to remove the NULL checks here. + +Signed-off-by: Julien Grall <julien.grall@arm.com> +Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1908211557420.2223@nanos.tec.linutronix.de +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 24bfae0e92e2..3f9d156c36f1 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 (timer->is_soft && base && base->cpu_base) { ++ if (timer->is_soft && base != &migration_base) { + spin_lock(&base->cpu_base->softirq_expiry_lock); + spin_unlock(&base->cpu_base->softirq_expiry_lock); + } +-- +2.36.1 + |