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 v2] tick/nohz_full: turn tick_do_timer_boot_cpu into boot_cpu_is_nohz_full
Date: Mon, 3 Jun 2024 17:35:57 +0200 [thread overview]
Message-ID: <20240603153557.GA8311@redhat.com> (raw)
In-Reply-To: <20240530124032.GA26833@redhat.com>
We don't need to record the cpu number of the nohz_full boot CPU, a simple
boolean is enough. We could even kill it, the "else if" branch could check
tick_nohz_full_cpu(tick_do_timer_cpu) && !tick_nohz_full_cpu(cpu).
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/time/tick-common.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 27d0018c8b05..82c1b2206631 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -49,15 +49,6 @@ ktime_t tick_next_period;
* procedure also covers cpu hotplug.
*/
int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT;
-#ifdef CONFIG_NO_HZ_FULL
-/*
- * tick_do_timer_boot_cpu indicates the boot CPU temporarily owns
- * tick_do_timer_cpu and it should be taken over by an eligible secondary
- * when one comes online.
- */
-static int tick_do_timer_boot_cpu __read_mostly = -1;
-#endif
-
/*
* Debugging: see timer_list.c
*/
@@ -192,6 +183,7 @@ static void tick_setup_device(struct tick_device *td,
* First device setup ?
*/
if (!td->evtdev) {
+ static bool boot_cpu_is_nohz_full __read_mostly;
/*
* If no cpu took the do_timer update, assign it to
* this cpu:
@@ -199,18 +191,14 @@ static void tick_setup_device(struct tick_device *td,
if (READ_ONCE(tick_do_timer_cpu) == TICK_DO_TIMER_BOOT) {
WRITE_ONCE(tick_do_timer_cpu, cpu);
tick_next_period = ktime_get();
-#ifdef CONFIG_NO_HZ_FULL
/*
* 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_do_timer_boot_cpu = -1;
+ boot_cpu_is_nohz_full = tick_nohz_full_cpu(cpu);
+ } else if (boot_cpu_is_nohz_full && !tick_nohz_full_cpu(cpu)) {
+ boot_cpu_is_nohz_full = false;
/*
* The boot CPU will stay in periodic (NOHZ disabled)
* mode until clocksource_done_booting() called after
@@ -221,7 +209,6 @@ static void tick_setup_device(struct tick_device *td,
* 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-06-03 15:37 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 ` [PATCH] tick/nohz_full: don't abuse smp_call_function_single() in tick_setup_device() Oleg Nesterov
2024-05-28 12:22 ` 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 ` Oleg Nesterov [this message]
2024-06-03 21:44 ` [PATCH v2] " 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=20240603153557.GA8311@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