From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Julia Cartwright <julia@ni.com>,
Daniel Wagner <daniel.wagner@siemens.com>,
tom.zanussi@linux.intel.com, Alex Shi <alex.shi@linaro.org>,
stable-rt@vger.kernel.org, Mike Galbraith <efault@gmx.de>
Subject: [PATCH RT 3/9] kernel/hrtimer: migrate deferred timer on CPU down
Date: Fri, 01 Dec 2017 20:37:01 -0500 [thread overview]
Message-ID: <20171202013711.705546858@goodmis.org> (raw)
In-Reply-To: 20171202013658.149533964@goodmis.org
[-- Attachment #1: 0003-kernel-hrtimer-migrate-deferred-timer-on-CPU-down.patch --]
[-- Type: text/plain, Size: 1275 bytes --]
4.4.102-rt117-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
hrtimers, which were deferred to the softirq context, and expire between
softirq shutdown and hrtimer migration are dangling around. If the CPU
goes back up the list head will be initialized and this corrupts the
timer's list. It will remain unnoticed until a hrtimer_cancel().
This moves those timers so they will expire.
Cc: stable-rt@vger.kernel.org
Reported-by: Mike Galbraith <efault@gmx.de>
Tested-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
kernel/time/hrtimer.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index ba3d60144838..759913626eec 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1880,6 +1880,11 @@ static void migrate_hrtimer_list(struct hrtimer_clock_base *old_base,
*/
enqueue_hrtimer(timer, new_base);
}
+#ifdef CONFIG_PREEMPT_RT_BASE
+ list_splice_tail(&old_base->expired, &new_base->expired);
+ if (!list_empty(&new_base->expired))
+ raise_softirq_irqoff(HRTIMER_SOFTIRQ);
+#endif
}
static void migrate_hrtimers(int scpu)
--
2.13.2
next prev parent reply other threads:[~2017-12-02 1:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-02 1:36 [PATCH RT 0/9] Linux 4.4.102-rt117-rc1 Steven Rostedt
2017-12-02 1:36 ` [PATCH RT 1/9] Revert "fs: jbd2: pull your plug when waiting for space" Steven Rostedt
2017-12-04 8:45 ` Sebastian Andrzej Siewior
2017-12-08 18:15 ` Steven Rostedt
2017-12-11 15:37 ` Sebastian Andrzej Siewior
2017-12-11 15:53 ` Steven Rostedt
2017-12-11 16:02 ` Sebastian Andrzej Siewior
2017-12-02 1:37 ` [PATCH RT 2/9] cpu_pm: replace raw_notifier to atomic_notifier Steven Rostedt
2017-12-02 1:37 ` Steven Rostedt [this message]
2017-12-02 1:37 ` [PATCH RT 4/9] kernel/hrtimer: dont wakeup a process while holding the hrtimer base lock Steven Rostedt
2017-12-02 1:37 ` [PATCH RT 5/9] kernel/hrtimer/hotplug: dont wake ktimersoftd " Steven Rostedt
2017-12-02 1:37 ` [PATCH RT 6/9] Bluetooth: avoid recursive locking in hci_send_to_channel() Steven Rostedt
2017-12-02 1:37 ` [PATCH RT 7/9] rt/locking: allow recursive local_trylock() Steven Rostedt
2017-12-02 1:37 ` [PATCH RT 8/9] net: use trylock in icmp_sk Steven Rostedt
2017-12-02 1:37 ` [PATCH RT 9/9] Linux 4.4.102-rt117-rc1 Steven Rostedt
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=20171202013711.705546858@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=alex.shi@linaro.org \
--cc=bigeasy@linutronix.de \
--cc=daniel.wagner@siemens.com \
--cc=efault@gmx.de \
--cc=jkacur@redhat.com \
--cc=julia@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=stable-rt@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
/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