[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190730223829.058247862@linutronix.de>
Date: Wed, 31 Jul 2019 00:33:55 +0200
From: Thomas Gleixner <tglx@...utronix.de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...nel.org>,
Sebastian Siewior <bigeasy@...utronix.de>,
Anna-Maria Gleixner <anna-maria@...utronix.de>,
Steven Rostedt <rostedt@...dmis.org>,
Julia Cartwright <julia@...com>
Subject: [patch 7/7] posix-timers: Prepare for PREEMPT_RT
Posix timer delete retry loops are affected by the same priority inversion
and live lock issues as the other timers.
Provide a RT specific synchronization function which keeps a reference to
the timer by holding rcu read lock to prevent the timer from being freed,
dropping the timer lock and invoking the timer specific wait function.
This does not yet cover posix CPU timers because they need more special
treatment on PREEMPT_RT.
Originally-by: Anna-Maria Gleixenr <anna-maria@...utronix.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
kernel/time/posix-timers.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -805,6 +805,27 @@ static int common_hrtimer_try_to_cancel(
return hrtimer_try_to_cancel(&timr->it.real.timer);
}
+#ifdef CONFIG_PREEMPT_RT
+static struct k_itimer *timer_wait_running(struct k_itimer *timer,
+ unsigned long *flags)
+{
+ const struct k_clock *kc = READ_ONCE(timer->kclock);
+ timer_t timer_id = READ_ONCE(timer->it_id);
+
+ /* Prevent kfree(timer) after dropping the lock */
+ rcu_read_lock();
+ unlock_timer(timer, *flags);
+
+ if (kc->timer_arm == common_hrtimer_arm)
+ hrtimer_cancel_wait_running(&timer->it.real.timer);
+ else if (kc == &alarm_clock)
+ hrtimer_cancel_wait_running(&timer->it.alarm.alarmtimer.timer);
+ rcu_read_unlock();
+
+ /* Relock the timer. It might be not longer hashed. */
+ return lock_timer(timer_id, flags);
+}
+#else
static struct k_itimer *timer_wait_running(struct k_itimer *timer,
unsigned long *flags)
{
@@ -815,6 +836,7 @@ static struct k_itimer *timer_wait_runni
/* Relock the timer. It might be not longer hashed. */
return lock_timer(timer_id, flags);
}
+#endif
/* Set a POSIX.1b interval timer. */
int common_timer_set(struct k_itimer *timr, int flags,
Powered by blists - more mailing lists