From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail144.messagelabs.com (mail144.messagelabs.com [216.82.254.51]) by kanga.kvack.org (Postfix) with ESMTP id 533DA6B0011 for ; Wed, 1 Jun 2011 06:04:34 -0400 (EDT) Received: by wyf19 with SMTP id 19so5196464wyf.14 for ; Wed, 01 Jun 2011 03:04:30 -0700 (PDT) From: Dmitry Eremin-Solenikov Subject: [PATCH] Make GFP_DMA allocations w/o ZONE_DMA emit a warning instead of failing Date: Wed, 1 Jun 2011 14:04:32 +0400 Message-Id: <1306922672-9012-1-git-send-email-dbaryshkov@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, David Rientjes , Russell King - ARM Linux , Mel Gorman , KOSAKI Motohiro , KAMEZAWA Hiroyuki , Rik van Riel , Andrew Morton Please be more polite to other people. After a197b59ae6 all allocations with GFP_DMA set on nodes without ZONE_DMA fail nearly silently (only one warning during bootup is emited, no matter how many things fail). This is a very crude change on behaviour. To be more civil, instead of failing emit noisy warnings each time smbd. tries to allocate a GFP_DMA memory on non-ZONE_DMA node. This change should be reverted after one or two major releases, but we should be more accurate rather than hoping for the best. Signed-off-by: Dmitry Eremin-Solenikov Cc: David Rientjes Cc: Russell King - ARM Linux Cc: Mel Gorman Cc: KOSAKI Motohiro Cc: KAMEZAWA Hiroyuki Cc: Rik van Riel Cc: Andrew Morton --- mm/page_alloc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a4e1db3..e22dd4e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2248,8 +2248,9 @@ __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; + /* Change this back to hard failure after 3.0 or 3.1. For now give + * drivers people a chance to fix their drivers w/o causing breakage. */ + WARN_ON(gfp_mask & __GFP_DMA); #endif /* -- 1.7.4.4 -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org