From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753400AbcD0O6J (ORCPT ); Wed, 27 Apr 2016 10:58:09 -0400 Received: from outbound-smtp03.blacknight.com ([81.17.249.16]:46622 "EHLO outbound-smtp03.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753083AbcD0O52 (ORCPT ); Wed, 27 Apr 2016 10:57:28 -0400 From: Mel Gorman To: Andrew Morton Cc: Vlastimil Babka , Jesper Dangaard Brouer , Linux-MM , LKML , Mel Gorman Subject: [PATCH 2/6] mm, page_alloc: move might_sleep_if check to the allocator slowpath -revert Date: Wed, 27 Apr 2016 15:57:19 +0100 Message-Id: <1461769043-28337-3-git-send-email-mgorman@techsingularity.net> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1461769043-28337-1-git-send-email-mgorman@techsingularity.net> References: <1461769043-28337-1-git-send-email-mgorman@techsingularity.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Vlastimil Babka pointed out that a patch weakens a zone_reclaim test which while "safe" defeats the purposes of the debugging check. As most configurations eliminate this check anyway, I thought it was better to simply revert the patch instead of adding a second check in zone_reclaim. This is a revert of the mmotm patch mm-page_alloc-move-might_sleep_if-check-to-the-allocator-slowpath.patch . Suggested-by: Vlastimil Babka Signed-off-by: Mel Gorman --- mm/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d8383750bd43..9ad4e68486e9 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3606,8 +3606,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, return NULL; } - might_sleep_if(gfp_mask & __GFP_DIRECT_RECLAIM); - /* * We also sanity check to catch abuse of atomic reserves being used by * callers that are not in atomic context. @@ -3806,6 +3804,8 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, lockdep_trace_alloc(gfp_mask); + might_sleep_if(gfp_mask & __GFP_DIRECT_RECLAIM); + if (should_fail_alloc_page(gfp_mask, order)) return NULL; -- 2.6.4