mirror of https://github.com/torvalds/linux.git
PM: hibernate: Restrict GFP mask in hibernation_snapshot()
Commit12ffc3b151("PM: Restrict swap use to later in the suspend sequence") incorrectly removed a pm_restrict_gfp_mask() call from hibernation_snapshot(), so memory allocations involving swap are not prevented from being carried out in this code path any more which may lead to serious breakage. The symptoms of such breakage have become visible after adding a shrink_shmem_memory() call to hibernation_snapshot() in commit2640e81947("PM: hibernate: shrink shmem pages after dev_pm_ops.prepare()") which caused this problem to be much more likely to manifest itself. However, since commit2640e81947was initially present in the DRM tree that did not include commit12ffc3b151, the symptoms of this issue were not visible until merge commit260f6f4fda("Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel") that exposed it through an entirely reasonable merge conflict resolution. Fixes:12ffc3b151("PM: Restrict swap use to later in the suspend sequence") Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220555 Reported-by: Todd Brandt <todd.e.brandt@linux.intel.com> Tested-by: Todd Brandt <todd.e.brandt@linux.intel.com> Cc: 6.16+ <stable@vger.kernel.org> # 6.16+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
This commit is contained in:
parent
76eeb9b8de
commit
449c9c0253
|
|
@ -449,6 +449,7 @@ int hibernation_snapshot(int platform_mode)
|
||||||
shrink_shmem_memory();
|
shrink_shmem_memory();
|
||||||
|
|
||||||
console_suspend_all();
|
console_suspend_all();
|
||||||
|
pm_restrict_gfp_mask();
|
||||||
|
|
||||||
error = dpm_suspend(PMSG_FREEZE);
|
error = dpm_suspend(PMSG_FREEZE);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue