Skip to contentSkip to conversation

cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending

PATCH Applied Pavankumar Kondeti 6 participants 8 messages Jun 3, 2019 – Mar 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending

When "deep" suspend is enabled, all CPUs except the primary CPU are hotplugged out. Since CPU hotplug is a costly operation, check if we have to abort the suspend in between each CPU hotplug. This would improve the system suspend abort latency upon detecting a wakeup condition.

---
 kernel/cpu.c | 7 +++++++
 1 file changed, 7 insertions(+)
kernel/cpu.c +7 -0
index f2ef104..784b33d 100644
@@ -1221,6 +1221,13 @@ int freeze_secondary_cpus(int primary)
 	for_each_online_cpu(cpu) {
 		if (cpu == primary)
 			continue;
+
+		if (pm_wakeup_pending()) {
+			pr_info("Aborting disabling non-boot CPUs..\n");
+			error = -EBUSY;
+			break;
+		}
+
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, true);
 		error = _cpu_down(cpu, 1, CPUHP_OFFLINE);
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, false);
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
#1 lore raw

Hi Rafael/Thomas,

Quoted 7 lines · Pavankumar Kondeti

When "deep" suspend is enabled, all CPUs except the primary CPU are hotplugged out. Since CPU hotplug is a costly operation, check if we have to abort the suspend in between each CPU hotplug. This would improve the system suspend abort latency upon detecting a wakeup condition.

Please let me know if you have any comments on this patch.

Thanks,
Pavan

Signature · 3 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a
Linux Foundation Collaborative Project
#2 lore raw
In reply to Pavankumar Kondeti
cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending
Commit-ID:  a66d955e910ab0e598d7a7450cbe6139f52befe7
Gitweb:     https://git.kernel.org/tip/a66d955e910ab0e598d7a7450cbe6139f52befe7
Author:     Pavankumar Kondeti <[email protected]>
AuthorDate: Mon, 3 Jun 2019 10:01:03 +0530
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 12 Jun 2019 11:03:05 +0200

cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending

When "deep" suspend is enabled, all CPUs except the primary CPU are frozen via CPU hotplug one by one. After all secondary CPUs are unplugged the wakeup pending condition is evaluated and if pending the suspend operation is aborted and the secondary CPUs are brought up again.

CPU hotplug is a slow operation, so it makes sense to check for wakeup pending in the freezer loop before bringing down the next CPU. This improves the system suspend abort latency significantly.

[ tglx: Massaged changelog and improved printk message ]

Cc "Rafael J. Wysocki" <[email protected]>
Cc Len Brown <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc iri Kosina <[email protected]>
Cc Mukesh Ojha <[email protected]>
---
 kernel/cpu.c | 7 +++++++
 1 file changed, 7 insertions(+)
kernel/cpu.c +7 -0
index be82cbc11a8a..0778249cd49d 100644
@@ -1221,6 +1221,13 @@ int freeze_secondary_cpus(int primary)
 	for_each_online_cpu(cpu) {
 		if (cpu == primary)
 			continue;
+
+		if (pm_wakeup_pending()) {
+			pr_info("Wakeup pending. Abort CPU freeze\n");
+			error = -EBUSY;
+			break;
+		}
+
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, true);
 		error = _cpu_down(cpu, 1, CPUHP_OFFLINE);
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, false);
#3 lore raw

Hi Thomas and Pavankumar,

I have a question about this patch, please see below:

Quoted 9 lines · tip-bot for Pavankumar Kondeti
Commit-ID:  a66d955e910ab0e598d7a7450cbe6139f52befe7
Gitweb:     https://git.kernel.org/tip/a66d955e910ab0e598d7a7450cbe6139f52befe7
Author:     Pavankumar Kondeti <[email protected]>
AuthorDate: Mon, 3 Jun 2019 10:01:03 +0530
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 12 Jun 2019 11:03:05 +0200

cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending

Quoted 9 lines

When "deep" suspend is enabled, all CPUs except the primary CPU are frozen via CPU hotplug one by one. After all secondary CPUs are unplugged the wakeup pending condition is evaluated and if pending the suspend operation is aborted and the secondary CPUs are brought up again.

CPU hotplug is a slow operation, so it makes sense to check for wakeup pending in the freezer loop before bringing down the next CPU. This improves the system suspend abort latency significantly.

From the commit message, it makes sense to add the pm_wakeup_pending() check if freeze_secondary_cpus() is used for system suspend. However, freeze_secondary_cpus() is also used in kexec path on arm64:

	kernel_kexec():
	  machine_shutdown():
	    disable_nonboot_cpus():
	      freeze_secondary_cpus()

