From: "tip-bot2 for Qais Yousef" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Qais Yousef <qais.yousef@arm.com>,
Thomas Gleixner <tglx@linutronix.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: smp/core] cpu/hotplug: Move bringup of secondary CPUs out of smp_init()
Date: Wed, 25 Mar 2020 12:06:00 -0000 [thread overview]
Message-ID: <158513796050.28353.7961406059999182214.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200323135110.30522-17-qais.yousef@arm.com>
The following commit has been merged into the smp/core branch of tip:
Commit-ID: b99a26593b5190fac6b5c1f81a7f8cc128a25c98
Gitweb: https://git.kernel.org/tip/b99a26593b5190fac6b5c1f81a7f8cc128a25c98
Author: Qais Yousef <qais.yousef@arm.com>
AuthorDate: Mon, 23 Mar 2020 13:51:09
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 25 Mar 2020 12:59:37 +01:00
cpu/hotplug: Move bringup of secondary CPUs out of smp_init()
This is the last direct user of cpu_up() before it can become an internal
implementation detail of the cpu subsystem.
Signed-off-by: Qais Yousef <qais.yousef@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200323135110.30522-17-qais.yousef@arm.com
---
include/linux/cpu.h | 1 +
kernel/cpu.c | 12 ++++++++++++
kernel/smp.c | 9 +--------
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 9dc1e89..8b295f7 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -94,6 +94,7 @@ void notify_cpu_starting(unsigned int cpu);
extern void cpu_maps_update_begin(void);
extern void cpu_maps_update_done(void);
int bringup_hibernate_cpu(unsigned int sleep_cpu);
+void bringup_nonboot_cpus(unsigned int setup_max_cpus);
#else /* CONFIG_SMP */
#define cpuhp_tasks_frozen 0
diff --git a/kernel/cpu.c b/kernel/cpu.c
index f803678..4783d81 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1298,6 +1298,18 @@ int bringup_hibernate_cpu(unsigned int sleep_cpu)
return 0;
}
+void bringup_nonboot_cpus(unsigned int setup_max_cpus)
+{
+ unsigned int cpu;
+
+ for_each_present_cpu(cpu) {
+ if (num_online_cpus() >= setup_max_cpus)
+ break;
+ if (!cpu_online(cpu))
+ cpu_up(cpu);
+ }
+}
+
#ifdef CONFIG_PM_SLEEP_SMP
static cpumask_var_t frozen_cpus;
diff --git a/kernel/smp.c b/kernel/smp.c
index 97f1d97..786092a 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -597,20 +597,13 @@ void __init setup_nr_cpu_ids(void)
void __init smp_init(void)
{
int num_nodes, num_cpus;
- unsigned int cpu;
idle_threads_init();
cpuhp_threads_init();
pr_info("Bringing up secondary CPUs ...\n");
- /* FIXME: This should be done in userspace --RR */
- for_each_present_cpu(cpu) {
- if (num_online_cpus() >= setup_max_cpus)
- break;
- if (!cpu_online(cpu))
- cpu_up(cpu);
- }
+ bringup_nonboot_cpus(setup_max_cpus);
num_nodes = num_online_nodes();
num_cpus = num_online_cpus();
next prev parent reply other threads:[~2020-03-25 12:06 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 13:50 [PATCH v4 00/17] Convert cpu_up/down to device_online/offline Qais Yousef
2020-03-23 13:50 ` [PATCH v4 01/17] cpu: Add new {add,remove}_cpu() functions Qais Yousef
2020-03-23 15:00 ` Paul E. McKenney
2020-03-25 12:06 ` [tip: smp/core] cpu/hotplug: " tip-bot2 for Qais Yousef
2020-03-23 13:50 ` [PATCH v4 02/17] smp: Create a new function to shutdown nonboot cpus Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] cpu/hotplug: " tip-bot2 for Qais Yousef
2020-03-23 13:50 ` [PATCH v4 03/17] ia64: Replace cpu_down with smp_shutdown_nonboot_cpus() Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] ia64: Replace cpu_down() " tip-bot2 for Qais Yousef
2020-03-23 13:50 ` [PATCH v4 04/17] arm: Don't use disable_nonboot_cpus() Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] ARM: " tip-bot2 for Qais Yousef
2020-03-23 13:50 ` [PATCH v4 05/17] arm: Use reboot_cpu instead of hardcoding it to 0 Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] ARM: " tip-bot2 for Qais Yousef
2020-03-23 13:50 ` [PATCH v4 06/17] arm64: Don't use disable_nonboot_cpus() Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] " tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 07/17] arm64: Use reboot_cpu instead of hardconding it to 0 Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] " tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 08/17] arm64: hibernate.c: Create a new function to handle cpu_up(sleep_cpu) Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] arm64: hibernate: Use bringup_hibernate_cpu() tip-bot2 for Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] cpu/hotplug: Provide bringup_hibernate_cpu() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 09/17] x86: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] x86/smp: Replace cpu_up/down() with add/remove_cpu() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 10/17] powerpc: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] powerpc: Replace cpu_up/down() with add/remove_cpu() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 11/17] sparc: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] sparc: Replace cpu_up/down() with add/remove_cpu() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 12/17] parisc: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] parisc: Replace cpu_up/down() with add/remove_cpu() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 13/17] driver: xen: Replace cpu_up/down with device_online/offline Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] xen/cpuhotplug: Replace cpu_up/down() with device_online/offline() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 14/17] firmware: psci: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] firmware: psci: Replace cpu_up/down() with add/remove_cpu() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 15/17] torture: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-03-25 12:06 ` [tip: smp/core] torture: Replace cpu_up/down() with add/remove_cpu() tip-bot2 for Qais Yousef
2020-03-23 13:51 ` [PATCH v4 16/17] smp: Create a new function to bringup nonboot cpus online Qais Yousef
2020-03-25 12:06 ` tip-bot2 for Qais Yousef [this message]
2020-03-23 13:51 ` [PATCH v4 17/17] cpu: Hide cpu_up/down Qais Yousef
2020-03-25 12:05 ` [tip: smp/core] cpu/hotplug: Hide cpu_up/down() tip-bot2 for Qais Yousef
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=158513796050.28353.7961406059999182214.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=qais.yousef@arm.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
all inboxes | Powered by JetHome®