* [PATCH v1] PM: suspend: Drop a misplaced pm_restore_gfp_mask() call
@ 2025-07-10 8:43 Rafael J. Wysocki
2025-07-11 21:09 ` Mario Limonciello
0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2025-07-10 8:43 UTC (permalink / raw)
To: Linux PM; +Cc: LKML, Mario Limonciello
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
The pm_restore_gfp_mask() call added by commit 12ffc3b1513e ("PM:
Restrict swap use to later in the suspend sequence") to
suspend_devices_and_enter() is done too early because it takes
place before calling dpm_resume() in dpm_resume_end() and some
swap-backing devices may not be ready at that point. Moreover, it
is not even necessary because dpm_resume_end() called subsequently
in the same code path invokes that function again.
Drop the misplaced pm_restore_gfp_mask() call from
suspend_devices_and_enter() to address this issue.
Fixes: 12ffc3b1513e ("PM: Restrict swap use to later in the suspend sequence")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
kernel/power/suspend.c | 1 -
1 file changed, 1 deletion(-)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -540,7 +540,6 @@
return error;
Recover_platform:
- pm_restore_gfp_mask();
platform_recover(state);
goto Resume_devices;
}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v1] PM: suspend: Drop a misplaced pm_restore_gfp_mask() call
2025-07-10 8:43 [PATCH v1] PM: suspend: Drop a misplaced pm_restore_gfp_mask() call Rafael J. Wysocki
@ 2025-07-11 21:09 ` Mario Limonciello
0 siblings, 0 replies; 2+ messages in thread
From: Mario Limonciello @ 2025-07-11 21:09 UTC (permalink / raw)
To: Rafael J. Wysocki, Linux PM; +Cc: LKML
On 7/10/2025 3:43 AM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> The pm_restore_gfp_mask() call added by commit 12ffc3b1513e ("PM:
> Restrict swap use to later in the suspend sequence") to
> suspend_devices_and_enter() is done too early because it takes
> place before calling dpm_resume() in dpm_resume_end() and some
> swap-backing devices may not be ready at that point. Moreover, it
> is not even necessary because dpm_resume_end() called subsequently
> in the same code path invokes that function again.
>
> Drop the misplaced pm_restore_gfp_mask() call from
> suspend_devices_and_enter() to address this issue.
>
> Fixes: 12ffc3b1513e ("PM: Restrict swap use to later in the suspend sequence")
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> kernel/power/suspend.c | 1 -
> 1 file changed, 1 deletion(-)
>
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -540,7 +540,6 @@
> return error;
>
> Recover_platform:
> - pm_restore_gfp_mask();
> platform_recover(state);
> goto Resume_devices;
> }
>
>
>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-07-11 21:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-10 8:43 [PATCH v1] PM: suspend: Drop a misplaced pm_restore_gfp_mask() call Rafael J. Wysocki
2025-07-11 21:09 ` Mario Limonciello
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®