Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752896Ab1DZJhV (ORCPT ); Tue, 26 Apr 2011 05:37:21 -0400 Received: from mga02.intel.com ([134.134.136.20]:65226 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590Ab1DZJhU (ORCPT ); Tue, 26 Apr 2011 05:37:20 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.64,267,1301900400"; d="scan'208";a="738470185" Date: Tue, 26 Apr 2011 17:37:17 +0800 From: Wu Fengguang To: Andrew Morton Cc: Dave Young , linux-mm , Linux Kernel Mailing List , Minchan Kim , KOSAKI Motohiro , Mel Gorman Subject: [PATCH] mm: readahead page allocations are OK to fail Message-ID: <20110426093717.GA28812@localhost> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1740 Lines: 45 Pass __GFP_NORETRY|__GFP_NOWARN for readahead page allocations. readahead page allocations are completely optional. They are OK to fail and in particular shall not trigger OOM on themselves. Reported-by: Dave Young Reviewed-by: Minchan Kim Reviewed-by: KOSAKI Motohiro Signed-off-by: Wu Fengguang --- include/linux/pagemap.h | 6 ++++++ mm/readahead.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) --- linux-next.orig/include/linux/pagemap.h 2011-04-26 14:27:46.000000000 +0800 +++ linux-next/include/linux/pagemap.h 2011-04-26 17:17:13.000000000 +0800 @@ -219,6 +219,12 @@ static inline struct page *page_cache_al return __page_cache_alloc(mapping_gfp_mask(x)|__GFP_COLD); } +static inline struct page *page_cache_alloc_readahead(struct address_space *x) +{ + return __page_cache_alloc(mapping_gfp_mask(x) | + __GFP_COLD | __GFP_NORETRY | __GFP_NOWARN); +} + typedef int filler_t(void *, struct page *); extern struct page * find_get_page(struct address_space *mapping, --- linux-next.orig/mm/readahead.c 2011-04-26 14:27:02.000000000 +0800 +++ linux-next/mm/readahead.c 2011-04-26 17:17:25.000000000 +0800 @@ -180,7 +180,7 @@ __do_page_cache_readahead(struct address if (page) continue; - page = page_cache_alloc_cold(mapping); + page = page_cache_alloc_readahead(mapping); if (!page) break; page->index = page_offset; -- 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/