mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot2 for Thomas Gleixner <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	Frederic Weisbecker <frederic@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Anna-Maria Gleixenr <anna-maria@linutronix.de>
Subject: [tip: timers/core] posix-timers: Use a callback for cancel synchronization on PREEMPT_RT
Date: Fri, 23 Aug 2019 02:12:18 -0000	[thread overview]
Message-ID: <156652633800.11667.5499751485130399187.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190819143801.656864506@linutronix.de>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     ec8f954a40da8cd3d159713b608e901f0cd909a9
Gitweb:        https://git.kernel.org/tip/ec8f954a40da8cd3d159713b608e901f0cd909a9
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Fri, 02 Aug 2019 07:35:59 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 20 Aug 2019 22:05:46 +02:00

posix-timers: Use a callback for cancel synchronization on 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 via a
new callback.
    
This does not yet cover posix CPU timers because they need more special
treatment on PREEMPT_RT.

[ This is folded into the original attempt which did not use a callback. ]

Originally-by: Anna-Maria Gleixenr <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lkml.kernel.org/r/20190819143801.656864506@linutronix.de
---
 kernel/time/alarmtimer.c   | 14 ++++++++++++++
 kernel/time/posix-timers.c | 18 +++++++++++++++++-
 kernel/time/posix-timers.h |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 3694744..ec32876 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -606,6 +606,19 @@ static int alarm_timer_try_to_cancel(struct k_itimer *timr)
 }
 
 /**
+ * alarm_timer_wait_running - Posix timer callback to wait for a timer
+ * @timr:	Pointer to the posixtimer data struct
+ *
+ * Called from the core code when timer cancel detected that the callback
+ * is running. @timr is unlocked and rcu read lock is held to prevent it
+ * from being freed.
+ */
+static void alarm_timer_wait_running(struct k_itimer *timr)
+{
+	hrtimer_cancel_wait_running(&timr->it.alarm.alarmtimer.timer);
+}
+
+/**
  * alarm_timer_arm - Posix timer callback to arm a timer
  * @timr:	Pointer to the posixtimer data struct
  * @expires:	The new expiry time
@@ -834,6 +847,7 @@ const struct k_clock alarm_clock = {
 	.timer_forward		= alarm_timer_forward,
 	.timer_remaining	= alarm_timer_remaining,
 	.timer_try_to_cancel	= alarm_timer_try_to_cancel,
+	.timer_wait_running	= alarm_timer_wait_running,
 	.nsleep			= alarm_timer_nsleep,
 };
 #endif /* CONFIG_POSIX_TIMERS */
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 3e663f9..9e37783 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -805,13 +805,25 @@ static int common_hrtimer_try_to_cancel(struct k_itimer *timr)
 	return hrtimer_try_to_cancel(&timr->it.real.timer);
 }
 
+static void common_timer_wait_running(struct k_itimer *timer)
+{
+	hrtimer_cancel_wait_running(&timer->it.real.timer);
+}
+
 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);
-	cpu_relax();
+
+	if (!WARN_ON_ONCE(!kc->timer_wait_running))
+		kc->timer_wait_running(timer);
+
+	rcu_read_unlock();
 	/* Relock the timer. It might be not longer hashed. */
 	return lock_timer(timer_id, flags);
 }
@@ -1255,6 +1267,7 @@ static const struct k_clock clock_realtime = {
 	.timer_forward		= common_hrtimer_forward,
 	.timer_remaining	= common_hrtimer_remaining,
 	.timer_try_to_cancel	= common_hrtimer_try_to_cancel,
+	.timer_wait_running	= common_timer_wait_running,
 	.timer_arm		= common_hrtimer_arm,
 };
 
@@ -1270,6 +1283,7 @@ static const struct k_clock clock_monotonic = {
 	.timer_forward		= common_hrtimer_forward,
 	.timer_remaining	= common_hrtimer_remaining,
 	.timer_try_to_cancel	= common_hrtimer_try_to_cancel,
+	.timer_wait_running	= common_timer_wait_running,
 	.timer_arm		= common_hrtimer_arm,
 };
 
@@ -1300,6 +1314,7 @@ static const struct k_clock clock_tai = {
 	.timer_forward		= common_hrtimer_forward,
 	.timer_remaining	= common_hrtimer_remaining,
 	.timer_try_to_cancel	= common_hrtimer_try_to_cancel,
+	.timer_wait_running	= common_timer_wait_running,
 	.timer_arm		= common_hrtimer_arm,
 };
 
