Messages in this thread | | | Date | Tue, 8 Jan 2008 10:03:48 +0530 | From | Dhaval Giani <> | Subject | Re: 2.6.22-stable causes oomkiller to be invoked |
| |
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 <clameter@sgi.com>
Does the job here for me.
Tested-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
> > 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
| |