[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.0712191511310.2001@schroedinger.engr.sgi.com>
Date: Wed, 19 Dec 2007 15:22:08 -0800 (PST)
From: Christoph Lameter <clameter@....com>
To: "Rafael J. Wysocki" <rjw@...k.pl>
cc: Daniel Walker <dwalker@...sta.com>,
Miles Lane <miles.lane@...il.com>,
Pavel Machek <pavel@...e.cz>,
linux-pm@...ts.linux-foundation.org,
LKML <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: 2.6.24-rc5-mm1 -- inconsistent {in-hardirq-W} -> {hardirq-on-W}
usage -- pm-hibernate/9940 [HC0[0]:SC0[0]:HE1:SE1]
On Thu, 20 Dec 2007, Rafael J. Wysocki wrote:
> > We could reexport drain_local_pages() again but then I do not understand
> > why we would only drain the pages of this processor and not of all other
> > processors as well. It seems that software suspend intend was to flush
> > them all right?
>
> Well, not exactly. We are on one CPU at this point, the others have been
> disabled.
Ok so the others are flush. Here is a patch to re-export
drain_local_pages() again and use it for software suspend:
Signed-off-by: Christoph Lameter <clameter@....com>
---
include/linux/gfp.h | 1 +
kernel/power/snapshot.c | 2 +-
mm/page_alloc.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
Index: linux-2.6.24-rc5-mm1/kernel/power/snapshot.c
===================================================================
--- linux-2.6.24-rc5-mm1.orig/kernel/power/snapshot.c 2007-12-19 11:59:25.233961700 -0800
+++ linux-2.6.24-rc5-mm1/kernel/power/snapshot.c 2007-12-19 15:16:34.179661929 -0800
@@ -1203,7 +1203,7 @@ asmlinkage int swsusp_save(void)
printk(KERN_INFO "PM: Creating hibernation image: \n");
- drain_all_pages();
+ drain_local_pages(NULL);
nr_pages = count_data_pages();
nr_highmem = count_highmem_pages();
printk(KERN_INFO "PM: Need to copy %u pages\n", nr_pages + nr_highmem);
Index: linux-2.6.24-rc5-mm1/mm/page_alloc.c
===================================================================
--- linux-2.6.24-rc5-mm1.orig/mm/page_alloc.c 2007-12-19 12:01:00.630421258 -0800
+++ linux-2.6.24-rc5-mm1/mm/page_alloc.c 2007-12-19 15:12:19.850545818 -0800
@@ -930,7 +930,7 @@ static void drain_pages(unsigned int cpu
/*
* Spill all of this CPU's per-cpu pages back into the buddy allocator.
*/
-static void drain_local_pages(void *arg)
+void drain_local_pages(void *arg)
{
drain_pages(smp_processor_id());
}
Index: linux-2.6.24-rc5-mm1/include/linux/gfp.h
===================================================================
--- linux-2.6.24-rc5-mm1.orig/include/linux/gfp.h 2007-12-19 15:13:51.926950065 -0800
+++ linux-2.6.24-rc5-mm1/include/linux/gfp.h 2007-12-19 15:16:11.951564369 -0800
@@ -229,5 +229,6 @@ extern void FASTCALL(free_cold_page(stru
void page_alloc_init(void);
void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp);
void drain_all_pages(void);
+void drain_local_pages(void *dummy);
#endif /* __LINUX_GFP_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists