PM: hibernate: Avoid missing wakeup events during hibernation
Subsystems (2)
PATCH RESEND v3 1/1 PM: hibernate: Avoid missing wakeup events during hibernation
Wakeup events that occur in the hibernation process's hibernation_platform_enter() cannot wake up the system. Although the current hibernation framework will execute part of the recovery process after a wakeup event occurs, it ultimately performs a shutdown operation because the system does not check the return value of hibernation_platform_enter(). In short, if a wakeup event occurs before putting the system into the final low-power state, it will be missed.
To solve this problem, check the return value of hibernation_platform_enter(). When it returns -EAGAIN or -EBUSY (indicate the occurrence of a wakeup event), execute the hibernation recovery process, discard the previously saved image, and ultimately return to the working state.
---
[PATCH v2]:
- Optimize the "if" condition logic.
- Link to v1: https://lore.kernel.org/all/[email protected]
[PATCH v3]:
- Use pr_info instead of pr_err.
- Fix undeclared function 'swsusp_unmark' build error.
- Refine commit and printing message.
- Change the subject.
- Link to v2: https://lore.kernel.org/all/[email protected]
--- kernel/power/hibernate.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
kernel/power/hibernate.c +10 -2
@@ -642,9 +642,9 @@ int hibernation_platform_enter(void)*/ static void power_down (void ) { -#ifdef CONFIG_SUSPEND int error; +#ifdef CONFIG_SUSPEND if (hibernation_mode ==HIBERNATION_SUSPEND ) { error =suspend_devices_and_enter (mem_sleep_current);if (error) {
@@ -667,7 +667,15 @@ static void power_down(void)kernel_restart (NULL );break ;case HIBERNATION_PLATFORM : -hibernation_platform_enter (); + error =hibernation_platform_enter (); +if (error == -EAGAIN || error == -EBUSY ) { +#ifdef CONFIG_SUSPEND +swsusp_unmark (); +#endif + events_check_enabled = false; +pr_info ("Hibernation process aborted due to detected wakeup event.\n" ); +return ; + } fallthrough;case HIBERNATION_SHUTDOWN :if (kernel_can_power_off ())
Signature · 1 line
2.17.0
Rafael J. Wysocki
maintainerQuoted 46 lines · Chris Feng
Wakeup events that occur in the hibernation process's
hibernation_platform_enter()cannot wake up the system. Although the current hibernation framework will execute part of the recovery process after a wakeup event occurs, it ultimately performs a shutdown operation because the system does not check the return value ofhibernation_platform_enter(). In short, if a wakeup event occurs before putting the system into the final low-power state, it will be missed.To solve this problem, check the return value of
hibernation_platform_enter(). When it returns-EAGAINor-EBUSY(indicate the occurrence of a wakeup event), execute the hibernation recovery process, discard the previously saved image, and ultimately return to the working state.Signed-off-by Chris Feng <[email protected]>---
[PATCH v2]:
- Optimize the "if" condition logic.
- Link to v1: https://lore.kernel.org/all/[email protected]
[PATCH v3]:
- Usepr_infoinstead ofpr_err.
- Fix undeclared function 'swsusp_unmark' build error.
- Refine commit and printing message.
- Change the subject.
- Link to v2: https://lore.kernel.org/all/[email protected]--- kernel/power/hibernate.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)kernel/power/hibernate.c +1
-1@@ -642,9 +642,9 @@ int hibernation_platform_enter(void)*/ static void power_down (void ) { -#ifdef CONFIG_SUSPEND int error; +#ifdef CONFIG_SUSPEND if (hibernation_mode ==HIBERNATION_SUSPEND ) { error =suspend_devices_and_enter (mem_sleep_current);if (error) {
kernel/power/hibernate.c static void power_down(void) · line 674
Quoted 9 lines
kernel/power/hibernate.c +5
-1@@ -667,7 +667,15 @@ static void power_down(void)kernel_restart (NULL );break ;case HIBERNATION_PLATFORM : -hibernation_platform_enter (); + error =hibernation_platform_enter (); +if (error == -EAGAIN || error == -EBUSY ) { +#ifdef CONFIG_SUSPEND +swsusp_unmark (); +#endif
It would be somewhat cleaner to define an empty stub of swsusp_unmark() for the CONFIG_SUSPEND undefined case in the header file.
Quoted 8 lines
kernel/power/hibernate.c +4
-1+ events_check_enabled = false; +pr_info ("Hibernation process aborted due to detected wakeup event.\n" ); +return ; + } fallthrough;case HIBERNATION_SHUTDOWN :if (kernel_can_power_off ()) --