From: Qais Yousef <qais.yousef@arm.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: "Paul E . McKenney" <paulmck@kernel.org>,
Qais Yousef <qais.yousef@arm.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Jiri Kosina <jkosina@suse.cz>,
Nicholas Piggin <npiggin@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Ingo Molnar <mingo@kernel.org>,
Eiichi Tsukata <devel@etsukata.com>,
Zhenzhong Duan <zhenzhong.duan@oracle.com>,
Nadav Amit <namit@vmware.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 14/15] smp: Create a new function to bringup nonboot cpus online
Date: Sun, 23 Feb 2020 19:29:41 +0000 [thread overview]
Message-ID: <20200223192942.18420-15-qais.yousef@arm.com> (raw)
In-Reply-To: <20200223192942.18420-1-qais.yousef@arm.com>
This is the last direct user of cpu_up() before we can hide it now as
internal implementation detail of the cpu subsystem.
Signed-off-by: Qais Yousef <qais.yousef@arm.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Josh Poimboeuf <jpoimboe@redhat.com>
CC: "Peter Zijlstra (Intel)" <peterz@infradead.org>
CC: Jiri Kosina <jkosina@suse.cz>
CC: Nicholas Piggin <npiggin@gmail.com>
CC: Daniel Lezcano <daniel.lezcano@linaro.org>
CC: Ingo Molnar <mingo@kernel.org>
CC: Eiichi Tsukata <devel@etsukata.com>
CC: Zhenzhong Duan <zhenzhong.duan@oracle.com>
CC: Nadav Amit <namit@vmware.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
CC: linux-kernel@vger.kernel.org
---
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 aebe8186cb07..3d3caecef395 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);
extern int bringup_hibernate_cpu(unsigned int sleep_cpu);
+extern void smp_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 bf39c5bfb6d9..7c6aa427a3a3 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1299,6 +1299,18 @@ int bringup_hibernate_cpu(unsigned int sleep_cpu)
return 0;
}
+void smp_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 d0ada39eb4d4..9e793cfd6128 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -589,20 +589,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);
- }
+ smp_bringup_nonboot_cpus(setup_max_cpus);
num_nodes = num_online_nodes();
num_cpus = num_online_cpus();
--
2.17.1
next prev parent reply other threads:[~2020-02-23 19:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200223192942.18420-1-qais.yousef@arm.com>
2020-02-23 19:29 ` [PATCH v3 01/15] cpu: Add new {add,remove}_cpu() functions Qais Yousef
2020-02-23 19:29 ` [PATCH v3 02/15] smp: Create a new function to shutdown nonboot cpus Qais Yousef
2020-02-23 19:29 ` [PATCH v3 03/15] ia64: Replace cpu_down with smp_shutdown_nonboot_cpus() Qais Yousef
2020-02-23 19:29 ` [PATCH v3 04/15] arm: Don't use disable_nonboot_cpus() Qais Yousef
2020-03-20 11:04 ` Qais Yousef
2020-03-20 13:07 ` Russell King - ARM Linux admin
2020-03-20 13:41 ` Qais Yousef
2020-02-23 19:29 ` [PATCH v3 05/15] arm64: " Qais Yousef
2020-03-17 11:21 ` Catalin Marinas
2020-03-20 14:07 ` Qais Yousef
2020-02-23 19:29 ` [PATCH v3 06/15] arm64: hibernate.c: Create a new function to handle cpu_up(sleep_cpu) Qais Yousef
2020-03-17 11:21 ` Catalin Marinas
2020-02-23 19:29 ` [PATCH v3 07/15] x86: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-02-23 19:29 ` [PATCH v3 08/15] powerpc: " Qais Yousef
2020-02-23 19:29 ` [PATCH v3 09/15] sparc: " Qais Yousef
2020-02-23 19:29 ` [PATCH v3 10/15] parisc: " Qais Yousef
2020-02-23 19:29 ` [PATCH v3 11/15] driver: xen: Replace cpu_up/down with device_online/offline Qais Yousef
2020-02-23 19:29 ` [PATCH v3 12/15] firmware: psci: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-02-23 19:29 ` [PATCH v3 13/15] torture: " Qais Yousef
2020-02-24 2:53 ` Paul E. McKenney
2020-02-23 19:29 ` Qais Yousef [this message]
2020-02-23 19:29 ` [PATCH v3 15/15] cpu: Hide cpu_up/down 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=20200223192942.18420-15-qais.yousef@arm.com \
--to=qais.yousef@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=devel@etsukata.com \
--cc=gregkh@linuxfoundation.org \
--cc=jkosina@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namit@vmware.com \
--cc=npiggin@gmail.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--cc=zhenzhong.duan@oracle.com \
/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).