From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754489AbbHXMLa (ORCPT ); Mon, 24 Aug 2015 08:11:30 -0400 Received: from outbound-smtp03.blacknight.com ([81.17.249.16]:37875 "EHLO outbound-smtp03.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754212AbbHXMJz (ORCPT ); Mon, 24 Aug 2015 08:09:55 -0400 From: Mel Gorman To: Andrew Morton Cc: Johannes Weiner , Rik van Riel , Vlastimil Babka , David Rientjes , Joonsoo Kim , Michal Hocko , Linux-MM , LKML , Mel Gorman Subject: [PATCH 05/12] mm, page_alloc: Remove unecessary recheck of nodemask Date: Mon, 24 Aug 2015 13:09:44 +0100 Message-Id: <1440418191-10894-6-git-send-email-mgorman@techsingularity.net> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1440418191-10894-1-git-send-email-mgorman@techsingularity.net> References: <1440418191-10894-1-git-send-email-mgorman@techsingularity.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An allocation request will either use the given nodemask or the cpuset current tasks mems_allowed. A cpuset retry will recheck the callers nodemask and while it's trivial overhead during an extremely rare operation, also unnecessary. This patch fixes it. Signed-off-by: Mel Gorman --- mm/page_alloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2c1c3bf54d15..32d1cec124bc 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3171,7 +3171,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, gfp_t alloc_mask; /* The gfp_t that was actually used for allocation */ struct alloc_context ac = { .high_zoneidx = gfp_zone(gfp_mask), - .nodemask = nodemask, + .nodemask = nodemask ? : &cpuset_current_mems_allowed, .migratetype = gfpflags_to_migratetype(gfp_mask), }; @@ -3206,8 +3206,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, /* The preferred zone is used for statistics later */ preferred_zoneref = first_zones_zonelist(ac.zonelist, ac.high_zoneidx, - ac.nodemask ? : &cpuset_current_mems_allowed, - &ac.preferred_zone); + ac.nodemask, &ac.preferred_zone); if (!ac.preferred_zone) goto out; ac.classzone_idx = zonelist_zone_idx(preferred_zoneref); -- 2.4.6