From: Anup Patel <anup@brainfault.org>
To: Atish Patra <atish.patra@wdc.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>,
Jason Cooper <jason@lakedaemon.net>,
Nick Hu <nickhu@andestech.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
"linux-kernel@vger.kernel.org List"
<linux-kernel@vger.kernel.org>,
Mike Rapoport <rppt@linux.ibm.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Vincent Chen <vincent.chen@sifive.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Marc Zyngier <maz@kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
linux-riscv <linux-riscv@lists.infradead.org>,
Borislav Petkov <bp@suse.de>,
Thomas Gleixner <tglx@linutronix.de>, Mao Han <han_mao@c-sky.com>,
Kees Cook <keescook@chromium.org>
Subject: Re: [PATCH v9 11/12] RISC-V: Support cpu hotplug
Date: Fri, 21 Feb 2020 11:42:12 +0530 [thread overview]
Message-ID: <CAAhSdy2tHH8e5j9nBdjAc-WoNrmTZxr_S4rWBUFvBOnRTJ86Eg@mail.gmail.com> (raw)
In-Reply-To: <20200221004413.12869-12-atish.patra@wdc.com>
On Fri, Feb 21, 2020 at 6:14 AM Atish Patra <atish.patra@wdc.com> wrote:
>
> This patch enable support for cpu hotplug in RISC-V. It uses SBI HSM
> extension to online/offline any hart. As a result, the harts are
> returned to firmware once they are offline. If the harts are brought
> online afterwards, they re-enter Linux kernel as if a secondary hart
> booted for the first time. All booting requirements are honored during
> this process.
>
> Tested both on QEMU and HighFive Unleashed board with. Test result follows.
>
> ---------------------------------------------------
> Offline cpu 2
> ---------------------------------------------------
> $ echo 0 > /sys/devices/system/cpu/cpu2/online
> [ 32.828684] CPU2: off
> $ cat /proc/cpuinfo
> processor : 0
> hart : 0
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 1
> hart : 1
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 3
> hart : 3
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 4
> hart : 4
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 5
> hart : 5
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 6
> hart : 6
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 7
> hart : 7
> isa : rv64imafdcsu
> mmu : sv48
>
> ---------------------------------------------------
> online cpu 2
> ---------------------------------------------------
> $ echo 1 > /sys/devices/system/cpu/cpu2/online
> $ cat /proc/cpuinfo
> processor : 0
> hart : 0
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 1
> hart : 1
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 2
> hart : 2
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 3
> hart : 3
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 4
> hart : 4
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 5
> hart : 5
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 6
> hart : 6
> isa : rv64imafdcsu
> mmu : sv48
>
> processor : 7
> hart : 7
> isa : rv64imafdcsu
> mmu : sv48
>
> Signed-off-by: Atish Patra <atish.patra@wdc.com>
> ---
> arch/riscv/Kconfig | 12 ++++-
> arch/riscv/include/asm/cpu_ops.h | 12 +++++
> arch/riscv/include/asm/smp.h | 17 +++++++
> arch/riscv/kernel/Makefile | 1 +
> arch/riscv/kernel/cpu-hotplug.c | 87 ++++++++++++++++++++++++++++++++
> arch/riscv/kernel/cpu_ops_sbi.c | 34 +++++++++++++
> arch/riscv/kernel/setup.c | 19 ++++++-
> 7 files changed, 180 insertions(+), 2 deletions(-)
> create mode 100644 arch/riscv/kernel/cpu-hotplug.c
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 8c0f5385fa30..27bfc7947e44 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -20,7 +20,6 @@ config RISCV
> select CLONE_BACKWARDS
> select COMMON_CLK
> select GENERIC_CLOCKEVENTS
> - select GENERIC_CPU_DEVICES
> select GENERIC_IRQ_SHOW
> select GENERIC_PCI_IOMAP
> select GENERIC_SCHED_CLOCK
> @@ -247,6 +246,17 @@ config NR_CPUS
> depends on SMP
> default "8"
>
> +config HOTPLUG_CPU
> + bool "Support for hot-pluggable CPUs"
> + depends on SMP
> + select GENERIC_IRQ_MIGRATION
> + help
> +
> + Say Y here to experiment with turning CPUs off and on. CPUs
> + can be controlled through /sys/devices/system/cpu.
> +
> + Say N if you want to disable CPU hotplug.
> +
> choice
> prompt "CPU Tuning"
> default TUNE_GENERIC
> diff --git a/arch/riscv/include/asm/cpu_ops.h b/arch/riscv/include/asm/cpu_ops.h
> index daf29f70407d..efd6700d245d 100644
> --- a/arch/riscv/include/asm/cpu_ops.h
> +++ b/arch/riscv/include/asm/cpu_ops.h
> @@ -18,12 +18,24 @@
> * is a mechanism for doing so, tests whether it is
> * possible to boot the given HART.
> * @cpu_start: Boots a cpu into the kernel.
> + * @cpu_disable: Prepares a cpu to die. May fail for some
> + * mechanism-specific reason, which will cause the hot
> + * unplug to be aborted. Called from the cpu to be killed.
> + * @cpu_stop: Makes a cpu leave the kernel. Must not fail. Called from
> + * the cpu being stopped.
> + * @cpu_is_stopped: Ensures a cpu has left the kernel. Called from another
> + * cpu.
> */
> struct cpu_operations {
> const char *name;
> int (*cpu_prepare)(unsigned int cpu);
> int (*cpu_start)(unsigned int cpu,
> struct task_struct *tidle);
> +#ifdef CONFIG_HOTPLUG_CPU
> + int (*cpu_disable)(unsigned int cpu);
> + void (*cpu_stop)(void);
> + int (*cpu_is_stopped)(unsigned int cpu);
> +#endif
> };
>
> extern const struct cpu_operations *cpu_ops[NR_CPUS];
> diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h
> index 023f74fb8b3b..f4c7cfda6b7f 100644
> --- a/arch/riscv/include/asm/smp.h
> +++ b/arch/riscv/include/asm/smp.h
> @@ -43,6 +43,13 @@ void riscv_cpuid_to_hartid_mask(const struct cpumask *in, struct cpumask *out);
> */
> #define raw_smp_processor_id() (current_thread_info()->cpu)
>
> +#if defined CONFIG_HOTPLUG_CPU
> +int __cpu_disable(void);
> +void __cpu_die(unsigned int cpu);
> +void cpu_stop(void);
> +#else
> +#endif /* CONFIG_HOTPLUG_CPU */
> +
> #else
>
> static inline void show_ipi_stats(struct seq_file *p, int prec)
> @@ -69,4 +76,14 @@ static inline void riscv_cpuid_to_hartid_mask(const struct cpumask *in,
> }
>
> #endif /* CONFIG_SMP */
> +
> +#if defined(CONFIG_HOTPLUG_CPU) && (CONFIG_SMP)
> +bool cpu_has_hotplug(unsigned int cpu);
> +#else
> +static inline bool cpu_has_hotplug(unsigned int cpu)
> +{
> + return false;
> +}
> +#endif
> +
> #endif /* _ASM_RISCV_SMP_H */
> diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile
> index a0be34b96846..9601ac907f70 100644
> --- a/arch/riscv/kernel/Makefile
> +++ b/arch/riscv/kernel/Makefile
> @@ -47,5 +47,6 @@ obj-$(CONFIG_RISCV_SBI) += sbi.o
> ifeq ($(CONFIG_RISCV_SBI), y)
> obj-$(CONFIG_SMP) += cpu_ops_sbi.o
> endif
> +obj-$(CONFIG_HOTPLUG_CPU) += cpu-hotplug.o
>
> clean:
> diff --git a/arch/riscv/kernel/cpu-hotplug.c b/arch/riscv/kernel/cpu-hotplug.c
> new file mode 100644
> index 000000000000..2a37cfb6eb46
> --- /dev/null
> +++ b/arch/riscv/kernel/cpu-hotplug.c
> @@ -0,0 +1,87 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2018 Western Digital Corporation or its affiliates.
Use Copyright (C) 2020 here and all other patches.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/mm.h>
> +#include <linux/sched.h>
> +#include <linux/err.h>
> +#include <linux/irq.h>
> +#include <linux/cpu.h>
> +#include <linux/sched/hotplug.h>
> +#include <asm/irq.h>
> +#include <asm/cpu_ops.h>
> +#include <asm/sbi.h>
> +
> +void cpu_stop(void);
> +void arch_cpu_idle_dead(void)
> +{
> + cpu_stop();
> +}
> +
> +bool cpu_has_hotplug(unsigned int cpu)
> +{
> + if (cpu_ops[cpu]->cpu_stop)
> + return true;
> +
> + return false;
> +}
> +
> +/*
> + * __cpu_disable runs on the processor to be shutdown.
> + */
> +int __cpu_disable(void)
> +{
> + int ret = 0;
> + unsigned int cpu = smp_processor_id();
> +
> + if (!cpu_ops[cpu] || !cpu_ops[cpu]->cpu_stop)
> + return -EOPNOTSUPP;
> +
> + if (cpu_ops[cpu]->cpu_disable)
> + ret = cpu_ops[cpu]->cpu_disable(cpu);
> +
> + if (ret)
> + return ret;
> +
> + remove_cpu_topology(cpu);
> + set_cpu_online(cpu, false);
> + irq_migrate_all_off_this_cpu();
> +
> + return ret;
> +}
> +
> +/*
> + * Called on the thread which is asking for a CPU to be shutdown.
> + */
> +void __cpu_die(unsigned int cpu)
> +{
> + int ret = 0;
> +
> + if (!cpu_wait_death(cpu, 5)) {
> + pr_err("CPU %u: didn't die\n", cpu);
> + return;
> + }
> + pr_notice("CPU%u: off\n", cpu);
> +
> + /* Verify from the firmware if the cpu is really stopped*/
> + if (cpu_ops[cpu]->cpu_is_stopped)
> + ret = cpu_ops[cpu]->cpu_is_stopped(cpu);
> + if (ret)
> + pr_warn("CPU%d may not have stopped: %d\n", cpu, ret);
> +}
> +
> +/*
> + * Called from the idle thread for the CPU which has been shutdown.
> + */
> +void cpu_stop(void)
> +{
> + idle_task_exit();
> +
> + (void)cpu_report_death();
> +
> + cpu_ops[smp_processor_id()]->cpu_stop();
> + /* It should never reach here */
> + BUG();
> +}
> diff --git a/arch/riscv/kernel/cpu_ops_sbi.c b/arch/riscv/kernel/cpu_ops_sbi.c
> index 70d02dfe0ab8..8848c5b6e1c4 100644
> --- a/arch/riscv/kernel/cpu_ops_sbi.c
> +++ b/arch/riscv/kernel/cpu_ops_sbi.c
> @@ -74,8 +74,42 @@ static int sbi_cpu_prepare(unsigned int cpuid)
> return 0;
> }
>
> +#ifdef CONFIG_HOTPLUG_CPU
> +static int sbi_cpu_disable(unsigned int cpuid)
> +{
> + if (!cpu_ops_sbi.cpu_stop)
> + return -EOPNOTSUPP;
> + return 0;
> +}
> +
> +static void sbi_cpu_stop(void)
> +{
> + int ret;
> +
> + ret = sbi_hsm_hart_stop();
> + pr_crit("Unable to stop the cpu %u (%d)\n", smp_processor_id(), ret);
> +}
> +
> +static int sbi_cpu_is_stopped(unsigned int cpuid)
> +{
> + int rc;
> + int hartid = cpuid_to_hartid_map(cpuid);
> +
> + rc = sbi_hsm_hart_get_status(hartid);
> +
> + if (rc == SBI_HSM_HART_STATUS_NOT_AVAILABLE)
> + return 0;
> + return rc;
> +}
> +#endif
> +
> const struct cpu_operations cpu_ops_sbi = {
> .name = "sbi",
> .cpu_prepare = sbi_cpu_prepare,
> .cpu_start = sbi_cpu_start,
> +#ifdef CONFIG_HOTPLUG_CPU
> + .cpu_disable = sbi_cpu_disable,
> + .cpu_stop = sbi_cpu_stop,
> + .cpu_is_stopped = sbi_cpu_is_stopped,
> +#endif
> };
> diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
> index 582ecbed6442..b3f8986a3b25 100644
> --- a/arch/riscv/kernel/setup.c
> +++ b/arch/riscv/kernel/setup.c
> @@ -16,12 +16,13 @@
> #include <linux/of_platform.h>
> #include <linux/sched/task.h>
> #include <linux/swiotlb.h>
> +#include <linux/smp.h>
>
> #include <asm/clint.h>
> +#include <asm/cpu_ops.h>
> #include <asm/setup.h>
> #include <asm/sections.h>
> #include <asm/pgtable.h>
> -#include <asm/smp.h>
> #include <asm/sbi.h>
> #include <asm/tlbflush.h>
> #include <asm/thread_info.h>
> @@ -43,6 +44,7 @@ struct screen_info screen_info = {
> /* The lucky hart to first increment this variable will boot the other cores */
> atomic_t hart_lottery;
> unsigned long boot_cpu_hartid;
> +static DEFINE_PER_CPU(struct cpu, cpu_devices);
>
> void __init parse_dtb(void)
> {
> @@ -90,3 +92,18 @@ void __init setup_arch(char **cmdline_p)
>
> riscv_fill_hwcap();
> }
> +
> +static int __init topology_init(void)
> +{
> + int i;
> +
> + for_each_possible_cpu(i) {
> + struct cpu *cpu = &per_cpu(cpu_devices, i);
> +
> + cpu->hotpluggable = cpu_has_hotplug(i);
> + register_cpu(cpu, i);
> + }
> +
> + return 0;
> +}
> +subsys_initcall(topology_init);
> --
> 2.25.0
>
Otherwise, looks good to me.
Reviewed-by: Anup Patel <anup@brainfault.org>
Regards,
Anup
next prev parent reply other threads:[~2020-02-21 6:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 0:44 [PATCH v9 00/12] Add support for SBI v0.2 and CPU hotplug Atish Patra
2020-02-21 0:44 ` [PATCH v9 01/12] RISC-V: Mark existing SBI as 0.1 SBI Atish Patra
2020-02-21 0:44 ` [PATCH v9 02/12] RISC-V: Add basic support for SBI v0.2 Atish Patra
2020-03-09 10:33 ` Bin Meng
2020-03-10 6:21 ` Atish Patra
2020-02-21 0:44 ` [PATCH v9 03/12] RISC-V: Add SBI v0.2 extension definitions Atish Patra
2020-02-21 0:44 ` [PATCH v9 04/12] RISC-V: Introduce a new config for SBI v0.1 Atish Patra
2020-02-21 0:44 ` [PATCH v9 05/12] RISC-V: Implement new SBI v0.2 extensions Atish Patra
2020-02-21 0:44 ` [PATCH v9 06/12] RISC-V: Move relocate and few other functions out of __init Atish Patra
2020-02-21 0:44 ` [PATCH v9 07/12] RISC-V: Add cpu_ops and modify default booting method Atish Patra
2020-02-21 0:44 ` [PATCH v9 08/12] RISC-V: Export SBI error to linux error mapping function Atish Patra
2020-02-21 6:01 ` Anup Patel
2020-02-21 0:44 ` [PATCH v9 09/12] RISC-V: Add SBI HSM extension definitions Atish Patra
2020-02-21 6:03 ` Anup Patel
2020-02-21 0:44 ` [PATCH v9 10/12] RISC-V: Add supported for ordered booting method using HSM Atish Patra
2020-02-21 6:08 ` Anup Patel
2020-02-21 0:44 ` [PATCH v9 11/12] RISC-V: Support cpu hotplug Atish Patra
2020-02-21 6:12 ` Anup Patel [this message]
2020-02-21 0:44 ` [PATCH v9 12/12] irqchip/sifive-plic: Initialize the plic handler when cpu comes online Atish Patra
2020-02-21 6:14 ` Anup Patel
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=CAAhSdy2tHH8e5j9nBdjAc-WoNrmTZxr_S4rWBUFvBOnRTJ86Eg@mail.gmail.com \
--to=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atish.patra@wdc.com \
--cc=bp@suse.de \
--cc=daniel.lezcano@linaro.org \
--cc=ebiederm@xmission.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=han_mao@c-sky.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jason@lakedaemon.net \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=maz@kernel.org \
--cc=nickhu@andestech.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rppt@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=vincent.chen@sifive.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).