Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758371AbZJPKiL (ORCPT ); Fri, 16 Oct 2009 06:38:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757514AbZJPKiK (ORCPT ); Fri, 16 Oct 2009 06:38:10 -0400 Received: from gir.skynet.ie ([193.1.99.77]:48123 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757911AbZJPKiH (ORCPT ); Fri, 16 Oct 2009 06:38:07 -0400 From: Mel Gorman To: Andrew Morton , stable Cc: "Rafael J. Wysocki" , David Miller , Frans Pop , reinette chatre , Kalle Valo , "John W. Linville" , Pekka Enberg , Bartlomiej Zolnierkiewicz , Karol Lewandowski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "linux-mm@kvack.org\"" , Mel Gorman Subject: [PATCH 2/2] page allocator: Direct reclaim should always obey watermarks Date: Fri, 16 Oct 2009 11:37:26 +0100 Message-Id: <1255689446-3858-3-git-send-email-mel@csn.ul.ie> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1255689446-3858-1-git-send-email-mel@csn.ul.ie> References: <1255689446-3858-1-git-send-email-mel@csn.ul.ie> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1180 Lines: 33 ALLOC_NO_WATERMARKS should be cleared when trying to allocate from the free-lists after a direct reclaim. If it's not, __GFP_NOFAIL allocations from a process that is exiting can ignore watermarks. __GFP_NOFAIL is not often used but the journal layer is one of those places. This is suspected of causing an increase in the number of GFP_ATOMIC allocation failures reported. Signed-off-by: Mel Gorman --- mm/page_alloc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index dfa4362..a3e5fed 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1860,7 +1860,8 @@ rebalance: page = __alloc_pages_direct_reclaim(gfp_mask, order, zonelist, high_zoneidx, nodemask, - alloc_flags, preferred_zone, + alloc_flags & ~ALLOC_NO_WATERMARKS, + preferred_zone, migratetype, &did_some_progress); if (page) goto got_pg; -- 1.6.3.3 -- 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/