On Fri, Oct 30, 2009 at 03:23:50PM +0100, Karol Lewandowski wrote: > On Wed, Oct 28, 2009 at 11:59:26AM +0000, Mel Gorman wrote: > > On Wed, Oct 28, 2009 at 12:42:08PM +0100, Karol Lewandowski wrote: > > > On Sat, Oct 24, 2009 at 02:46:56PM +0100, Mel LKML wrote: > > > I've tested patches 1+2+3+4 in my normal usage scenario (do some work, > > > suspend, do work, suspend, ...) and it failed today after 4 days (== 4 > > > suspend-resume cycles). > > > > > > I'll test 1-5 now. > > 2.6.32-rc5 with patches 1-5 fails too. > > > > Also, what was the behaviour of the e100 driver when suspending before > > this commit? > > > > 6905b1f1a03a48dcf115a2927f7b87dba8d5e566: Net / e100: Fix suspend of > > devices that cannot be power managed > > This was discussed before with e100 maintainers and Rafael. Reverting > this patch didn't change anything. >
Does applying the following on top make any difference? ==== CUT HERE ==== PM: Shrink memory before suspend This is a partial revert of c6f37f12197ac3bd2e5a35f2f0e195ae63d437de. It is an outside possibility for fixing the e100 bug where an order-5 allocation is failing during resume. The commit notes that the shrinking of memory should be unnecessary but maybe it is in error. Signed-off-by: Mel Gorman <[email protected]> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 6f10dfc..4f6ae64 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -23,6 +23,9 @@ const char *const pm_states[PM_SUSPEND_MAX] = { [PM_SUSPEND_MEM] = "mem", }; +/* This is just an arbitrary number */ +#define FREE_PAGE_NUMBER (100) + static struct platform_suspend_ops *suspend_ops; /** @@ -78,6 +81,7 @@ static int suspend_test(int level) static int suspend_prepare(void) { int error; + unsigned int free_pages; if (!suspend_ops || !suspend_ops->enter) return -EPERM; @@ -92,10 +96,24 @@ static int suspend_prepare(void) if (error) goto Finish; - error = suspend_freeze_processes(); + 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"); + } + } if (!error) return 0; + Thaw: suspend_thaw_processes(); usermodehelper_enable(); Finish: -- To unsubscribe from this list: send the line "unsubscribe kernel-testers" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
