[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.0801071203070.24592@schroedinger.engr.sgi.com>
Date: Mon, 7 Jan 2008 12:04:06 -0800 (PST)
From: Christoph Lameter <clameter@....com>
To: Dhaval Giani <dhaval@...ux.vnet.ibm.com>
cc: Andrew Morton <akpm@...ux-foundation.org>, htejun@...il.com,
Srivatsa Vaddagiri <vatsa@...ux.vnet.ibm.com>,
Balbir Singh <balbir@...ibm.com>, maneesh@...ux.vnet.ibm.com,
lkml <linux-kernel@...r.kernel.org>, linux-mm@...ck.org
Subject: Re: 2.6.22-stable causes oomkiller to be invoked
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@....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);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists