The patch titled
pm/suspend: do not shrink memory before suspend
has been added to the -mm tree. Its filename is
pm-suspend-do-not-shrink-memory-before-suspend.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pm/suspend: do not shrink memory before suspend
From: Rafael J. Wysocki <rjw@xxxxxxx>
Remove the shrinking of memory from the suspend-to-RAM code, where it is
not really necessary.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Nigel Cunningham <nigel@xxxxxxxxxxxx>
Acked-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/main.c | 20 +-------------------
mm/vmscan.c | 4 ++--
2 files changed, 3 insertions(+), 21 deletions(-)
diff -puN kernel/power/main.c~pm-suspend-do-not-shrink-memory-before-suspend kernel/power/main.c
--- a/kernel/power/main.c~pm-suspend-do-not-shrink-memory-before-suspend
+++ a/kernel/power/main.c
@@ -188,9 +188,6 @@ static void suspend_test_finish(const ch
#endif
-/* This is just an arbitrary number */
-#define FREE_PAGE_NUMBER (100)
-
static struct platform_suspend_ops *suspend_ops;
/**
@@ -226,7 +223,6 @@ int suspend_valid_only_mem(suspend_state
static int suspend_prepare(void)
{
int error;
- unsigned int free_pages;
if (!suspend_ops || !suspend_ops->enter)
return -EPERM;
@@ -241,24 +237,10 @@ static int suspend_prepare(void)
if (error)
goto Finish;
- if (suspend_freeze_processes()) {
- error = -EAGAIN;
- goto Thaw;
- }
-
- free_pages = global_page_state(NR_FREE_PAGES);
- if (free_pages < FREE_PAGE_NUMBER) {
- pr_debug("PM: free some memory\n");
- shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
- if (nr_free_pages() < FREE_PAGE_NUMBER) {
- error = -ENOMEM;
- printk(KERN_ERR "PM: No enough memory\n");
- }
- }
+ error = suspend_freeze_processes();
if (!error)
return 0;
- Thaw:
suspend_thaw_processes();
usermodehelper_enable();
Finish:
diff -puN mm/vmscan.c~pm-suspend-do-not-shrink-memory-before-suspend mm/vmscan.c
--- a/mm/vmscan.c~pm-suspend-do-not-shrink-memory-before-suspend
+++ a/mm/vmscan.c
@@ -2105,7 +2105,7 @@ unsigned long global_lru_pages(void)
+ global_page_state(NR_INACTIVE_FILE);
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_HIBERNATION
/*
* Helper function for shrink_all_memory(). Tries to reclaim 'nr_pages' pages
* from LRU lists system-wide, for given pass and priority.
@@ -2245,7 +2245,7 @@ out:
return sc.nr_reclaimed;
}
-#endif
+#endif /* CONFIG_HIBERNATION */
/* It's optimal to keep kswapds on the same CPUs as their memory, but
not required for correctness. So if the last cpu in a node goes
_
Patches currently in -mm which might be from rjw@xxxxxxx are
linux-next.patch
devpts-correctly-set-default-options.patch
mm-pm-freezer-disable-oom-killer-when-tasks-are-frozen.patch
pm-suspend-do-not-shrink-memory-before-suspend.patch
pm-hibernate-move-memory-shrinking-to-snapshotc-rev-2.patch
pm-hibernate-rework-shrinking-of-memory.patch
pm-hibernate-do-not-release-preallocated-memory-unnecessarily-rev-2.patch
pm-hibernate-do-not-try-to-allocate-too-much-memory-too-hard.patch
shrink_slab-handle-bad-shrinkers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