, so I wonder whether the pm_wakeup_pending() makes sense in this situation? Because IIUC, in this case we want to reboot the system regardlessly, the pm_wakeup_pending() checking seems to be inappropriate then.

I'm asking this because I'm debugging a kexec failure on ARM64 guest on Hyper-V, and I got the BUG_ON() triggered:

[  108.378016] kexec_core: Starting new kernel
[  108.378018] Disabling non-boot CPUs ...
[  108.378019] Wakeup pending. Abort CPU freeze
[  108.378020] Non-boot CPUs are not disabled
[  108.378049] ------------[ cut here ]------------
[  108.378050] kernel BUG at arch/arm64/kernel/machine_kexec.c:154!

Thanks!

Regards,
Boqun

Quoted 37 lines

[ tglx: Massaged changelog and improved printk message ]

Cc "Rafael J. Wysocki" <[email protected]>
Cc Len Brown <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc iri Kosina <[email protected]>
Cc Mukesh Ojha <[email protected]>
---
 kernel/cpu.c | 7 +++++++
 1 file changed, 7 insertions(+)
kernel/cpu.c +7 -0
index be82cbc11a8a..0778249cd49d 100644
@@ -1221,6 +1221,13 @@ int freeze_secondary_cpus(int primary)
 	for_each_online_cpu(cpu) {
 		if (cpu == primary)
 			continue;
+
+		if (pm_wakeup_pending()) {
+			pr_info("Wakeup pending. Abort CPU freeze\n");
+			error = -EBUSY;
+			break;
+		}
+
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, true);
 		error = _cpu_down(cpu, 1, CPUHP_OFFLINE);
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, false);
#4 lore raw
Quoted 3 lines · Boqun Feng

From the commit message, it makes sense to add the pm_wakeup_pending() check if freeze_secondary_cpus() is used for system suspend. However, freeze_secondary_cpus() is also used in kexec path on arm64:

Bah!

Quoted 9 lines
	kernel_kexec():
	  machine_shutdown():
	    disable_nonboot_cpus():
	      freeze_secondary_cpus()

, so I wonder whether the pm_wakeup_pending() makes sense in this situation? Because IIUC, in this case we want to reboot the system regardlessly, the pm_wakeup_pending() checking seems to be inappropriate then.

Fix below.

Thanks,

tglx

8<------------

include/linux/cpu.h +9 -3
@@ -133,12 +133,18 @@ static inline void get_online_cpus(void)
 static inline void put_online_cpus(void) { cpus_read_unlock(); }
 
 #ifdef CONFIG_PM_SLEEP_SMP
-extern int freeze_secondary_cpus(int primary);
+int __freeze_secondary_cpus(int primary, bool suspend);
+static inline int freeze_secondary_cpus(int primary)
+{
+	return __freeze_secondary_cpus(primary, true);
+}
+
 static inline int disable_nonboot_cpus(void)
 {
-	return freeze_secondary_cpus(0);
+	return __freeze_secondary_cpus(0, false);
 }
