[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20110601154154.GB26197@atrey.karlin.mff.cuni.cz>
Date: Wed, 1 Jun 2011 17:41:54 +0200
From: Cyril Hrubis <metan@....cz>
To: pavel@....cz, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, eric.y.miao@...il.com,
utx@...guin.cz, zaurus-devel@...ts.linuxtogo.org,
marek.vasut@...il.com
Subject: zaurus 3.0-rc1 Oops (fail GFP_DMA allocations when ZONE_DMA is not
configured)
Hi!
The 3.0-rc1 no longer boots on spitz see the attached Oops.
The bisecting pointed to this commit, reverting it machine boots again.
commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac
Author: David Rientjes <rientjes@...gle.com>
Date: Tue May 24 17:12:35 2011 -0700
mm: fail GFP_DMA allocations when ZONE_DMA is not configured
The page allocator will improperly return a page from ZONE_NORMAL even
when __GFP_DMA is passed if CONFIG_ZONE_DMA is disabled. The caller
expects DMA memory, perhaps for ISA devices with 16-bit address registers,
and may get higher memory resulting in undefined behavior.
This patch causes the page allocator to return NULL in such circumstances
with a warning emitted to the kernel log on the first occurrence.
Signed-off-by: David Rientjes <rientjes@...gle.com>
Cc: Mel Gorman <mel@....ul.ie>
Cc: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Cc: Rik van Riel <riel@...hat.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 01e6b61..10a8c6d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2247,6 +2247,10 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
if (should_fail_alloc_page(gfp_mask, order))
return NULL;
+#ifndef CONFIG_ZONE_DMA
+ if (WARN_ON_ONCE(gfp_mask & __GFP_DMA))
+ return NULL;
+#endif
/*
* Check the zones suitable for the gfp_mask contain at least one
--
metan
View attachment "oops.txt" of type "text/plain" (4259 bytes)
Powered by blists - more mailing lists