Dear RT folks!
I'm pleased to announce the v5.10-rc7-rt16 patch set.
Changes since v5.10-rc7-rt15:
- Drop hrtimer-Allow-raw-wakeups-during-boot.patch. It is not needed
since another change came in.
- Assign timer_base::timer_running with base::lock held. Reported by
syzbot, patched by Thomas Gleixner.
Known issues
- None.
The delta patch against v5.10-rc7-rt15 is appended below and can be found here:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.10/incr/patch-5.10-rc7-rt15-rt16.patch.xz
You can get this release via the git tree at:
git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git
v5.10-rc7-rt16
The RT patch against v5.10-rc7 can be found here:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10-rc7-rt16.patch.xz
The split quilt queue is available at:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10-rc7-rt16.tar.xz
Sebastian
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index b8111d3e7d68f..02f43f663ad5a 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1823,7 +1823,7 @@ static void __hrtimer_init_sleeper(struct hrtimer_sleeper
*sl,
* expiry.
*/
if (IS_ENABLED(CONFIG_PREEMPT_RT)) {
- if ((task_is_realtime(current) && !(mode & HRTIMER_MODE_SOFT))
|| system_state != SYSTEM_RUNNING)
+ if (task_is_realtime(current) && !(mode & HRTIMER_MODE_SOFT))
mode |= HRTIMER_MODE_HARD;
}
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 7c4ac329711b4..b6477db234e6a 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1263,8 +1263,10 @@ static inline void timer_base_unlock_expiry(struct
timer_base *base)
static void timer_sync_wait_running(struct timer_base *base)
{
if (atomic_read(&base->timer_waiters)) {
+ raw_spin_unlock_irq(&base->lock);
spin_unlock(&base->expiry_lock);
spin_lock(&base->expiry_lock);
+ raw_spin_lock_irq(&base->lock);
}
}
@@ -1455,14 +1457,14 @@ static void expire_timers(struct timer_base *base,
struct hlist_head *head)
if (timer->flags & TIMER_IRQSAFE) {
raw_spin_unlock(&base->lock);
call_timer_fn(timer, fn, baseclk);
- base->running_timer = NULL;
raw_spin_lock(&base->lock);
+ base->running_timer = NULL;
} else {
raw_spin_unlock_irq(&base->lock);
call_timer_fn(timer, fn, baseclk);
+ raw_spin_lock_irq(&base->lock);
base->running_timer = NULL;
timer_sync_wait_running(base);
- raw_spin_lock_irq(&base->lock);
}
}
}
diff --git a/localversion-rt b/localversion-rt
index 18777ec0c27d4..1199ebade17b4 100644
--- a/localversion-rt
+++ b/localversion-rt
@@ -1 +1 @@
--rt15
+-rt16
