From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752718AbcD0MYu (ORCPT ); Wed, 27 Apr 2016 08:24:50 -0400 Received: from outbound-smtp03.blacknight.com ([81.17.249.16]:53238 "EHLO outbound-smtp03.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752663AbcD0MYs (ORCPT ); Wed, 27 Apr 2016 08:24:48 -0400 From: Mel Gorman To: Andrew Morton Cc: Vlastimil Babka , Jesper Dangaard Brouer , Linux-MM , LKML , Mel Gorman Subject: [PATCH 2/4] mm, page_alloc: inline the fast path of the zonelist iterator -fix Date: Wed, 27 Apr 2016 13:24:43 +0100 Message-Id: <1461759885-17163-3-git-send-email-mgorman@techsingularity.net> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1461759885-17163-1-git-send-email-mgorman@techsingularity.net> References: <1461759885-17163-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 the nodes allowed by a cpuset are not reread if the nodemask changes during an allocation. This potentially allows an unnecessary page allocation failure. Moving the retry_cpuset label is insufficient but rereading the nodemask before retrying addresses the problem. This is a fix to the mmotm patch mm-page_alloc-inline-the-fast-path-of-the-zonelist-iterator.patch . Suggested-by: Vlastimil Babka Signed-off-by: Mel Gorman --- mm/page_alloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d8383750bd43..45a36e98b9cb 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3855,6 +3855,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, */ if (unlikely(!page && read_mems_allowed_retry(cpuset_mems_cookie))) { alloc_mask = gfp_mask; + ac.nodemask = &cpuset_current_mems_allowed; goto retry_cpuset; } -- 2.6.4