From: tip-bot for Sebastian Andrzej Siewior <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: bigeasy@linutronix.de, hpa@zytor.com, peterz@infradead.org,
tglx@linutronix.de, linux-kernel@vger.kernel.org,
mingo@kernel.org
Subject: [tip:timers/core] hrtimer: Move unmarked hrtimers to soft interrupt expiry on RT
Date: Tue, 30 Jul 2019 15:15:43 -0700 [thread overview]
Message-ID: <tip-f4f9a0e3f4c01a11043aca77006532c3c889c9ba@git.kernel.org> (raw)
In-Reply-To: <20190726185753.551967692@linutronix.de>
Commit-ID: f4f9a0e3f4c01a11043aca77006532c3c889c9ba
Gitweb: https://git.kernel.org/tip/f4f9a0e3f4c01a11043aca77006532c3c889c9ba
Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
AuthorDate: Fri, 26 Jul 2019 20:30:57 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 30 Jul 2019 23:57:56 +0200
hrtimer: Move unmarked hrtimers to soft interrupt expiry on RT
On PREEMPT_RT not all hrtimers can be expired in hard interrupt context
even if that is perfectly fine on a PREEMPT_RT=n kernel, e.g. because they
take regular spinlocks. Also for latency reasons PREEMPT_RT tries to defer
most hrtimers' expiry into softirq context.
hrtimers marked with HRTIMER_MODE_HARD must be kept in hard interrupt
context expiry mode. Add the required logic.
No functional change for PREEMPT_RT=n kernels.
[ tglx: Split out of a larger combo patch. Added changelog ]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190726185753.551967692@linutronix.de
---
kernel/time/hrtimer.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 0ace301a56f4..90dcc4d95e91 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1275,8 +1275,17 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
enum hrtimer_mode mode)
{
bool softtimer = !!(mode & HRTIMER_MODE_SOFT);
- int base = softtimer ? HRTIMER_MAX_CLOCK_BASES / 2 : 0;
struct hrtimer_cpu_base *cpu_base;
+ int base;
+
+ /*
+ * On PREEMPT_RT enabled kernels hrtimers which are not explicitely
+ * marked for hard interrupt expiry mode are moved into soft
+ * interrupt context for latency reasons and because the callbacks
+ * can invoke functions which might sleep on RT, e.g. spin_lock().
+ */
+ if (IS_ENABLED(CONFIG_PREEMPT_RT) && !(mode & HRTIMER_MODE_HARD))
+ softtimer = true;
memset(timer, 0, sizeof(struct hrtimer));
@@ -1290,6 +1299,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
if (clock_id == CLOCK_REALTIME && mode & HRTIMER_MODE_REL)
clock_id = CLOCK_MONOTONIC;
+ base = softtimer ? HRTIMER_MAX_CLOCK_BASES / 2 : 0;
base += hrtimer_clockid_to_base(clock_id);
timer->is_soft = softtimer;
timer->is_hard = !softtimer;
next prev parent reply other threads:[~2019-07-30 22:15 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 18:30 [patch 00/12] (hr)timers: Prepare for PREEMPT_RT support Thomas Gleixner
2019-07-26 18:30 ` [patch 01/12] hrtimer: Remove task argument from hrtimer_init_sleeper() Thomas Gleixner
2019-07-26 19:57 ` Steven Rostedt
2019-07-26 20:01 ` Thomas Gleixner
2019-07-30 22:07 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2019-07-26 18:30 ` [patch 02/12] hrtimer: Consolidate hrtimer_init() + hrtimer_init_sleeper() calls Thomas Gleixner
2019-07-30 22:08 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:49 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 03/12] hrtimer: Introduce HARD expiry mode Thomas Gleixner
2019-07-30 22:10 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:52 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 04/12] sched: Mark hrtimers to expire in hard interrupt context Thomas Gleixner
2019-07-30 22:11 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2019-08-01 15:53 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 18:58 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 05/12] perf/core: " Thomas Gleixner
2019-07-30 22:12 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2019-08-01 15:54 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 18:59 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 06/12] watchdog: Mark watchdog_hrtimer " Thomas Gleixner
2019-07-30 22:13 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:55 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:00 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 07/12] KVM: LAPIC: Mark hrtimer " Thomas Gleixner
2019-07-26 19:41 ` Paolo Bonzini
2019-07-30 22:14 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:55 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:01 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 08/12] tick: Mark tick related hrtimers to expiry " Thomas Gleixner
2019-07-30 22:14 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:56 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:01 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 09/12] hrtimer: Move unmarked hrtimers to soft interrupt expiry on RT Thomas Gleixner
2019-07-30 22:15 ` tip-bot for Sebastian Andrzej Siewior [this message]
2019-08-01 15:57 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:02 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 10/12] hrtimer: Determine hard/soft expiry mode for hrtimer sleepers " Thomas Gleixner
2019-07-26 20:44 ` Steven Rostedt
2019-07-26 20:52 ` Thomas Gleixner
2019-07-26 20:56 ` Steven Rostedt
2019-07-26 21:16 ` Julia Cartwright
2019-07-26 21:30 ` Steven Rostedt
2019-07-26 21:35 ` Thomas Gleixner
2019-07-30 22:16 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:58 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:03 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 11/12] hrtimer: Prepare support for PREEMPT_RT Thomas Gleixner
2019-07-28 9:06 ` Juergen Gross
2019-07-29 15:08 ` Steven Rostedt
2019-07-29 17:30 ` Paolo Bonzini
2019-07-31 8:45 ` Juergen Gross
2019-07-30 22:17 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2019-08-01 15:58 ` tip-bot for Anna-Maria Gleixner
2019-08-01 19:04 ` tip-bot for Anna-Maria Gleixner
2019-08-20 13:26 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] hrtimer: Improve comments on handling priority inversion against softirq kthread tip-bot2 for Frederic Weisbecker
2019-07-26 18:31 ` [patch 12/12] timers: Prepare support for PREEMPT_RT Thomas Gleixner
2019-07-30 22:17 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2019-08-01 15:59 ` tip-bot for Anna-Maria Gleixner
2019-08-01 19:04 ` tip-bot for Anna-Maria Gleixner
2019-07-29 19:45 ` [patch 00/12] (hr)timers: Prepare for PREEMPT_RT support Peter Zijlstra
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=tip-f4f9a0e3f4c01a11043aca77006532c3c889c9ba@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bigeasy@linutronix.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).