From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1756004AbZEBLr3@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756004AbZEBLr3 (ORCPT <rfc822;w@1wt.eu>);
	Sat, 2 May 2009 07:47:29 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754405AbZEBLrU
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 2 May 2009 07:47:20 -0400
Received: from ogre.sisk.pl ([217.79.144.158]:58656 "EHLO ogre.sisk.pl"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754317AbZEBLrT (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sat, 2 May 2009 07:47:19 -0400
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH 3/3] PM/Hibernate: Use memory allocations to free memory
Date: Sat, 2 May 2009 13:46:34 +0200
User-Agent: KMail/1.11.2 (Linux/2.6.30-rc4-rjw; KDE/4.2.2; x86_64; ; )
Cc: pavel@ucw.cz, torvalds@linux-foundation.org, jens.axboe@oracle.com,
       alan-jenkins@tuffmail.co.uk, linux-kernel@vger.kernel.org,
       kernel-testers@vger.kernel.org, linux-pm@lists.linux-foundation.org
References: <nY3-4PrO6XH.A.xtB.yw85JB@chimera> <200905020029.39181.rjw@sisk.pl> <20090501161423.94b37d5b.akpm@linux-foundation.org>
In-Reply-To: <20090501161423.94b37d5b.akpm@linux-foundation.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200905021346.34967.rjw@sisk.pl>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Saturday 02 May 2009, Andrew Morton wrote:
> On Sat, 2 May 2009 00:29:38 +0200
> "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> 
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> > 
> > Modify the hibernation memory shrinking code so that it will make
> > memory allocations to free memory instead of using an artificial
> > memory shrinking mechanism for that.  Remove the shrinking of
> > memory from the suspend-to-RAM code, where it is not really
> > necessary.  Finally, remove the no longer used memory shrinking
> > functions from mm/vmscan.c .
> > 
> > ...
> >
> > +static long alloc_and_mark_pages(struct memory_bitmap *bm, long nr_pages)
> >  {
> > -	if (tmp > SHRINK_BITE)
> > -		tmp = SHRINK_BITE;
> > -	return shrink_all_memory(tmp);
> > +	long nr_normal = 0;
> > +
> > +	while (nr_pages-- > 0) {
> > +		struct page *page;
> > +
> > +		page = alloc_page(GFP_KERNEL | __GFP_HIGHMEM);
> > +		if (!page)
> > +			return -ENOMEM;
> > +		memory_bm_set_bit(bm, page_to_pfn(page));
> > +		if (!PageHighMem(page))
> > +			nr_normal++;
> > +	}
> > +
> > +	return nr_normal;
> >  }
> 
> Do we need the bitmap?  I expect we can just string all these pages
> onto a local list via page.lru.  Would need to check that - the
> pageframe fields are quite overloaded.

This is the reason why we use the bitmaps for hibernation. :-)

> > ...
> >
> > +#define SHRINK_BITE	10000
> > +		long size, highmem_size, ret;
> > +
> > +		highmem_size = count_highmem_pages() - 2 * alloc_highmem;
> > +		size = count_data_pages() + PAGES_FOR_IO + SPARE_PAGES
> > +			- 2 * alloc_normal;
> 
> It'd be nice if this head-spinning arithmetic were spelled out in a
> comment somewhere.  There are rather a lot of magic-number heuristics
> in here.

Well, yeah.  I'll try to write up something. :-)

> >  		tmp = size;
> >  		size += highmem_size;
> >  		for_each_populated_zone(zone) {
> > @@ -621,27 +671,39 @@ int swsusp_shrink_memory(void)
> 
> All looks pretty sane to me.

Great, thanks for the comments!