@@ -1315,6 +1330,7 @@ static const struct k_clock clock_boottime = {
 	.timer_forward		= common_hrtimer_forward,
 	.timer_remaining	= common_hrtimer_remaining,
 	.timer_try_to_cancel	= common_hrtimer_try_to_cancel,
+	.timer_wait_running	= common_timer_wait_running,
 	.timer_arm		= common_hrtimer_arm,
 };
 
diff --git a/kernel/time/posix-timers.h b/kernel/time/posix-timers.h
index de5daa6..897c29e 100644
--- a/kernel/time/posix-timers.h
+++ b/kernel/time/posix-timers.h
@@ -24,6 +24,7 @@ struct k_clock {
 	int	(*timer_try_to_cancel)(struct k_itimer *timr);
 	void	(*timer_arm)(struct k_itimer *timr, ktime_t expires,
 			     bool absolute, bool sigev_none);
+	void	(*timer_wait_running)(struct k_itimer *timr);
 };
 
 extern const struct k_clock clock_posix_cpu;

  parent reply	other threads:[~2019-08-23  2:12 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-19 14:31 [patch 00/44] posix-cpu-timers: Cleanup and consolidation Thomas Gleixner
2019-08-19 14:31 ` [patch 01/44] posix-timers: Cleanup forward declarations and includes Thomas Gleixner
2019-08-20 12:20   ` Frederic Weisbecker
2019-08-20 13:03     ` Thomas Gleixner
2019-08-20 13:48   ` Frederic Weisbecker
2019-08-23  2:12   ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 02/44] alarmtimers: Avoid rtc.h include Thomas Gleixner
2019-08-20 13:49   ` Frederic Weisbecker
2019-08-23  2:12   ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 03/44] posix-timer: Use a callback for cancel synchronization Thomas Gleixner
2019-08-20  2:21   ` Christoph Hellwig
2019-08-20 13:08     ` Thomas Gleixner
2019-08-20 13:59   ` Frederic Weisbecker
2019-08-23  2:12   ` tip-bot2 for Thomas Gleixner [this message]
2019-08-19 14:31 ` [patch 04/44] posix-cpu-timers: Fixup stale comment Thomas Gleixner
2019-08-20 14:26   ` Frederic Weisbecker
2019-08-20 17:57     ` Thomas Gleixner
2019-08-20 20:48       ` Frederic Weisbecker
2019-08-20 21:43         ` Thomas Gleixner
2019-08-20 22:56           ` Frederic Weisbecker
2019-08-21 13:31             ` Thomas Gleixner
2019-08-21 15:51               ` Frederic Weisbecker
2019-08-23  2:12   ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 05/44] posix-cpu-timers: Sanitize bogus WARNONS Thomas Gleixner
2019-08-21 11:34   ` Frederic Weisbecker
2019-08-23  2:12   ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 06/44] posix-cpu-timers: Remove tsk argument from run_posix_cpu_timers() Thomas Gleixner
2019-08-21 11:36   ` Frederic Weisbecker
2019-08-23  2:12   ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 07/44] posix-cpu-timers: Simplify sighand locking in run_posix_cpu_timers() Thomas Gleixner
2019-08-21 12:09   ` Frederic Weisbecker
2019-08-21 13:25     ` Thomas Gleixner
2019-08-21 15:42       ` Frederic Weisbecker
2019-08-21 17:13         ` Thomas Gleixner
2019-08-19 14:31 ` [patch 08/44] posix-cpu-timers: Provide task validation functions Thomas Gleixner
2019-08-19 14:31 ` [patch 09/44] posix-cpu-timers: Use common permission check in posix_cpu_clock_get() Thomas Gleixner
2019-08-19 14:31 ` [patch 10/44] posix-cpu-timers: Use common permission check in posix_cpu_timer_create() Thomas Gleixner
2019-08-19 14:31 ` [patch 11/44] posix-cpu-timers: Provide quick sample function for itimer Thomas Gleixner
2019-08-19 14:31 ` [patch 12/44] itimers: Use quick sample function Thomas Gleixner
2019-08-19 14:31 ` [patch 13/44] posix-cpu-timers: Sample directly in timer check Thomas Gleixner
2019-08-19 14:31 ` [patch 14/44] posix-cpu-timers: Rename thread_group_cputimer() and make it static Thomas Gleixner
2019-08-19 14:31 ` [patch 15/44] posix-cpu-timer: Comsolidate thread group sample code Thomas Gleixner
2019-08-19 19:07   ` Ingo Molnar
2019-08-19 14:31 ` [patch 16/44] posix-cpu-timers: Use clock ID in posix_cpu_timer_set() Thomas Gleixner
2019-08-19 14:31 ` [patch 17/44] posix-cpu-timers: Use clock ID in posix_cpu_timer_get() Thomas Gleixner
2019-08-19 14:31 ` [patch 18/44] posix-cpu-timers: Use clock ID in posix_cpu_timer_rearm() Thomas Gleixner
2019-08-19 14:32 ` [patch 19/44] posix-cpu-timer: Remove pointless return value check Thomas Gleixner
2019-08-19 14:32 ` [patch 20/44] posix-cpu-timers: Simplify sample functions Thomas Gleixner
2019-08-19 14:32 ` [patch 21/44] posix-cpu-timers: Get rid of pointer indirection Thomas Gleixner
2019-08-19 14:32 ` [patch 22/44] posix-cpu-timers: Sample task times once in expiry check Thomas Gleixner
2019-08-19 14:32 ` [patch 23/44] posix-cpu-timers: Move prof/virt_ticks into caller Thomas Gleixner
2019-08-19 14:32 ` [patch 24/44] posix-cpu-timers: Create a container struct Thomas Gleixner
2019-08-19 14:32 ` [patch 25/44] sched: Move struct task_cputime to types.h Thomas Gleixner
2019-08-19 14:32 ` [patch 26/44] posix-cpu-timers: Move expiry cache into struct posix_cputimers Thomas Gleixner
2019-08-19 14:32 ` [patch 27/44] posix-cpu-timers: Provide array based access to expiry cache Thomas Gleixner
2019-08-19 19:32   ` Ingo Molnar
2019-08-20 20:22     ` Thomas Gleixner
2019-08-19 14:32 ` [patch 28/44] posix-cpu-timers: Simplify timer queueing Thomas Gleixner
2019-08-19 14:32 ` [patch 29/44] posix-cpu-timers: Simplify set_process_cpu_timer() Thomas Gleixner
2019-08-19 14:32 ` [patch 30/44] posix-cpu-timers: Switch check_*_timers() to array cache Thomas Gleixner
2019-08-19 14:32 ` [patch 31/44] posix-cpu-timers: Remove the odd field rename defines Thomas Gleixner
2019-08-19 14:32 ` [patch 32/44] posix-cpu-timers: Provide array based sample functions Thomas Gleixner
2019-08-19 14:32 ` [patch 33/44] posix-cpu-timers: Make expiry checks array based Thomas Gleixner
2019-08-19 14:32 ` [patch 34/44] posix-cpu-timers: Remove cputime_expires Thomas Gleixner
2019-08-19 14:32 ` [patch 35/44] posix-cpu-timers: Switch thread group sampling to array Thomas Gleixner
2019-08-19 14:32 ` [patch 36/44] posix-cpu-timers: Get rid of zero checks Thomas Gleixner
2019-08-19 14:32 ` [patch 37/44] posix-cpu-timers: Consolidate timer expiry further Thomas Gleixner
2019-08-19 14:32 ` [patch 38/44] posix-cpu-timers: Respect INFINITY for hard RTTIME limit Thomas Gleixner
2019-08-19 20:06   ` Ingo Molnar
2019-08-19 20:29     ` Thomas Gleixner
2019-08-19 14:32 ` [patch 39/44] posix-cpu-timers: Get rid of 64bit divisions Thomas Gleixner
2019-08-19 14:32 ` [patch 40/44] posix-cpu-timers: Remove pointless comparisions Thomas Gleixner
2019-08-19 20:10   ` Ingo Molnar
2019-08-19 14:32 ` [patch 41/44] posix-cpu-timers: Deduplicate rlimit handling Thomas Gleixner
2019-08-19 14:32 ` [patch 42/44] posix-cpu-timers: Move state tracking to struct posix_cputimers Thomas Gleixner
2019-08-19 19:13   ` Ingo Molnar
2019-08-19 20:29     ` Thomas Gleixner
2019-08-19 14:32 ` [patch 43/44] posix-cpu-timers: Utilize timerqueue for storage Thomas Gleixner
2019-08-19 14:32 ` [patch 44/44] posix-cpu-timers: Expire timers directly Thomas Gleixner
2019-08-19 19:09   ` Ingo Molnar
2019-08-20 13:07   ` Thomas Gleixner
2019-08-20  2:18 ` [patch 00/44] posix-cpu-timers: Cleanup and consolidation Christoph Hellwig
2019-08-20 13:09   ` Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=156652633800.11667.5499751485130399187.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=anna-maria@linutronix.de \
    --cc=frederic@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®