From: "tip-bot2 for Oleg Nesterov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Chris von Recklinghausen <crecklin@redhat.com>,
Oleg Nesterov <oleg@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>, Phil Auld <pauld@redhat.com>,
Frederic Weisbecker <frederic@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/urgent] sched/isolation: Prevent boot crash when the boot CPU is nohz_full
Date: Sun, 28 Apr 2024 08:24:31 -0000 [thread overview]
Message-ID: <171429267181.10875.2633061764782446732.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240411143905.GA19288@redhat.com>
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 5097cbcb38e6e0d2627c9dde1985e91d2c9f880e
Gitweb: https://git.kernel.org/tip/5097cbcb38e6e0d2627c9dde1985e91d2c9f880e
Author: Oleg Nesterov <oleg@redhat.com>
AuthorDate: Thu, 11 Apr 2024 16:39:05 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 28 Apr 2024 10:07:12 +02:00
sched/isolation: Prevent boot crash when the boot CPU is nohz_full
Documentation/timers/no_hz.rst states that the "nohz_full=" mask must not
include the boot CPU, which is no longer true after:
08ae95f4fd3b ("nohz_full: Allow the boot CPU to be nohz_full").
However after:
aae17ebb53cd ("workqueue: Avoid using isolated cpus' timers on queue_delayed_work")
the kernel will crash at boot time in this case; housekeeping_any_cpu()
returns an invalid CPU number until smp_init() brings the first
housekeeping CPU up.
Change housekeeping_any_cpu() to check the result of cpumask_any_and() and
return smp_processor_id() in this case.
This is just the simple and backportable workaround which fixes the
symptom, but smp_processor_id() at boot time should be safe at least for
type == HK_TYPE_TIMER, this more or less matches the tick_do_timer_boot_cpu
logic.
There is no worry about cpu_down(); tick_nohz_cpu_down() will not allow to
offline tick_do_timer_cpu (the 1st online housekeeping CPU).
Fixes: aae17ebb53cd ("workqueue: Avoid using isolated cpus' timers on queue_delayed_work")
Reported-by: Chris von Recklinghausen <crecklin@redhat.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Phil Auld <pauld@redhat.com>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20240411143905.GA19288@redhat.com
Closes: https://lore.kernel.org/all/20240402105847.GA24832@redhat.com/
---
Documentation/timers/no_hz.rst | 7 ++-----
kernel/sched/isolation.c | 11 ++++++++++-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Documentation/timers/no_hz.rst b/Documentation/timers/no_hz.rst
index f8786be..7fe8ef9 100644
--- a/Documentation/timers/no_hz.rst
+++ b/Documentation/timers/no_hz.rst
@@ -129,11 +129,8 @@ adaptive-tick CPUs: At least one non-adaptive-tick CPU must remain
online to handle timekeeping tasks in order to ensure that system
calls like gettimeofday() returns accurate values on adaptive-tick CPUs.
(This is not an issue for CONFIG_NO_HZ_IDLE=y because there are no running
-user processes to observe slight drifts in clock rate.) Therefore, the
-boot CPU is prohibited from entering adaptive-ticks mode. Specifying a
-"nohz_full=" mask that includes the boot CPU will result in a boot-time
-error message, and the boot CPU will be removed from the mask. Note that
-this means that your system must have at least two CPUs in order for
+user processes to observe slight drifts in clock rate.) Note that this
+means that your system must have at least two CPUs in order for
CONFIG_NO_HZ_FULL=y to do anything for you.
Finally, adaptive-ticks CPUs must have their RCU callbacks offloaded.
diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
index 373d42c..2a262d3 100644
--- a/kernel/sched/isolation.c
+++ b/kernel/sched/isolation.c
@@ -46,7 +46,16 @@ int housekeeping_any_cpu(enum hk_type type)
if (cpu < nr_cpu_ids)
return cpu;
- return cpumask_any_and(housekeeping.cpumasks[type], cpu_online_mask);
+ cpu = cpumask_any_and(housekeeping.cpumasks[type], cpu_online_mask);
+ if (likely(cpu < nr_cpu_ids))
+ return cpu;
+ /*
+ * Unless we have another problem this can only happen
+ * at boot time before start_secondary() brings the 1st
+ * housekeeping CPU up.
+ */
+ WARN_ON_ONCE(system_state == SYSTEM_RUNNING ||
+ type != HK_TYPE_TIMER);
}
}
return smp_processor_id();
prev parent reply other threads:[~2024-04-28 8:24 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-30 1:00 [PATCH v2 1/1] wq: Avoid using isolated cpus' timers on queue_delayed_work Leonardo Bras
2024-01-30 1:22 ` Tejun Heo
2024-01-30 2:58 ` Leonardo Bras
2024-04-02 10:58 ` Oleg Nesterov
2024-04-03 19:12 ` Tejun Heo
2024-04-03 20:38 ` Oleg Nesterov
2024-04-05 14:04 ` Oleg Nesterov
2024-04-05 15:38 ` Tejun Heo
2024-04-05 22:03 ` Frederic Weisbecker
2024-04-05 21:52 ` Nohz_full on boot CPU is broken (was: Re: [PATCH v2 1/1] wq: Avoid using isolated cpus' timers on queue_delayed_work) Frederic Weisbecker
2024-04-07 13:09 ` Oleg Nesterov
2024-04-07 13:52 ` Oleg Nesterov
2024-04-09 12:05 ` Frederic Weisbecker
2024-04-09 12:04 ` Frederic Weisbecker
2024-04-09 13:07 ` Oleg Nesterov
2024-04-09 13:59 ` Frederic Weisbecker
2024-04-10 4:26 ` Nicholas Piggin
2024-04-10 13:55 ` Oleg Nesterov
2024-04-11 13:41 ` Oleg Nesterov
2024-04-11 14:39 ` [PATCH] sched/isolation: fix boot crash when the boot CPU is nohz_full Oleg Nesterov
2024-04-11 16:59 ` Oleg Nesterov
2024-04-13 14:17 ` [PATCH] sched/isolation: fix boot crash when maxcpus < first-housekeeping-cpu Oleg Nesterov
2024-04-18 14:54 ` Phil Auld
2024-04-18 15:40 ` Frederic Weisbecker
2024-04-24 20:05 ` [tip: sched/urgent] sched/isolation: Fix boot crash when maxcpus < first housekeeping CPU tip-bot2 for Oleg Nesterov
2024-04-28 8:13 ` Ingo Molnar
2024-04-28 13:16 ` Oleg Nesterov
2024-04-28 8:24 ` tip-bot2 for Oleg Nesterov
2024-04-15 21:37 ` [PATCH] sched/isolation: fix boot crash when the boot CPU is nohz_full Frederic Weisbecker
2024-04-18 14:50 ` Phil Auld
2024-04-22 18:50 ` Oleg Nesterov
2024-04-24 14:42 ` Phil Auld
2024-04-24 20:05 ` [tip: sched/urgent] sched/isolation: {revent " tip-bot2 for Oleg Nesterov
2024-04-24 20:41 ` Phil Auld
2024-04-28 8:14 ` Ingo Molnar
2024-04-29 11:50 ` Phil Auld
2024-04-28 8:24 ` tip-bot2 for Oleg Nesterov [this message]
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=171429267181.10875.2633061764782446732.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=crecklin@redhat.com \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=pauld@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).