mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
mm/pm: force GFP_NOIO during suspend/hibernation and resume
There are quite a few GFP_KERNEL memory allocations made during suspend/hibernation and resume that may cause the system to hang, because the I/O operations they depend on cannot be completed due to the underlying devices being suspended. Avoid this problem by clearing the __GFP_IO and __GFP_FS bits in gfp_allowed_mask before suspend/hibernation and restoring the original values of these bits in gfp_allowed_mask durig the subsequent resume. [[email protected]: fix CONFIG_PM=n linkage] Signed-off-by: Rafael J. Wysocki <[email protected]> Reported-by: Maxim Levitsky <[email protected]> Cc: Sebastian Ott <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: KOSAKI Motohiro <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
ad2bd7e0e9
commit
452aa6999e
5 changed files with 41 additions and 5 deletions
|
|
@ -76,6 +76,31 @@ unsigned long totalreserve_pages __read_mostly;
|
|||
int percpu_pagelist_fraction;
|
||||
gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK;
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
/*
|
||||
* The following functions are used by the suspend/hibernate code to temporarily
|
||||
* change gfp_allowed_mask in order to avoid using I/O during memory allocations
|
||||
* while devices are suspended. To avoid races with the suspend/hibernate code,
|
||||
* they should always be called with pm_mutex held (gfp_allowed_mask also should
|
||||
* only be modified with pm_mutex held, unless the suspend/hibernate code is
|
||||
* guaranteed not to run in parallel with that modification).
|
||||
*/
|
||||
void set_gfp_allowed_mask(gfp_t mask)
|
||||
{
|
||||
WARN_ON(!mutex_is_locked(&pm_mutex));
|
||||
gfp_allowed_mask = mask;
|
||||
}
|
||||
|
||||
gfp_t clear_gfp_allowed_mask(gfp_t mask)
|
||||
{
|
||||
gfp_t ret = gfp_allowed_mask;
|
||||
|
||||
WARN_ON(!mutex_is_locked(&pm_mutex));
|
||||
gfp_allowed_mask &= ~mask;
|
||||
return ret;
|
||||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
|
||||
int pageblock_order __read_mostly;
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue