From: Oleg Nesterov <oleg@redhat.com>
To: Frederic Weisbecker <frederic@kernel.org>,
Ingo Molnar <mingo@redhat.com>,
Nicholas Piggin <npiggin@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Phil Auld <pauld@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Chris von Recklinghausen <crecklin@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] tick/nohz_full: don't abuse smp_call_function_single() in tick_setup_device()
Date: Tue, 28 May 2024 14:20:19 +0200 [thread overview]
Message-ID: <20240528122019.GA28794@redhat.com> (raw)
In-Reply-To: <20240522151742.GA10400@redhat.com>
After the recent commit 5097cbcb38e6 ("sched/isolation: Prevent boot
crash when the boot CPU is nohz_full") the kernel no longer crashes, but
there is another problem.
In this case tick_setup_device() calls tick_take_do_timer_from_boot() to
update tick_do_timer_cpu and this triggers the WARN_ON_ONCE(irqs_disabled)
in smp_call_function_single().
Kill tick_take_do_timer_from_boot() and just use WRITE_ONCE(), the new
comment tries to explain why this is safe (thanks Thomas!).
Fixes: 08ae95f4fd3b ("nohz_full: Allow the boot CPU to be nohz_full")
Link: https://lore.kernel.org/all/20240522151742.GA10400@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/time/tick-common.c | 39 +++++++++++++--------------------------
1 file changed, 13 insertions(+), 26 deletions(-)
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index d88b13076b79..27d0018c8b05 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -178,26 +178,6 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
}
}
-#ifdef CONFIG_NO_HZ_FULL
-static void giveup_do_timer(void *info)
-{
- int cpu = *(unsigned int *)info;
-
- WARN_ON(tick_do_timer_cpu != smp_processor_id());
-
- tick_do_timer_cpu = cpu;
-}
-
-static void tick_take_do_timer_from_boot(void)
-{
- int cpu = smp_processor_id();
- int from = tick_do_timer_boot_cpu;
-
- if (from >= 0 && from != cpu)
- smp_call_function_single(from, giveup_do_timer, &cpu, 1);
-}
-#endif
-
/*
* Setup the tick device
*/
@@ -221,19 +201,26 @@ static void tick_setup_device(struct tick_device *td,
tick_next_period = ktime_get();
#ifdef CONFIG_NO_HZ_FULL
/*
- * The boot CPU may be nohz_full, in which case set
- * tick_do_timer_boot_cpu so the first housekeeping
- * secondary that comes up will take do_timer from
- * us.
+ * The boot CPU may be nohz_full, in which case the
+ * first housekeeping secondary will take do_timer()
+ * from us.
*/
if (tick_nohz_full_cpu(cpu))
tick_do_timer_boot_cpu = cpu;
} else if (tick_do_timer_boot_cpu != -1 &&
!tick_nohz_full_cpu(cpu)) {
- tick_take_do_timer_from_boot();
tick_do_timer_boot_cpu = -1;
- WARN_ON(READ_ONCE(tick_do_timer_cpu) != cpu);
+ /*
+ * The boot CPU will stay in periodic (NOHZ disabled)
+ * mode until clocksource_done_booting() called after
+ * smp_init() selects a high resolution clocksource and
+ * timekeeping_notify() kicks the NOHZ stuff alive.
+ *
+ * So this WRITE_ONCE can only race with the READ_ONCE
+ * check in tick_periodic() but this race is harmless.
+ */
+ WRITE_ONCE(tick_do_timer_cpu, cpu);
#endif
}
--
2.25.1.362.g51ebf55
next prev parent reply other threads:[~2024-05-28 12:21 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 15:17 sched/isolation: tick_take_do_timer_from_boot() calls smp_call_function_single() with irqs disabled Oleg Nesterov
2024-05-23 13:23 ` Oleg Nesterov
2024-05-24 9:31 ` Thomas Gleixner
2024-05-24 14:10 ` Oleg Nesterov
2024-05-24 15:22 ` Frederic Weisbecker
2024-05-24 15:20 ` Frederic Weisbecker
2024-05-24 17:16 ` Thomas Gleixner
2024-05-24 18:37 ` Oleg Nesterov
2024-05-24 22:06 ` Thomas Gleixner
2024-05-25 13:51 ` Oleg Nesterov
2024-05-25 14:13 ` Oleg Nesterov
2024-05-26 19:27 ` Oleg Nesterov
2024-05-26 20:52 ` Frederic Weisbecker
2024-05-27 15:57 ` Oleg Nesterov
2024-05-27 11:01 ` Nicholas Piggin
2024-05-27 15:57 ` Oleg Nesterov
2024-05-28 1:02 ` Nicholas Piggin
2024-05-28 12:19 ` Oleg Nesterov
2024-05-27 16:13 ` Thomas Gleixner
2024-05-26 20:57 ` Frederic Weisbecker
2024-05-27 9:10 ` Nicholas Piggin
2024-05-27 10:23 ` Thomas Gleixner
2024-05-27 11:16 ` Nicholas Piggin
2024-05-28 12:20 ` Oleg Nesterov [this message]
2024-05-28 12:22 ` [PATCH] tick/nohz_full: don't abuse smp_call_function_single() in tick_setup_device() Oleg Nesterov
2024-05-30 12:40 ` [PATCH] tick/nohz_full: turn tick_do_timer_boot_cpu into boot_cpu_is_nohz_full Oleg Nesterov
2024-06-03 15:35 ` [PATCH v2] " Oleg Nesterov
2024-06-03 21:44 ` Frederic Weisbecker
2024-06-04 5:08 ` Nicholas Piggin
2024-05-30 14:52 ` [PATCH] tick/nohz_full: don't abuse smp_call_function_single() in tick_setup_device() Frederic Weisbecker
2024-05-30 16:52 ` Oleg Nesterov
2024-05-30 17:01 ` Oleg Nesterov
2024-06-01 14:03 ` Oleg Nesterov
2024-06-02 21:29 ` Frederic Weisbecker
2024-06-03 15:41 ` Oleg Nesterov
2024-06-03 21:45 ` Frederic Weisbecker
2024-06-10 15:55 ` [PING ;)] " Oleg Nesterov
2024-06-10 18:15 ` Thomas Gleixner
2024-06-10 18:26 ` [tip: timers/urgent] tick/nohz_full: Don't " tip-bot2 for Oleg Nesterov
2024-06-10 19:42 ` Frederic Weisbecker
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=20240528122019.GA28794@redhat.com \
--to=oleg@redhat.com \
--cc=crecklin@redhat.com \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=npiggin@gmail.com \
--cc=pauld@redhat.com \
--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