mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Frederic Weisbecker" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Frederic Weisbecker <frederic@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] tick: Move broadcast cancellation up to CPUHP_AP_TICK_DYING
Date: Mon, 26 Feb 2024 22:24:33 -0000	[thread overview]
Message-ID: <170898627396.398.11666022364724351280.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240225225508.11587-10-frederic@kernel.org>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     ef8969bb552c1c75e997a42d3e2c576b6ed4025a
Gitweb:        https://git.kernel.org/tip/ef8969bb552c1c75e997a42d3e2c576b6ed4025a
Author:        Frederic Weisbecker <frederic@kernel.org>
AuthorDate:    Sun, 25 Feb 2024 23:55:01 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 26 Feb 2024 11:37:32 +01:00

tick: Move broadcast cancellation up to CPUHP_AP_TICK_DYING

The broadcast shutdown code is executed through a random explicit call
within stop machine from the outgoing CPU.

However the tick broadcast is a midware between the tick callback and
the clocksource, therefore it makes more sense to shut it down after the
tick callback and before the clocksource drivers.

Move it instead to the common tick shutdown CPU hotplug state where
related operations can be ordered from highest to lowest level.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240225225508.11587-10-frederic@kernel.org

---
 include/linux/tick.h        | 6 ------
 kernel/cpu.c                | 2 --
 kernel/time/tick-common.c   | 3 +++
 kernel/time/tick-internal.h | 2 ++
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/linux/tick.h b/include/linux/tick.h
index afff4c2..c7840ae 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -73,12 +73,6 @@ extern void tick_broadcast_control(enum tick_broadcast_mode mode);
 static inline void tick_broadcast_control(enum tick_broadcast_mode mode) { }
 #endif /* BROADCAST */
 
-#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_HOTPLUG_CPU)
-extern void tick_offline_cpu(unsigned int cpu);
-#else
-static inline void tick_offline_cpu(unsigned int cpu) { }
-#endif
-
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern int tick_broadcast_oneshot_control(enum tick_broadcast_state state);
 #else
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 2635080..5a8ad4f 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1324,8 +1324,6 @@ static int take_cpu_down(void *_param)
 	 */
 	cpuhp_invoke_callback_range_nofail(false, cpu, st, target);
 
-	/* Remove CPU from timer broadcasting */
-	tick_offline_cpu(cpu);
 	/* Park the stopper thread */
 	stop_machine_park(cpu);
 	return 0;
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index b4af8c7..5224140 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -412,6 +412,9 @@ int tick_cpu_dying(unsigned int dying_cpu)
 
 	tick_cancel_sched_timer(dying_cpu);
 
+	/* Remove CPU from timer broadcasting */
+	tick_offline_cpu(dying_cpu);
+
 	return 0;
 }
 
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index a3243c4..5f2105e 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -142,8 +142,10 @@ static inline bool tick_broadcast_oneshot_available(void) { return tick_oneshot_
 #endif /* !(BROADCAST && ONESHOT) */
 
 #if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_HOTPLUG_CPU)
+extern void tick_offline_cpu(unsigned int cpu);
 extern void tick_broadcast_offline(unsigned int cpu);
 #else
+static inline void tick_offline_cpu(unsigned int cpu) { }
 static inline void tick_broadcast_offline(unsigned int cpu) { }
 #endif
 

  reply	other threads:[~2024-02-26 22:24 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-25 22:54 [PATCH 00/16 v3] timers/nohz cleanups and hotplug reorganization Frederic Weisbecker
2024-02-25 22:54 ` [PATCH 01/16] tick/nohz: Remove duplicate between tick_nohz_switch_to_nohz() and tick_setup_sched_timer() Frederic Weisbecker
2024-02-26  8:14   ` Thomas Gleixner
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Peng Liu
2024-02-25 22:54 ` [PATCH 02/16] tick/nohz: Remove duplicate between lowres and highres handlers Frederic Weisbecker
2024-02-26  8:15   ` Thomas Gleixner
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Peng Liu
2024-02-25 22:54 ` [PATCH 03/16] tick: Remove useless oneshot ifdeffery Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] tick/sched: " tip-bot2 for Frederic Weisbecker
2024-02-25 22:54 ` [PATCH 04/16] tick: Use IS_ENABLED() whenever possible Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:54 ` [PATCH 05/16] tick: s/tick_nohz_stop_sched_tick/tick_nohz_full_stop_tick Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] tick/sched: Rename tick_nohz_stop_sched_tick() to tick_nohz_full_stop_tick() tip-bot2 for Frederic Weisbecker
2024-02-25 22:54 ` [PATCH 06/16] tick: No need to clear ts->next_tick again Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] tick/sched: Don't clear ts::next_tick again in can_stop_idle_tick() tip-bot2 for Frederic Weisbecker
2024-02-25 22:54 ` [PATCH 07/16] tick: Start centralizing tick related CPU hotplug operations Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 08/16] tick: Move tick cancellation up to CPUHP_AP_TICK_DYING Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 09/16] tick: Move broadcast " Frederic Weisbecker
2024-02-26 22:24   ` tip-bot2 for Frederic Weisbecker [this message]
2024-02-25 22:55 ` [PATCH 10/16] tick: Assume the tick can't be stopped in NOHZ_MODE_INACTIVE mode Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 11/16] tick: Move got_idle_tick away from common flags Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 12/16] tick: Move individual bit features to debuggable mask accesses Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 13/16] tick: Split nohz and highres features from nohz_mode Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 14/16] tick: Shut down low-res tick from dying CPU Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 15/16] tick: Assume timekeeping is correctly handed over upon last offline idle call Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2024-02-25 22:55 ` [PATCH 16/16] timers: Assert no next dyntick timer look-up while CPU is offline Frederic Weisbecker
2024-02-26 22:24   ` [tip: timers/core] " tip-bot2 for 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=170898627396.398.11666022364724351280.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=frederic@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --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

all inboxes | Powered by JetHome®