diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-03-05 16:42:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 14:26:26 -0500 |
commit | 452aa6999e6703ffbddd7f6ea124d3968915f3e3 (patch) | |
tree | 48e375fdb60920675f68b444b462903ad8bb6940 | |
parent | ad2bd7e0e9647cd48593a6b3a2be07dc2c2d28ed (diff) |
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.
[akpm@linux-foundation.org: fix CONFIG_PM=n linkage]
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/gfp.h | 7 | ||||
-rw-r--r-- | init/main.c | 2 | ||||
-rw-r--r-- | kernel/power/hibernate.c | 9 | ||||
-rw-r--r-- | kernel/power/suspend.c | 3 | ||||
-rw-r--r-- | mm/page_alloc.c | 25 |
5 files changed, 41 insertions, 5 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index e5567e6762f3..2e1b32c0484d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
@@ -83,6 +83,7 @@ struct vm_area_struct; | |||
83 | #define GFP_HIGHUSER_MOVABLE (__GFP_WAIT | __GFP_IO | __GFP_FS | \ | 83 | #define GFP_HIGHUSER_MOVABLE (__GFP_WAIT | __GFP_IO | __GFP_FS | \ |
84 | __GFP_HARDWALL | __GFP_HIGHMEM | \ | 84 | __GFP_HARDWALL | __GFP_HIGHMEM | \ |
85 | __GFP_MOVABLE) | 85 | __GFP_MOVABLE) |
86 | #define GFP_IOFS (__GFP_IO | __GFP_FS) | ||
86 | 87 | ||
87 | #ifdef CONFIG_NUMA | 88 | #ifdef CONFIG_NUMA |
88 | #define GFP_THISNODE (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY) | 89 | #define GFP_THISNODE (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY) |
@@ -337,9 +338,7 @@ void drain_local_pages(void *dummy); | |||
337 | 338 | ||
338 | extern gfp_t gfp_allowed_mask; | 339 | extern gfp_t gfp_allowed_mask; |
339 | 340 | ||
340 | static inline void set_gfp_allowed_mask(gfp_t mask) | 341 | extern void set_gfp_allowed_mask(gfp_t mask); |
341 | { | 342 | extern gfp_t clear_gfp_allowed_mask(gfp_t mask); |
342 | gfp_allowed_mask = mask; | ||
343 | } | ||
344 | 343 | ||
345 | #endif /* __LINUX_GFP_H */ | 344 | #endif /* __LINUX_GFP_H */ |
diff --git a/init/main.c b/init/main.c index 40aaa020cd68..41d0f10dbbc7 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -618,7 +618,7 @@ asmlinkage void __init start_kernel(void) | |||
618 | local_irq_enable(); | 618 | local_irq_enable(); |
619 | 619 | ||
620 | /* Interrupts are enabled now so all GFP allocations are safe. */ | 620 | /* Interrupts are enabled now so all GFP allocations are safe. */ |
621 | set_gfp_allowed_mask(__GFP_BITS_MASK); | 621 | gfp_allowed_mask = __GFP_BITS_MASK; |
622 | 622 | ||
623 | kmem_cache_init_late(); | 623 | kmem_cache_init_late(); |
624 | 624 | ||
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index bbfe472d7524..da5288ec2392 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -323,6 +323,7 @@ static int create_image(int platform_mode) | |||
323 | int hibernation_snapshot(int platform_mode) | 323 | int hibernation_snapshot(int platform_mode) |
324 | { | 324 | { |
325 | int error; | 325 | int error; |
326 | gfp_t saved_mask; | ||
326 | 327 | ||
327 | error = platform_begin(platform_mode); | 328 | error = platform_begin(platform_mode); |
328 | if (error) | 329 | if (error) |
@@ -334,6 +335,7 @@ int hibernation_snapshot(int platform_mode) | |||
334 | goto Close; | 335 | goto Close; |
335 | 336 | ||
336 | suspend_console(); | 337 | suspend_console(); |
338 | saved_mask = clear_gfp_allowed_mask(GFP_IOFS); | ||
337 | error = dpm_suspend_start(PMSG_FREEZE); | 339 | error = dpm_suspend_start(PMSG_FREEZE); |
338 | if (error) | 340 | if (error) |
339 | goto Recover_platform; | 341 | goto Recover_platform; |
@@ -351,6 +353,7 @@ int hibernation_snapshot(int platform_mode) | |||
351 | 353 | ||
352 | dpm_resume_end(in_suspend ? | 354 | dpm_resume_end(in_suspend ? |
353 | (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE); | 355 | (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE); |
356 | set_gfp_allowed_mask(saved_mask); | ||
354 | resume_console(); | 357 | resume_console(); |
355 | Close: | 358 | Close: |
356 | platform_end(platform_mode); | 359 | platform_end(platform_mode); |
@@ -445,14 +448,17 @@ static int resume_target_kernel(bool platform_mode) | |||
445 | int hibernation_restore(int platform_mode) | 448 | int hibernation_restore(int platform_mode) |
446 | { | 449 | { |
447 | int error; | 450 | int error; |
451 | gfp_t saved_mask; | ||
448 | 452 | ||
449 | pm_prepare_console(); | 453 | pm_prepare_console(); |
450 | suspend_console(); | 454 | suspend_console(); |
455 | saved_mask = clear_gfp_allowed_mask(GFP_IOFS); | ||
451 | error = dpm_suspend_start(PMSG_QUIESCE); | 456 | error = dpm_suspend_start(PMSG_QUIESCE); |
452 | if (!error) { | 457 | if (!error) { |
453 | error = resume_target_kernel(platform_mode); | 458 | error = resume_target_kernel(platform_mode); |
454 | dpm_resume_end(PMSG_RECOVER); | 459 | dpm_resume_end(PMSG_RECOVER); |
455 | } | 460 | } |
461 | set_gfp_allowed_mask(saved_mask); | ||
456 | resume_console(); | 462 | resume_console(); |
457 | pm_restore_console(); | 463 | pm_restore_console(); |
458 | return error; | 464 | return error; |
@@ -466,6 +472,7 @@ int hibernation_restore(int platform_mode) | |||
466 | int hibernation_platform_enter(void) | 472 | int hibernation_platform_enter(void) |
467 | { | 473 | { |
468 | int error; | 474 | int error; |
475 | gfp_t saved_mask; | ||
469 | 476 | ||
470 | if (!hibernation_ops) | 477 | if (!hibernation_ops) |
471 | return -ENOSYS; | 478 | return -ENOSYS; |
@@ -481,6 +488,7 @@ int hibernation_platform_enter(void) | |||
481 | 488 | ||
482 | entering_platform_hibernation = true; | 489 | entering_platform_hibernation = true; |
483 | suspend_console(); | 490 | suspend_console(); |
491 | saved_mask = clear_gfp_allowed_mask(GFP_IOFS); | ||
484 | error = dpm_suspend_start(PMSG_HIBERNATE); | 492 | error = dpm_suspend_start(PMSG_HIBERNATE); |
485 | if (error) { | 493 | if (error) { |
486 | if (hibernation_ops->recover) | 494 | if (hibernation_ops->recover) |
@@ -518,6 +526,7 @@ int hibernation_platform_enter(void) | |||
518 | Resume_devices: | 526 | Resume_devices: |
519 | entering_platform_hibernation = false; | 527 | entering_platform_hibernation = false; |
520 | dpm_resume_end(PMSG_RESTORE); | 528 | dpm_resume_end(PMSG_RESTORE); |
529 | set_gfp_allowed_mask(saved_mask); | ||
521 | resume_console(); | 530 | resume_console(); |
522 | 531 | ||
523 | Close: | 532 | Close: |
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 6f10dfc2d3e9..44cce10b582d 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
@@ -189,6 +189,7 @@ static int suspend_enter(suspend_state_t state) | |||
189 | int suspend_devices_and_enter(suspend_state_t state) | 189 | int suspend_devices_and_enter(suspend_state_t state) |
190 | { | 190 | { |
191 | int error; | 191 | int error; |
192 | gfp_t saved_mask; | ||
192 | 193 | ||
193 | if (!suspend_ops) | 194 | if (!suspend_ops) |
194 | return -ENOSYS; | 195 | return -ENOSYS; |
@@ -199,6 +200,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
199 | goto Close; | 200 | goto Close; |
200 | } | 201 | } |
201 | suspend_console(); | 202 | suspend_console(); |
203 | saved_mask = clear_gfp_allowed_mask(GFP_IOFS); | ||
202 | suspend_test_start(); | 204 | suspend_test_start(); |
203 | error = dpm_suspend_start(PMSG_SUSPEND); | 205 | error = dpm_suspend_start(PMSG_SUSPEND); |
204 | if (error) { | 206 | if (error) { |
@@ -215,6 +217,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
215 | suspend_test_start(); | 217 | suspend_test_start(); |
216 | dpm_resume_end(PMSG_RESUME); | 218 | dpm_resume_end(PMSG_RESUME); |
217 | suspend_test_finish("resume devices"); | 219 | suspend_test_finish("resume devices"); |
220 | set_gfp_allowed_mask(saved_mask); | ||
218 | resume_console(); | 221 | resume_console(); |
219 | Close: | 222 | Close: |
220 | if (suspend_ops->end) | 223 | if (suspend_ops->end) |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0734bedabd9c..298f307c63a1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -76,6 +76,31 @@ unsigned long totalreserve_pages __read_mostly; | |||
76 | int percpu_pagelist_fraction; | 76 | int percpu_pagelist_fraction; |
77 | gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK; | 77 | gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK; |
78 | 78 | ||
79 | #ifdef CONFIG_PM_SLEEP | ||
80 | /* | ||
81 | * The following functions are used by the suspend/hibernate code to temporarily | ||
82 | * change gfp_allowed_mask in order to avoid using I/O during memory allocations | ||
83 | * while devices are suspended. To avoid races with the suspend/hibernate code, | ||
84 | * they should always be called with pm_mutex held (gfp_allowed_mask also should | ||
85 | * only be modified with pm_mutex held, unless the suspend/hibernate code is | ||
86 | * guaranteed not to run in parallel with that modification). | ||
87 | */ | ||
88 | void set_gfp_allowed_mask(gfp_t mask) | ||
89 | { | ||
90 | WARN_ON(!mutex_is_locked(&pm_mutex)); | ||
91 | gfp_allowed_mask = mask; | ||
92 | } | ||
93 | |||
94 | gfp_t clear_gfp_allowed_mask(gfp_t mask) | ||
95 | { | ||
96 | gfp_t ret = gfp_allowed_mask; | ||
97 | |||
98 | WARN_ON(!mutex_is_locked(&pm_mutex)); | ||
99 | gfp_allowed_mask &= ~mask; | ||
100 | return ret; | ||
101 | } | ||
102 | #endif /* CONFIG_PM_SLEEP */ | ||
103 | |||
79 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE | 104 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE |
80 | int pageblock_order __read_mostly; | 105 | int pageblock_order __read_mostly; |
81 | #endif | 106 | #endif |