linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Qais Yousef <qais.yousef@arm.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.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>
Subject: [PATCH v4 16/17] smp: Create a new function to bringup nonboot cpus online
Date: Mon, 23 Mar 2020 13:51:09 +0000	[thread overview]
Message-ID: <20200323135110.30522-17-qais.yousef@arm.com> (raw)
In-Reply-To: <20200323135110.30522-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


  parent reply	other threads:[~2020-03-23 13:52 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 ` Qais Yousef [this message]
2020-03-25 12:06   ` [tip: smp/core] cpu/hotplug: Move bringup of secondary CPUs out of smp_init() tip-bot2 for Qais Yousef
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=20200323135110.30522-17-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=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).