reboot: support offline CPUs before reboot
Subsystems (14)
PATCH RESEND v4 1/1 reboot: support offline CPUs before reboot
Currently system reboots uses architecture specific codes (smp_send_stop) to offline non reboot CPUs. Most architecture's implementation is looping through all non reboot online CPUs and call ipi function to each of them. Some architecture like arm64, arm, and x86... would set offline masks to cpu without really offline them. This causes some race condition and kernel warning comes out sometimes when system reboots.
This patch adds a config ARCH_OFFLINE_CPUS_ON_REBOOT, which would offline cpus in migrate_to_reboot_cpu(). If non reboot cpus are all offlined here, the loop for checking online cpus would be an empty loop. If architecture don't enable this config, or some cpus somehow fails to offline, it would fallback to ipi function.
Opt in this config for architectures that support CONFIG_HOTPLUG_CPU.
---
Resend v4:
* Cc more people and mailing lists. Also fix a few nits from v4.
Change from v3:
* Opt in config for architectures that support CONFIG_HOTPLUG_CPU
* Merge function offline_secondary_cpus() and freeze_secondary_cpus() with an additional flag.
Change from v2:
* Add another config instead of configed by CONFIG_HOTPLUG_CPU
Previous related discussion on list:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/patchwork/patch/1117201/
--- arch/Kconfig | 5 +++++ arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/arm64/kernel/hibernate.c | 2 +- arch/csky/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/xtensa/Kconfig | 1 + drivers/power/reset/sc27xx-poweroff.c | 2 +- include/linux/cpu.h | 9 ++++++--- kernel/cpu.c | 12 ++++++++---- kernel/reboot.c | 8 ++++++++ 18 files changed, 41 insertions(+), 9 deletions(-)
arch/Kconfig +5 -0
@@ -255,6 +255,11 @@ config ARCH_HAS_UNCACHED_SEGMENT select ARCH_HAS_DMA_PREP_COHERENT bool +# Select to do a full offline on secondary CPUs before reboot. +config ARCH_OFFLINE_CPUS_ON_REBOOT + bool "Support for offline CPUs before reboot" + depends on HOTPLUG_CPU + # Select if arch init_task must go in the __init_task_data section config ARCH_TASK_STRUCT_ON_STACK bool
arch/arm/Kconfig +1 -0
@@ -28,6 +28,7 @@ config ARM select ARCH_KEEP_MEMBLOCK if HAVE_ARCH_PFN_VALID || KEXEC select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_NO_SG_CHAIN if !ARM_HAS_SG_CHAIN + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7 select ARCH_SUPPORTS_ATOMIC_RMW
arch/arm64/Kconfig +1 -0
@@ -61,6 +61,7 @@ config ARM64 select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPTION select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION select ARCH_KEEP_MEMBLOCK + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS
arch/arm64/kernel/hibernate.c +1 -1
@@ -581,5 +581,5 @@ int hibernate_resume_nonboot_cpu_disable(void)return -ENODEV ; } -return freeze_secondary_cpus (sleep_cpu); +return freeze_secondary_cpus (sleep_cpu, false); }
arch/csky/Kconfig +1 -0
@@ -5,6 +5,7 @@ config CSKY select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_QUEUED_RWLOCKS if NR_CPUS>2 select COMMON_CLK
arch/ia64/Kconfig +1 -0
@@ -10,6 +10,7 @@ config IA64 bool select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ACPI select ACPI_NUMA if NUMA select ARCH_SUPPORTS_ACPI
arch/mips/Kconfig +1 -0
@@ -8,6 +8,7 @@ config MIPS select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAS_FORTIFY_SOURCE + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_SUPPORTS_UPROBES select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
arch/parisc/Kconfig +1 -0
@@ -13,6 +13,7 @@ config PARISC select ARCH_HAS_STRICT_KERNEL_RWX select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_NO_SG_CHAIN + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_SUPPORTS_MEMORY_FAILURE select RTC_CLASS select RTC_DRV_GENERIC
arch/powerpc/Kconfig +1 -0
@@ -142,6 +142,7 @@ config PPC select ARCH_KEEP_MEMBLOCK select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_USE_BUILTIN_BSWAP
arch/s390/Kconfig +1 -0
@@ -102,6 +102,7 @@ config S390 select ARCH_INLINE_WRITE_UNLOCK_IRQ select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE select ARCH_KEEP_MEMBLOCK + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_SAVE_PAGE_KEYS if HIBERNATION select ARCH_STACKWALK select ARCH_SUPPORTS_ATOMIC_RMW
arch/sh/Kconfig +1 -0
@@ -18,6 +18,7 @@ config SUPERH select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A) select ARCH_HAS_GCOV_PROFILE_ALL + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select PERF_USE_VMALLOC select HAVE_DEBUG_KMEMLEAK select HAVE_KERNEL_GZIP
arch/sparc/Kconfig +1 -0
@@ -30,6 +30,7 @@ config SPARC select RTC_SYSTOHC select HAVE_ARCH_JUMP_LABEL if SPARC64 select GENERIC_IRQ_SHOW + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_PCI_IOMAP select HAVE_NMI_WATCHDOG if SPARC64
arch/x86/Kconfig +1 -0
@@ -85,6 +85,7 @@ config X86 select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_STACKWALK select ARCH_SUPPORTS_ACPI select ARCH_SUPPORTS_ATOMIC_RMW
arch/xtensa/Kconfig +1 -0
@@ -7,6 +7,7 @@ config XTENSA select ARCH_HAS_SYNC_DMA_FOR_CPU if MMU select ARCH_HAS_SYNC_DMA_FOR_DEVICE if MMU select ARCH_HAS_UNCACHED_SEGMENT if MMU + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_FRAME_POINTERS
drivers/power/reset/sc27xx-poweroff.c +1 -1
@@ -30,7 +30,7 @@ static void sc27xx_poweroff_shutdown(void)#ifdef CONFIG_PM_SLEEP_SMP int cpu =smp_processor_id (); -freeze_secondary_cpus (cpu); +freeze_secondary_cpus (cpu, false);#endif }
include/linux/cpu.h +6 -3
@@ -137,11 +137,14 @@ static inline void cpu_hotplug_done(void) { cpus_write_unlock(); }static inline void get_online_cpus (void ) {cpus_read_lock (); }static inline void put_online_cpus (void ) {cpus_read_unlock (); } +#if defined(CONFIG_PM_SLEEP_SMP ) || defined(CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT ) +extern int freeze_secondary_cpus (int primary,bool reboot); +#endif +#ifdef CONFIG_PM_SLEEP_SMP -extern int freeze_secondary_cpus (int primary);static inline int disable_nonboot_cpus (void ) { -return freeze_secondary_cpus (0 ); +return freeze_secondary_cpus (0 , false); }extern void enable_nonboot_cpus (void );
@@ -152,7 +155,7 @@ static inline int suspend_disable_secondary_cpus(void)if (IS_ENABLED (CONFIG_PM_SLEEP_SMP_NONZERO_CPU )) cpu =-1 ; -return freeze_secondary_cpus (cpu); +return freeze_secondary_cpus (cpu, false); }static inline void suspend_enable_secondary_cpus (void ) {
kernel/cpu.c +8 -4
@@ -1209,10 +1209,10 @@ int cpu_up(unsigned int cpu) }EXPORT_SYMBOL_GPL (cpu_up); -#ifdef CONFIG_PM_SLEEP_SMP +#if defined(CONFIG_PM_SLEEP_SMP ) || defined(CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT )static cpumask_var_t frozen_cpus; -int freeze_secondary_cpus (int primary) +int freeze_secondary_cpus (int primary,bool reboot) {int cpu, error =0 ;
@@ -1237,11 +1237,13 @@ int freeze_secondary_cpus(int primary)if (cpu = primary)continue ; -if (pm_wakeup_pending ()) { +#ifdef CONFIG_PM_SLEEP +if (!reboot &&pm_wakeup_pending ()) {pr_info ("Wakeup pending. Abort CPU freeze\n" ); error = -EBUSY ;break ; } +#endif trace_suspend_resume (TPS ("CPU_OFF" ), cpu, true); error =_cpu_down (cpu,1 ,CPUHP_OFFLINE );
@@ -1250,7 +1252,9 @@ int freeze_secondary_cpus(int primary)cpumask_set_cpu (cpu, frozen_cpus); else {pr_err ("Error taking CPU%d down: %d\n" , cpu, error); -break ; +/* When rebooting, offline as many CPUs as possible. */ +if (!reboot) +break ; } }
kernel/reboot.c +8 -0
@@ -7,6 +7,7 @@#define pr_fmt (fmt) "reboot: " fmt +#include <linux/cpu.h> #include <linux/ctype.h> #include <linux/export.h> #include <linux/kexec.h>
@@ -220,7 +221,9 @@ void migrate_to_reboot_cpu(void)/* The boot cpu is always logical cpu 0 */ int cpu = reboot_cpu; +#if !IS_ENABLED (CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT )cpu_hotplug_disable (); +#endif /* Make certain the cpu I'm about to reboot on is online */ if (!cpu_online (cpu))
@@ -231,6 +234,11 @@ void migrate_to_reboot_cpu(void)/* Make certain I only run on the appropriate processor */ set_cpus_allowed_ptr (current,cpumask_of (cpu)); + +#if IS_ENABLED (CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT ) +/* Offline other cpus if possible */ +freeze_secondary_cpus (cpu, true); +#endif }/**
Signature · 1 line
2.25.0.rc1.283.g88dfdc4193-goog
Quoted 58 lines · Hsin-Yi Wang
Currently system reboots uses architecture specific codes (
smp_send_stop) to offline non reboot CPUs. Most architecture's implementation is looping through all non reboot online CPUs and call ipi function to each of them. Some architecture like arm64, arm, and x86... would set offline masks to cpu without really offline them. This causes some race condition and kernel warning comes out sometimes when system reboots.This patch adds a config
ARCH_OFFLINE_CPUS_ON_REBOOT, which would offline cpus inmigrate_to_reboot_cpu(). If non reboot cpus are all offlined here, the loop for checking online cpus would be an empty loop. If architecture don't enable this config, or some cpus somehow fails to offline, it would fallback to ipi function.Opt in this config for architectures that support
CONFIG_HOTPLUG_CPU.Signed-off-by Hsin-Yi Wang <[email protected]>---
Resend v4:
* Cc more people and mailing lists. Also fix a few nits from v4.Change from v3:
* Opt in config for architectures that supportCONFIG_HOTPLUG_CPU
* Merge functionoffline_secondary_cpus()andfreeze_secondary_cpus()with an additional flag.Change from v2:
* Add another config instead of configed byCONFIG_HOTPLUG_CPUPrevious related discussion on list:
https://lore.kernel.org/lkml/[email protected]/
https://lore.kernel.org/patchwork/patch/1117201/--- arch/Kconfig | 5 +++++ arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/arm64/kernel/hibernate.c | 2 +- arch/csky/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/xtensa/Kconfig | 1 + drivers/power/reset/sc27xx-poweroff.c | 2 +- include/linux/cpu.h | 9 ++++++--- kernel/cpu.c | 12 ++++++++---- kernel/reboot.c | 8 ++++++++ 18 files changed, 41 insertions(+), 9 deletions(-)arch/Kconfig +0
-0
arch/Kconfig config ARCH_HAS_UNCACHED_SEGMENT · line 260
Quoted 6 lines
arch/Kconfig +3
-0@@ -255,6 +255,11 @@ config ARCH_HAS_UNCACHED_SEGMENT select ARCH_HAS_DMA_PREP_COHERENT bool +# Select to do a full offline on secondary CPUs before reboot. +config ARCH_OFFLINE_CPUS_ON_REBOOT + bool "Support for offline CPUs before reboot"
Doesn't the text make it show up in menuconfig ? Is that really what you want ? If so, I think you might need a help text as well.
Guenter
Quoted 283 lines
arch/Kconfig +2
-0+ depends on HOTPLUG_CPU + # Select if arch init_task must go in the __init_task_data section config ARCH_TASK_STRUCT_ON_STACK boolarch/arm/Kconfig +1
-0@@ -28,6 +28,7 @@ config ARM select ARCH_KEEP_MEMBLOCK if HAVE_ARCH_PFN_VALID || KEXEC select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_NO_SG_CHAIN if !ARM_HAS_SG_CHAIN + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7 select ARCH_SUPPORTS_ATOMIC_RMWarch/arm64/Kconfig +1
-0@@ -61,6 +61,7 @@ config ARM64 select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPTION select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION select ARCH_KEEP_MEMBLOCK + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKSarch/arm64/kernel/hibernate.c +1
-1@@ -581,5 +581,5 @@ int hibernate_resume_nonboot_cpu_disable(void)return -ENODEV ; } -return freeze_secondary_cpus (sleep_cpu); +return freeze_secondary_cpus (sleep_cpu, false); }arch/csky/Kconfig +1
-0@@ -5,6 +5,7 @@ config CSKY select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_QUEUED_RWLOCKS if NR_CPUS>2 select COMMON_CLKarch/ia64/Kconfig +1
-0@@ -10,6 +10,7 @@ config IA64 bool select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ACPI select ACPI_NUMA if NUMA select ARCH_SUPPORTS_ACPIarch/mips/Kconfig +1
-0@@ -8,6 +8,7 @@ config MIPS select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAS_FORTIFY_SOURCE + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_SUPPORTS_UPROBES select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF if 64BITarch/parisc/Kconfig +1
-0@@ -13,6 +13,7 @@ config PARISC select ARCH_HAS_STRICT_KERNEL_RWX select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_NO_SG_CHAIN + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_SUPPORTS_MEMORY_FAILURE select RTC_CLASS select RTC_DRV_GENERICarch/powerpc/Kconfig +1
-0@@ -142,6 +142,7 @@ config PPC select ARCH_KEEP_MEMBLOCK select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_USE_BUILTIN_BSWAParch/s390/Kconfig +1
-0@@ -102,6 +102,7 @@ config S390 select ARCH_INLINE_WRITE_UNLOCK_IRQ select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE select ARCH_KEEP_MEMBLOCK + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_SAVE_PAGE_KEYS if HIBERNATION select ARCH_STACKWALK select ARCH_SUPPORTS_ATOMIC_RMWarch/sh/Kconfig +1
-0@@ -18,6 +18,7 @@ config SUPERH select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A) select ARCH_HAS_GCOV_PROFILE_ALL + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select PERF_USE_VMALLOC select HAVE_DEBUG_KMEMLEAK select HAVE_KERNEL_GZIParch/sparc/Kconfig +1
-0@@ -30,6 +30,7 @@ config SPARC select RTC_SYSTOHC select HAVE_ARCH_JUMP_LABEL if SPARC64 select GENERIC_IRQ_SHOW + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_PCI_IOMAP select HAVE_NMI_WATCHDOG if SPARC64arch/x86/Kconfig +1
-0@@ -85,6 +85,7 @@ config X86 select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_STACKWALK select ARCH_SUPPORTS_ACPI select ARCH_SUPPORTS_ATOMIC_RMWarch/xtensa/Kconfig +1
-0@@ -7,6 +7,7 @@ config XTENSA select ARCH_HAS_SYNC_DMA_FOR_CPU if MMU select ARCH_HAS_SYNC_DMA_FOR_DEVICE if MMU select ARCH_HAS_UNCACHED_SEGMENT if MMU + select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_FRAME_POINTERSdrivers/power/reset/sc27xx-poweroff.c +1
-1@@ -30,7 +30,7 @@ static void sc27xx_poweroff_shutdown(void)#ifdef CONFIG_PM_SLEEP_SMP int cpu =smp_processor_id (); -freeze_secondary_cpus (cpu); +freeze_secondary_cpus (cpu, false);#endif }include/linux/cpu.h +6
-3@@ -137,11 +137,14 @@ static inline void cpu_hotplug_done(void) { cpus_write_unlock(); }static inline void get_online_cpus (void ) {cpus_read_lock (); }static inline void put_online_cpus (void ) {cpus_read_unlock (); } +#if defined(CONFIG_PM_SLEEP_SMP ) || defined(CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT ) +extern int freeze_secondary_cpus (int primary,bool reboot); +#endif +#ifdef CONFIG_PM_SLEEP_SMP -extern int freeze_secondary_cpus (int primary);static inline int disable_nonboot_cpus (void ) { -return freeze_secondary_cpus (0 ); +return freeze_secondary_cpus (0 , false); }extern void enable_nonboot_cpus (void );@@ -152,7 +155,7 @@ static inline int suspend_disable_secondary_cpus(void)if (IS_ENABLED (CONFIG_PM_SLEEP_SMP_NONZERO_CPU )) cpu =-1 ; -return freeze_secondary_cpus (cpu); +return freeze_secondary_cpus (cpu, false); }static inline void suspend_enable_secondary_cpus (void ) {kernel/cpu.c +8
-4@@ -1209,10 +1209,10 @@ int cpu_up(unsigned int cpu) }EXPORT_SYMBOL_GPL (cpu_up); -#ifdef CONFIG_PM_SLEEP_SMP +#if defined(CONFIG_PM_SLEEP_SMP ) || defined(CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT )static cpumask_var_t frozen_cpus; -int freeze_secondary_cpus (int primary) +int freeze_secondary_cpus (int primary,bool reboot) {int cpu, error =0 ;@@ -1237,11 +1237,13 @@ int freeze_secondary_cpus(int primary)if (cpu = primary)continue ; -if (pm_wakeup_pending ()) { +#ifdef CONFIG_PM_SLEEP +if (!reboot &&pm_wakeup_pending ()) {pr_info ("Wakeup pending. Abort CPU freeze\n" ); error = -EBUSY ;break ; } +#endif trace_suspend_resume (TPS ("CPU_OFF" ), cpu, true); error =_cpu_down (cpu,1 ,CPUHP_OFFLINE );@@ -1250,7 +1252,9 @@ int freeze_secondary_cpus(int primary)cpumask_set_cpu (cpu, frozen_cpus); else {pr_err ("Error taking CPU%d down: %d\n" , cpu, error); -break ; +/* When rebooting, offline as many CPUs as possible. */ +if (!reboot) +break ; } }kernel/reboot.c +8
-1@@ -7,6 +7,7 @@#define pr_fmt (fmt) "reboot: " fmt +#include <linux/cpu.h> #include <linux/ctype.h> #include <linux/export.h> #include <linux/kexec.h> @@ -220,7 +221,9 @@ void migrate_to_reboot_cpu(void)/* The boot cpu is always logical cpu 0 */ int cpu = reboot_cpu; +#if !IS_ENABLED (CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT )cpu_hotplug_disable (); +#endif /* Make certain the cpu I'm about to reboot on is online */ if (!cpu_online (cpu))@@ -231,6 +234,11 @@ void migrate_to_reboot_cpu(void)/* Make certain I only run on the appropriate processor */ set_cpus_allowed_ptr (current,cpumask_of (cpu)); + +#if IS_ENABLED (CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT ) +/* Offline other cpus if possible */ +freeze_secondary_cpus (cpu, true); +#endif }/** -- 2.25.0.rc1.283.g88dfdc4193-goog
Quoted 5 lines · Hsin-Yi Wang
Signed-off-by Hsin-Yi Wang <[email protected]>---
Resend v4:
* Cc more people and mailing lists. Also fix a few nits from v4.
Please don't name it resend if you actually changed the patch. Resend wants to be an unmodified patch and the only reasons to do that are:
- add more people to CC
- Resend it because it got ignored or dropped (do that only after a couple of weeks)
If you changed the patch, then it wants a new version number.
Thanks,
tglx
Quoted 5 lines · Hsin-Yi Wang
This patch adds a config
ARCH_OFFLINE_CPUS_ON_REBOOT, which would offline cpus inmigrate_to_reboot_cpu(). If non reboot cpus are all offlined here, the loop for checking online cpus would be an empty loop. If architecture don't enable this config, or some cpus somehow fails to offline, it would fallback to ipi function.
I'm curious:
arch/Kconfig config ARCH_HAS_UNCACHED_SEGMENT · line 261
Quoted 4 lines
arch/Kconfig +4
-0+# Select to do a full offline on secondary CPUs before reboot. +config ARCH_OFFLINE_CPUS_ON_REBOOT + bool "Support for offline CPUs before reboot" + depends on HOTPLUG_CPU
The new symbol can't be selected without the other symbol.
Review
Quoted 1 line
(quoted diff) +1
-0+ select ARCH_OFFLINE_CPUS_ON_REBOOT if HOTPLUG_CPU
And the other symbol automatically selects the new one.
Why are you adding a second symbol that means the same thing as the existing symbol?
include/linux/cpu.h static inline void cpu_hotplug_done(void) { cpus_write_unlock(); } · line 142
Quoted 3 lines
include/linux/cpu.h +3
-0+#if defined(CONFIG_PM_SLEEP_SMP ) || defined(CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT ) +extern int freeze_secondary_cpus (int primary,bool reboot); +#endif
Couldn't that just test HOTPLUG_CPU? What's the second symbol for? (You can have empty stub functions when architectures don't support a thing...)
Rob
Quoted 17 lines · Rob Landley
Quoted 5 lines · Hsin-Yi Wang
This patch adds a config
ARCH_OFFLINE_CPUS_ON_REBOOT, which would offline cpus inmigrate_to_reboot_cpu(). If non reboot cpus are all offlined here, the loop for checking online cpus would be an empty loop. If architecture don't enable this config, or some cpus somehow fails to offline, it would fallback to ipi function.I'm curious:
arch/Kconfig config ARCH_HAS_UNCACHED_SEGMENT · line 261
Quoted 4 lines
arch/Kconfig +4
-0+# Select to do a full offline on secondary CPUs before reboot. +config ARCH_OFFLINE_CPUS_ON_REBOOT + bool "Support for offline CPUs before reboot" + depends on HOTPLUG_CPUThe new symbol can't be selected without the other symbol.
Quoted 6 lines
Quoted 1 line
+ select
ARCH_OFFLINE_CPUS_ON_REBOOTifHOTPLUG_CPUAnd the other symbol automatically selects the new one.
Why are you adding a second symbol that means the same thing as the existing symbol?
I should make the arch selecting this symbol in other patches and let the arch decides if they want to opt in, as Thomas pointed out in v5:
https://lore.kernel.org/lkml/[email protected]/
Current solution is not sufficient since it only solve problems for system that enables HOTPLUG_CPU.
Quoted 8 lines
include/linux/cpu.h static inline void cpu_hotplug_done(void) { cpus_write_unlock(); } · line 142
Quoted 3 lines
include/linux/cpu.h +3
-0+#if defined(CONFIG_PM_SLEEP_SMP ) || defined(CONFIG_ARCH_OFFLINE_CPUS_ON_REBOOT ) +extern int freeze_secondary_cpus (int primary,bool reboot); +#endif Couldn't that just test
HOTPLUG_CPU? What's the second symbol for? (You can have empty stub functions when architectures don't support a thing...)Rob