-extern void enable_nonboot_cpus(void);
+
+void enable_nonboot_cpus(void);
 
 static inline int suspend_disable_secondary_cpus(void)
 {
kernel/cpu.c +2 -2
@@ -1200,7 +1200,7 @@ EXPORT_SYMBOL_GPL(cpu_up);
 #ifdef CONFIG_PM_SLEEP_SMP
 static cpumask_var_t frozen_cpus;
 
-int freeze_secondary_cpus(int primary)
+int __freeze_secondary_cpus(int primary, bool suspend)
 {
 	int cpu, error = 0;
 
@@ -1225,7 +1225,7 @@ int freeze_secondary_cpus(int primary)
 		if (cpu == primary)
 			continue;
 
-		if (pm_wakeup_pending()) {
+		if (suspend && pm_wakeup_pending()) {
 			pr_info("Wakeup pending. Abort CPU freeze\n");
 			error = -EBUSY;
 			break;
#5 lore raw

[tip: smp/core] cpu/hotplug: Ignore pm_wakeup_pending() for disable_nonboot_cpus()

The following commit has been merged into the smp/core branch of tip:

The following commit has been merged into the smp/core branch of tip:

Commit-ID:     e98eac6ff1b45e4e73f2e6031b37c256ccb5d36b
Gitweb:        https://git.kernel.org/tip/e98eac6ff1b45e4e73f2e6031b37c256ccb5d36b
Author:        Thomas Gleixner <[email protected]>
AuthorDate:    Fri, 27 Mar 2020 12:06:44 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Sat, 28 Mar 2020 11:42:55 +01:00

cpu/hotplug: Ignore pm_wakeup_pending() for disable_nonboot_cpus()

A recent change to freeze_secondary_cpus() which added an early abort if a wakeup is pending missed the fact that the function is also invoked for shutdown, reboot and kexec via disable_nonboot_cpus().

In case of disable_nonboot_cpus() the wakeup event needs to be ignored as the purpose is to terminate the currently running kernel.

Add a 'suspend' argument which is only set when the freeze is in context of a suspend operation. If not set then an eventually pending wakeup event is ignored.

Fixes a66d955e910a ("cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending")
Cc Pavankumar Kondeti <[email protected]>
---
 include/linux/cpu.h | 12 +++++++++---
 kernel/cpu.c        |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)
include/linux/cpu.h +9 -3
index 9ead281..beaed2d 100644
@@ -144,12 +144,18 @@ static inline void get_online_cpus(void) { cpus_read_lock(); }
 static inline void put_online_cpus(void) { cpus_read_unlock(); }
 
 #ifdef CONFIG_PM_SLEEP_SMP
-extern int freeze_secondary_cpus(int primary);
+int __freeze_secondary_cpus(int primary, bool suspend);
+static inline int freeze_secondary_cpus(int primary)
+{
+	return __freeze_secondary_cpus(primary, true);
+}
+
 static inline int disable_nonboot_cpus(void)
 {
-	return freeze_secondary_cpus(0);
+	return __freeze_secondary_cpus(0, false);
 }
-extern void enable_nonboot_cpus(void);
+
+void enable_nonboot_cpus(void);
 
 static inline int suspend_disable_secondary_cpus(void)
 {
kernel/cpu.c +2 -2
index 3084849..12ae636 100644
@@ -1327,7 +1327,7 @@ void bringup_nonboot_cpus(unsigned int setup_max_cpus)
 #ifdef CONFIG_PM_SLEEP_SMP
 static cpumask_var_t frozen_cpus;
 
-int freeze_secondary_cpus(int primary)
+int __freeze_secondary_cpus(int primary, bool suspend)
 {
 	int cpu, error = 0;
 
@@ -1352,7 +1352,7 @@ int freeze_secondary_cpus(int primary)
 		if (cpu == primary)
 			continue;
 
-		if (pm_wakeup_pending()) {
+		if (suspend && pm_wakeup_pending()) {
 			pr_info("Wakeup pending. Abort CPU freeze\n");
 			error = -EBUSY;
 			break;
#6 lore raw
In reply to Thomas Gleixner
Quoted 33 lines · Thomas Gleixner
Quoted 3 lines · Boqun Feng

From the commit message, it makes sense to add the pm_wakeup_pending() check if freeze_secondary_cpus() is used for system suspend. However, freeze_secondary_cpus() is also used in kexec path on arm64:

Bah!

Quoted 9 lines
	kernel_kexec():
	  machine_shutdown():
	    disable_nonboot_cpus():
	      freeze_secondary_cpus()

, so I wonder whether the pm_wakeup_pending() makes sense in this situation? Because IIUC, in this case we want to reboot the system regardlessly, the pm_wakeup_pending() checking seems to be inappropriate then.

Fix below.

Thanks,

tglx

8<------------

include/linux/cpu.h +1 -1
@@ -133,12 +133,18 @@ static inline void get_online_cpus(void)
 static inline void put_online_cpus(void) { cpus_read_unlock(); }
 
 #ifdef CONFIG_PM_SLEEP_SMP
-extern int freeze_secondary_cpus(int primary);
+int __freeze_secondary_cpus(int primary, bool suspend);

include/linux/cpu.h static inline void get_online_cpus(void) · line 145

Quoted 10 lines
include/linux/cpu.h +6 -1
+static inline int freeze_secondary_cpus(int primary)
+{
+	return __freeze_secondary_cpus(primary, true);
+}
+
 static inline int disable_nonboot_cpus(void)
 {
-	return freeze_secondary_cpus(0);
+	return __freeze_secondary_cpus(0, false);
 }

If I read the code correctly, arch/x86/power/cpu.c is calling disable_nonboot_cpus() from suspend resume, which is the only user in tip/smp/core after my series.

This means you won't abort a suspend/hibernate if a late wakeup source happens? Or it might just mean that we'll wakeup slightly later than we would have done.

Anyways. I think it would be better to kill off disable_nonboot_cpus() and directly call freeze_nonboot_cpus() in x86/power/cpu.c.

I'd be happy to send a patch for this.

Assuming that x86 is okay with the late(r) abort, this patch could stay as-is for stable trees. Otherwise, maybe we need to revert this and look for another option for stable trees?

Thanks

--
Qais Yousef

Quoted 26 lines
include/linux/cpu.h +2 -1
-extern void enable_nonboot_cpus(void);
+
+void enable_nonboot_cpus(void);
 
 static inline int suspend_disable_secondary_cpus(void)
 {
kernel/cpu.c +2 -2
@@ -1200,7 +1200,7 @@ EXPORT_SYMBOL_GPL(cpu_up);
 #ifdef CONFIG_PM_SLEEP_SMP
 static cpumask_var_t frozen_cpus;
 
-int freeze_secondary_cpus(int primary)
+int __freeze_secondary_cpus(int primary, bool suspend)
 {
 	int cpu, error = 0;
 
@@ -1225,7 +1225,7 @@ int freeze_secondary_cpus(int primary)
 		if (cpu == primary)
 			continue;
 
-		if (pm_wakeup_pending()) {
+		if (suspend && pm_wakeup_pending()) {
 			pr_info("Wakeup pending. Abort CPU freeze\n");
 			error = -EBUSY;
 			break;
#7 lore raw
In reply to Boqun Feng
Quoted 24 lines · Boqun Feng

Hi Thomas and Pavankumar,

I have a question about this patch, please see below:

Quoted 9 lines · tip-bot for Pavankumar Kondeti
Commit-ID:  a66d955e910ab0e598d7a7450cbe6139f52befe7
Gitweb:     https://git.kernel.org/tip/a66d955e910ab0e598d7a7450cbe6139f52befe7
Author:     Pavankumar Kondeti <[email protected]>
AuthorDate: Mon, 3 Jun 2019 10:01:03 +0530
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 12 Jun 2019 11:03:05 +0200

cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending

Quoted 9 lines

When "deep" suspend is enabled, all CPUs except the primary CPU are frozen via CPU hotplug one by one. After all secondary CPUs are unplugged the wakeup pending condition is evaluated and if pending the suspend operation is aborted and the secondary CPUs are brought up again.

CPU hotplug is a slow operation, so it makes sense to check for wakeup pending in the freezer loop before bringing down the next CPU. This improves the system suspend abort latency significantly.

Quoted 8 lines

From the commit message, it makes sense to add the pm_wakeup_pending() check if freeze_secondary_cpus() is used for system suspend. However, freeze_secondary_cpus() is also used in kexec path on arm64:

	kernel_kexec():
	  machine_shutdown():
	    disable_nonboot_cpus():
	      freeze_secondary_cpus()

FWIW, I fixed this already and the change was picked up:

	https://lore.kernel.org/lkml/[email protected]/

Only x86 now uses disable_nonboot_cpus().

# tip/smp/core
$ git grep disable_nonboot_cpus
Documentation/power/suspend-and-cpuhotplug.rst:                              disable_nonboot_cpus()
Documentation/power/suspend-and-cpuhotplug.rst:                       /* disable_nonboot_cpus() complete */
arch/x86/power/cpu.c:   ret = disable_nonboot_cpus();
include/linux/cpu.h:static inline int disable_nonboot_cpus(void)
include/linux/cpu.h:static inline int disable_nonboot_cpus(void) { return 0; }
kernel/cpu.c:    * this even in case of failure as all disable_nonboot_cpus() users are

Thanks

--
Qais Yousef

Quoted 58 lines

, so I wonder whether the pm_wakeup_pending() makes sense in this situation? Because IIUC, in this case we want to reboot the system regardlessly, the pm_wakeup_pending() checking seems to be inappropriate then.

I'm asking this because I'm debugging a kexec failure on ARM64 guest on Hyper-V, and I got the BUG_ON() triggered:

[  108.378016] kexec_core: Starting new kernel
[  108.378018] Disabling non-boot CPUs ...
[  108.378019] Wakeup pending. Abort CPU freeze
[  108.378020] Non-boot CPUs are not disabled
[  108.378049] ------------[ cut here ]------------
[  108.378050] kernel BUG at arch/arm64/kernel/machine_kexec.c:154!

Thanks!

Regards,
Boqun

Quoted 37 lines

[ tglx: Massaged changelog and improved printk message ]

Cc "Rafael J. Wysocki" <[email protected]>
Cc Len Brown <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc iri Kosina <[email protected]>
Cc Mukesh Ojha <[email protected]>
---
 kernel/cpu.c | 7 +++++++
 1 file changed, 7 insertions(+)
kernel/cpu.c +7 -0
index be82cbc11a8a..0778249cd49d 100644
@@ -1221,6 +1221,13 @@ int freeze_secondary_cpus(int primary)
 	for_each_online_cpu(cpu) {
 		if (cpu == primary)
 			continue;
+
+		if (pm_wakeup_pending()) {
+			pr_info("Wakeup pending. Abort CPU freeze\n");
+			error = -EBUSY;
+			break;
+		}
+
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, true);
 		error = _cpu_down(cpu, 1, CPUHP_OFFLINE);
 		trace_suspend_resume(TPS("CPU_OFF"), cpu, false);