From patchwork Fri Jun 19 16:24:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 11614609 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3017C90 for ; Fri, 19 Jun 2020 16:25:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 072662168B for ; Fri, 19 Jun 2020 16:25:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 072662168B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1CD6C8D00DD; Fri, 19 Jun 2020 12:24:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F12C18D00D8; Fri, 19 Jun 2020 12:24:35 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2F158D00DB; Fri, 19 Jun 2020 12:24:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0198.hostedemail.com [216.40.44.198]) by kanga.kvack.org (Postfix) with ESMTP id 59B0B8D00D9 for ; Fri, 19 Jun 2020 12:24:35 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 17D838248068 for ; Fri, 19 Jun 2020 16:24:35 +0000 (UTC) X-FDA: 76946484510.11.bait94_3412dbc26e1a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id D0A24180F8B81 for ; Fri, 19 Jun 2020 16:24:34 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,ben.widawsky@intel.com,,RULES_HIT:30054:30064,0,RBL:192.55.52.93:@intel.com:.lbl8.mailshell.net-64.95.201.95 62.50.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: bait94_3412dbc26e1a X-Filterd-Recvd-Size: 4035 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Fri, 19 Jun 2020 16:24:34 +0000 (UTC) IronPort-SDR: /rfga6gXLxwyKcDwp2xWvWQHOmEUNFkX4KFo08/fd2pV1qz8adFmWVm3ey6t1wvnI2NefHkEes qqRF5XTXp6ow== X-IronPort-AV: E=McAfee;i="6000,8403,9657"; a="141280161" X-IronPort-AV: E=Sophos;i="5.75,255,1589266800"; d="scan'208";a="141280161" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 09:24:30 -0700 IronPort-SDR: CIS2KgrKNmpUS6tATDa22F3Iyecz0H33xs2Os1+F42E7/VBfWybMoMK9CqxNo6WeZE6KHYpury AMfRDuReq+OA== X-IronPort-AV: E=Sophos;i="5.75,255,1589266800"; d="scan'208";a="264368267" Received: from sjiang-mobl2.ccr.corp.intel.com (HELO bwidawsk-mobl5.local) ([10.252.131.131]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 09:24:30 -0700 From: Ben Widawsky To: linux-mm Cc: Ben Widawsky , Andrew Morton , David Rientjes , Dave Hansen Subject: [PATCH 10/18] mm: clean up alloc_pages_vma (thp) Date: Fri, 19 Jun 2020 09:24:17 -0700 Message-Id: <20200619162425.1052382-11-ben.widawsky@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619162425.1052382-1-ben.widawsky@intel.com> References: <20200619162425.1052382-1-ben.widawsky@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D0A24180F8B81 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: __alloc_pages_nodemask() already does the right thing for a preferred node and bind nodemask. Calling it directly allows us to simplify much of this. The handling occurs in prepare_alloc_pages() A VM assertion is added to prove correctness. Cc: Andrew Morton Cc: David Rientjes Cc: Dave Hansen Signed-off-by: Ben Widawsky --- mm/mempolicy.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 90bc9c93b1b9..408ba78c8424 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2293,27 +2293,29 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_area_struct *vma, hpage_node = first_node(pol->v.preferred_nodes); nmask = policy_nodemask(gfp, pol); - if (!nmask || node_isset(hpage_node, *nmask)) { - mpol_cond_put(pol); - /* - * First, try to allocate THP only on local node, but - * don't reclaim unnecessarily, just compact. - */ - page = __alloc_pages_node(hpage_node, - gfp | __GFP_THISNODE | __GFP_NORETRY, order); + mpol_cond_put(pol); - /* - * If hugepage allocations are configured to always - * synchronous compact or the vma has been madvised - * to prefer hugepage backing, retry allowing remote - * memory with both reclaim and compact as well. - */ - if (!page && (gfp & __GFP_DIRECT_RECLAIM)) - page = __alloc_pages_node(hpage_node, - gfp, order); + /* + * First, try to allocate THP only on local node, but + * don't reclaim unnecessarily, just compact. + */ + page = __alloc_pages_nodemask(gfp | __GFP_THISNODE | + __GFP_NORETRY, + order, hpage_node, nmask); - goto out; - } + /* + * If hugepage allocations are configured to always synchronous + * compact or the vma has been madvised to prefer hugepage + * backing, retry allowing remote memory with both reclaim and + * compact as well. + */ + if (!page && (gfp & __GFP_DIRECT_RECLAIM)) + page = __alloc_pages_nodemask(gfp, order, hpage_node, + nmask); + + VM_BUG_ON(page && nmask && + !node_isset(page_to_nid(page), *nmask)); + goto out; } nmask = policy_nodemask(gfp, pol);