From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.18.234]) by e23smtp03.au.ibm.com (8.13.1/8.13.1) with ESMTP id m084XWfo003234 for ; Tue, 8 Jan 2008 15:33:32 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m084Xw472367668 for ; Tue, 8 Jan 2008 15:33:58 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m084XwA7022427 for ; Tue, 8 Jan 2008 15:33:58 +1100 Date: Tue, 8 Jan 2008 10:03:48 +0530 From: Dhaval Giani Subject: Re: 2.6.22-stable causes oomkiller to be invoked Message-ID: <20080108043348.GB5393@linux.vnet.ibm.com> Reply-To: Dhaval Giani References: <20071221044508.GA11996@linux.vnet.ibm.com> <20071228101109.GB5083@linux.vnet.ibm.com> <20080103035942.GB26166@linux.vnet.ibm.com> <20080103041606.GC26166@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: owner-linux-mm@kvack.org Return-Path: To: Christoph Lameter Cc: Andrew Morton , htejun@gmail.com, Srivatsa Vaddagiri , Balbir Singh , maneesh@linux.vnet.ibm.com, lkml , linux-mm@kvack.org List-ID: On Mon, Jan 07, 2008 at 12:04:06PM -0800, Christoph Lameter wrote: > Here is the cleaned version of the patch. Dhaval is testing it. > > > quicklists: Only consider memory that can be used with GFP_KERNEL > > Quicklists calculates the size of the quicklists based on the number > of free pages. This must be the number of free pages that can be > allocated with GFP_KERNEL. node_page_state() includes the pages in > ZONE_HIGHMEM and ZONE_MOVABLE which may lead the quicklists to > become too large causing OOM. > > Signed-off-by: Christoph Lameter Does the job here for me. Tested-by: Dhaval Giani > > Index: linux-2.6/mm/quicklist.c > =================================================================== > --- linux-2.6.orig/mm/quicklist.c 2008-01-07 10:38:13.000000000 -0800 > +++ linux-2.6/mm/quicklist.c 2008-01-07 10:38:44.000000000 -0800 > @@ -26,9 +26,17 @@ DEFINE_PER_CPU(struct quicklist, quickli > static unsigned long max_pages(unsigned long min_pages) > { > unsigned long node_free_pages, max; > + struct zone *zones = NODE_DATA(numa_node_id())->node_zones; > + > + node_free_pages = > +#ifdef CONFIG_ZONE_DMA > + zone_page_state(&zones[ZONE_DMA], NR_FREE_PAGES) + > +#endif > +#ifdef CONFIG_ZONE_DMA32 > + zone_page_state(&zones[ZONE_DMA32], NR_FREE_PAGES) + > +#endif > + zone_page_state(&zones[ZONE_NORMAL], NR_FREE_PAGES); > > - node_free_pages = node_page_state(numa_node_id(), > - NR_FREE_PAGES); > max = node_free_pages / FRACTION_OF_NODE_MEM; > return max(max, min_pages); > } -- regards, Dhaval -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org