Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755516AbYAHEf3 (ORCPT ); Mon, 7 Jan 2008 23:35:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753963AbYAHEfS (ORCPT ); Mon, 7 Jan 2008 23:35:18 -0500 Received: from E23SMTP02.au.ibm.com ([202.81.18.163]:34307 "EHLO e23smtp02.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753817AbYAHEfP (ORCPT ); Mon, 7 Jan 2008 23:35:15 -0500 Date: Tue, 8 Jan 2008 10:03:48 +0530 From: Dhaval Giani To: Christoph Lameter Cc: Andrew Morton , htejun@gmail.com, Srivatsa Vaddagiri , Balbir Singh , maneesh@linux.vnet.ibm.com, lkml , linux-mm@kvack.org 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: User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1832 Lines: 52 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 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/