From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF006C432C0 for ; Thu, 21 Nov 2019 15:21:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AA5D220692 for ; Thu, 21 Nov 2019 15:21:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA5D220692 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.page Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 61E566B032D; Thu, 21 Nov 2019 10:21:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CE1D6B0340; Thu, 21 Nov 2019 10:21:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E5906B0341; Thu, 21 Nov 2019 10:21:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0134.hostedemail.com [216.40.44.134]) by kanga.kvack.org (Postfix) with ESMTP id 398386B032D for ; Thu, 21 Nov 2019 10:21:25 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id ED8B1180AD806 for ; Thu, 21 Nov 2019 15:21:24 +0000 (UTC) X-FDA: 76180648488.25.music31_639e201031a11 X-HE-Tag: music31_639e201031a11 X-Filterd-Recvd-Size: 2623 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Thu, 21 Nov 2019 15:21:24 +0000 (UTC) X-Originating-IP: 153.3.140.100 Received: from localhost.localdomain.localdomain (unknown [153.3.140.100]) (Authenticated sender: fly@kernel.page) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id CFACD1C0014; Thu, 21 Nov 2019 15:21:15 +0000 (UTC) From: Pengfei Li To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, mhocko@kernel.org, vbabka@suse.cz, cl@linux.com, iamjoonsoo.kim@lge.com, guro@fb.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [RFC v1 11/19] mm, mempolicy: use first_node in mempolicy_slab_node() Date: Thu, 21 Nov 2019 23:18:03 +0800 Message-Id: <20191121151811.49742-12-fly@kernel.page> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191121151811.49742-1-fly@kernel.page> References: <20191121151811.49742-1-fly@kernel.page> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: In mempolicy_slab_node(), we want to access first node instead of first zone, so use first_node_nlist instead of first_zone_nlist. Signed-off-by: Pengfei Li --- mm/mempolicy.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index b1df19d42047..66184add1627 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1855,8 +1855,10 @@ static unsigned interleave_nodes(struct mempolicy = *policy) */ unsigned int mempolicy_slab_node(void) { - struct mempolicy *policy; int node =3D numa_mem_id(); + struct mempolicy *policy; + struct nodelist *nodelist; + int first_node; =20 if (in_interrupt()) return node; @@ -1876,18 +1878,16 @@ unsigned int mempolicy_slab_node(void) return interleave_nodes(policy); =20 case MPOL_BIND: { - struct zone *zone; - /* * Follow bind policy behavior and start allocation at the * first node. */ - struct nodelist *nodelist; - enum zone_type highest_zoneidx =3D gfp_zone(GFP_KERNEL); - nodelist =3D &NODE_DATA(node)->node_nodelists[NODELIST_FALLBACK]; - zone =3D first_zone_nlist_nodemask(nodelist, highest_zoneidx, - &policy->v.nodes); - return zone ? zone_to_nid(zone) : node; + nodelist =3D node_nodelist(node, GFP_KERNEL); + + first_node =3D first_node_nlist_nodemask(nodelist, + gfp_zone(GFP_KERNEL), &policy->v.nodes); + + return (first_node !=3D NUMA_NO_NODE) ? first_node : node; } =20 default: --=20 2.23.0