From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: Mathias Krause <minipli@grsecurity.net>
Cc: Luiz Capitulino <luizcap@amazon.com>,
Sven-Haegar Koch <haegar@sdinet.de>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
"Bhatnagar, Rishabh" <risbhat@amazon.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"sashal@kernel.org" <sashal@kernel.org>,
abuehaze@amazon.com,
"stable@vger.kernel.org" <stable@vger.kernel.org>,
Frederic Weisbecker <frederic@kernel.org>,
Ingo Molnar <mingo@kernel.org>
Subject: [PATCH] tick/common: Align tick period during sched_timer setup.
Date: Thu, 15 Jun 2023 11:18:30 +0200 [thread overview]
Message-ID: <20230615091830.RxMV2xf_@linutronix.de> (raw)
In-Reply-To: <23fb8ad7-beb0-ae1c-fa5a-a682a57f79b0@grsecurity.net>
From: Thomas Gleixner <tglx@linutronix.de>
The tick period is aligned very early while the first clock_event_device
is registered. The system runs in periodic mode and switches later to
one-shot mode if possible.
The next wake-up event is programmed based on aligned value
(tick_next_period) but the delta value, that is used to program the
clock_event_device, is computed based on ktime_get().
With the subtracted offset, the devices fires in less than the exacted
time frame. With a large enough offset the system programs the timer for
the next wake-up and the remaining time left is too little to make any
boot progress. The system hangs.
Move the alignment later to the setup of tick_sched timer. At this point
the system switches to oneshot mode and a highres clocksource is
available. It safe to update tick_next_period ktime_get() will now
return accurate (not jiffies based) time.
[bigeasy: Patch description + testing].
Reported-by: Mathias Krause <minipli@grsecurity.net>
Reported-by: "Bhatnagar, Rishabh" <risbhat@amazon.com>
Fixes: e9523a0d81899 ("tick/common: Align tick period with the HZ tick.")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lore.kernel.org/5a56290d-806e-b9a5-f37c-f21958b5a8c0@grsecurity.net
Link: https://lore.kernel.org/12c6f9a3-d087-b824-0d05-0d18c9bc1bf3@amazon.com
---
kernel/time/tick-common.c | 11 +----------
kernel/time/tick-sched.c | 13 ++++++++++++-
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 65b8658da829e..b85f2f9c32426 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -218,19 +218,10 @@ static void tick_setup_device(struct tick_device *td,
* this cpu:
*/
if (tick_do_timer_cpu == TICK_DO_TIMER_BOOT) {
- ktime_t next_p;
- u32 rem;
tick_do_timer_cpu = cpu;
- next_p = ktime_get();
- div_u64_rem(next_p, TICK_NSEC, &rem);
- if (rem) {
- next_p -= rem;
- next_p += TICK_NSEC;
- }
-
- tick_next_period = next_p;
+ tick_next_period = ktime_get();
#ifdef CONFIG_NO_HZ_FULL
/*
* The boot CPU may be nohz_full, in which case set
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 52254679ec489..42c0be3080bde 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -161,8 +161,19 @@ static ktime_t tick_init_jiffy_update(void)
raw_spin_lock(&jiffies_lock);
write_seqcount_begin(&jiffies_seq);
/* Did we start the jiffies update yet ? */
- if (last_jiffies_update == 0)
+ if (last_jiffies_update == 0) {
+ u32 rem;
+
+ /*
+ * Ensure that the tick is aligned to a multiple of
+ * TICK_NSEC.
+ */
+ div_u64_rem(tick_next_period, TICK_NSEC, &rem);
+ if (rem)
+ tick_next_period += TICK_NSEC - rem;
+
last_jiffies_update = tick_next_period;
+ }
period = last_jiffies_update;
write_seqcount_end(&jiffies_seq);
raw_spin_unlock(&jiffies_lock);
--
2.40.1
next prev parent reply other threads:[~2023-06-15 9:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 18:49 Observing RCU stalls in kernel 5.4/5.10/5.15/6.1 stable trees Bhatnagar, Rishabh
2023-06-13 18:58 ` Bhatnagar, Rishabh
2023-06-14 9:14 ` gregkh
2023-06-14 13:08 ` Luiz Capitulino
2023-06-14 9:14 ` gregkh
2023-06-14 9:20 ` Sebastian Andrzej Siewior
2023-06-14 13:10 ` Luiz Capitulino
2023-06-14 13:45 ` Sven-Haegar Koch
2023-06-14 13:57 ` Luiz Capitulino
2023-06-14 14:30 ` Mathias Krause
2023-06-15 9:18 ` Sebastian Andrzej Siewior [this message]
2023-06-15 11:13 ` [PATCH] tick/common: Align tick period during sched_timer setup Mathias Krause
2023-06-15 12:20 ` Richard W.M. Jones
2023-06-15 14:15 ` Luiz Capitulino
2023-06-15 16:00 ` SeongJae Park
2023-06-19 6:18 ` Greg KH
2023-06-19 7:03 ` Mathias Krause
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=20230615091830.RxMV2xf_@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=abuehaze@amazon.com \
--cc=frederic@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=haegar@sdinet.de \
--cc=linux-kernel@vger.kernel.org \
--cc=luizcap@amazon.com \
--cc=mingo@kernel.org \
--cc=minipli@grsecurity.net \
--cc=risbhat@amazon.com \
--cc=sashal@kernel.org \
--cc=stable@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;
as well as URLs for NNTP newsgroup(s).