Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937726AbXLTPql (ORCPT ); Thu, 20 Dec 2007 10:46:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964894AbXLTPZv (ORCPT ); Thu, 20 Dec 2007 10:25:51 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:42488 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934822AbXLTPZs (ORCPT ); Thu, 20 Dec 2007 10:25:48 -0500 From: "Rafael J. Wysocki" To: "Miles Lane" Subject: Re: 2.6.24-rc5-mm1 -- inconsistent {in-hardirq-W} -> {hardirq-on-W} usage -- pm-hibernate/9940 [HC0[0]:SC0[0]:HE1:SE1] Date: Thu, 20 Dec 2007 16:45:11 +0100 User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Cc: "Christoph Lameter" , "Daniel Walker" , "Pavel Machek" , linux-pm@lists.linux-foundation.org, LKML , "Andrew Morton" References: <200712200231.56128.rjw@sisk.pl> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200712201645.12346.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4136 Lines: 102 On Thursday, 20 of December 2007, Miles Lane wrote: > On Dec 19, 2007 8:31 PM, Rafael J. Wysocki wrote: > > > > On Thursday, 20 of December 2007, Miles Lane wrote: > > > On Dec 19, 2007 7:09 PM, Rafael J. Wysocki wrote: > > > > > > > On Thursday, 20 of December 2007, Christoph Lameter wrote: > > > > > 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 > > > > > > > > > > --- > > > > > 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); > > > > > > > > You've omitted the second instance, right before the copy_data_pages() > > > > call. > > > > > > > > > > I guess I will wait for a revised patch. > > > > There's an Andrew's fix on top of this one in -mm: > > http://marc.info/?l=linux-mm-commits&m=119810866812965&w=2 > > > > > > > > > > > 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 */ > > > > > > > > I applied Christoph and Andrew's patches and recompiled. I suspended > to disk and to ram several times and all looks good. OK, thanks for testing! Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/