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=-12.7 required=3.0 tests=BAYES_00, 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 4312CC55179 for ; Fri, 30 Oct 2020 19:03:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D21702072C for ; Fri, 30 Oct 2020 19:03:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D21702072C 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 294986B0085; Fri, 30 Oct 2020 15:03:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 245B36B0087; Fri, 30 Oct 2020 15:03:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BD376B0088; Fri, 30 Oct 2020 15:03:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0192.hostedemail.com [216.40.44.192]) by kanga.kvack.org (Postfix) with ESMTP id CCC756B0085 for ; Fri, 30 Oct 2020 15:03:03 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 6FAFD181AEF1E for ; Fri, 30 Oct 2020 19:03:03 +0000 (UTC) X-FDA: 77429514246.25.wave81_430801a27298 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 6B9691804DF89 for ; Fri, 30 Oct 2020 19:02:48 +0000 (UTC) X-HE-Tag: wave81_430801a27298 X-Filterd-Recvd-Size: 8309 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Fri, 30 Oct 2020 19:02:47 +0000 (UTC) IronPort-SDR: /6YTjR+WxQvEhR9CjzMRz6pXG8qtHrMqs6B/CyESKCmjvejQu8r7WB2D3cXCiZpsKhQ7rOvSDP zGwMC7PsTwKw== X-IronPort-AV: E=McAfee;i="6000,8403,9790"; a="155629100" X-IronPort-AV: E=Sophos;i="5.77,434,1596524400"; d="scan'208";a="155629100" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 12:02:45 -0700 IronPort-SDR: BM1BL2+VRKeofJNnoSPAEDwLhT9tJ8TG5YNC98pI7lQR0Gni6oRexQ+vYG6ZdgQLc6LAg7knfc thwppUTdUNLg== X-IronPort-AV: E=Sophos;i="5.77,434,1596524400"; d="scan'208";a="537167656" Received: from kingelix-mobl.amr.corp.intel.com (HELO bwidawsk-mobl5.local) ([10.252.139.120]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 12:02:44 -0700 From: Ben Widawsky To: linux-mm , Andrew Morton Cc: Dave Hansen , Dave Hansen , Michal Hocko , Ben Widawsky , linux-kernel@vger.kernel.org Subject: [PATCH 03/12] mm/mempolicy: Add MPOL_PREFERRED_MANY for multiple preferred nodes Date: Fri, 30 Oct 2020 12:02:29 -0700 Message-Id: <20201030190238.306764-4-ben.widawsky@intel.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201030190238.306764-1-ben.widawsky@intel.com> References: <20201030190238.306764-1-ben.widawsky@intel.com> 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: From: Dave Hansen MPOL_PREFERRED honors only a single node set in the nodemask. Add the bare define for a new mode which will allow more than one. The patch does all the plumbing without actually adding the new policy type. v2: Plumb most MPOL_PREFERRED_MANY without exposing UAPI (Ben) Fixes for checkpatch (Ben) Link: https://lore.kernel.org/r/20200630212517.308045-4-ben.widawsky@inte= l.com Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dave Hansen --- mm/mempolicy.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index ba3bc4f28d27..21a6f80f91a9 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -31,6 +31,9 @@ * but useful to set in a VMA when you have a non default * process policy. * + * preferred many Try a set of nodes first before normal fallback. This = is + * similar to preferred without the special case. + * * default Allocate on the local node first, or when on a VMA * use the process policy. This is what Linux always did * in a NUMA aware kernel and still does by, ahem, default. @@ -105,6 +108,8 @@ =20 #include "internal.h" =20 +#define MPOL_PREFERRED_MANY MPOL_MAX + /* Internal flags */ #define MPOL_MF_DISCONTIG_OK (MPOL_MF_INTERNAL << 0) /* Skip checks for = continuous vmas */ #define MPOL_MF_INVERT (MPOL_MF_INTERNAL << 1) /* Invert check for node= mask */ @@ -175,7 +180,7 @@ struct mempolicy *get_task_policy(struct task_struct = *p) static const struct mempolicy_operations { int (*create)(struct mempolicy *pol, const nodemask_t *nodes); void (*rebind)(struct mempolicy *pol, const nodemask_t *nodes); -} mpol_ops[MPOL_MAX]; +} mpol_ops[MPOL_MAX + 1]; =20 static inline int mpol_store_user_nodemask(const struct mempolicy *pol) { @@ -415,7 +420,7 @@ void mpol_rebind_mm(struct mm_struct *mm, nodemask_t = *new) mmap_write_unlock(mm); } =20 -static const struct mempolicy_operations mpol_ops[MPOL_MAX] =3D { +static const struct mempolicy_operations mpol_ops[MPOL_MAX + 1] =3D { [MPOL_DEFAULT] =3D { .rebind =3D mpol_rebind_default, }, @@ -432,6 +437,10 @@ static const struct mempolicy_operations mpol_ops[MP= OL_MAX] =3D { .rebind =3D mpol_rebind_nodemask, }, /* [MPOL_LOCAL] - see mpol_new() */ + [MPOL_PREFERRED_MANY] =3D { + .create =3D NULL, + .rebind =3D NULL, + }, }; =20 static int migrate_page_add(struct page *page, struct list_head *pagelis= t, @@ -914,6 +923,9 @@ static void get_policy_nodemask(struct mempolicy *p, = nodemask_t *nodes) case MPOL_INTERLEAVE: *nodes =3D p->v.nodes; break; + case MPOL_PREFERRED_MANY: + *nodes =3D p->v.preferred_nodes; + break; case MPOL_PREFERRED: if (!(p->flags & MPOL_F_LOCAL)) *nodes =3D p->v.preferred_nodes; @@ -1889,7 +1901,9 @@ nodemask_t *policy_nodemask(gfp_t gfp, struct mempo= licy *policy) /* Return the node id preferred by the given mempolicy, or the given id = */ static int policy_node(gfp_t gfp, struct mempolicy *policy, int nd) { - if (policy->mode =3D=3D MPOL_PREFERRED && !(policy->flags & MPOL_F_LOCA= L)) { + if ((policy->mode =3D=3D MPOL_PREFERRED || + policy->mode =3D=3D MPOL_PREFERRED_MANY) && + !(policy->flags & MPOL_F_LOCAL)) { nd =3D first_node(policy->v.preferred_nodes); } else { /* @@ -1932,6 +1946,7 @@ unsigned int mempolicy_slab_node(void) return node; =20 switch (policy->mode) { + case MPOL_PREFERRED_MANY: case MPOL_PREFERRED: /* * handled MPOL_F_LOCAL above @@ -2066,6 +2081,9 @@ bool init_nodemask_of_mempolicy(nodemask_t *mask) task_lock(current); mempolicy =3D current->mempolicy; switch (mempolicy->mode) { + case MPOL_PREFERRED_MANY: + *mask =3D mempolicy->v.preferred_nodes; + break; case MPOL_PREFERRED: if (mempolicy->flags & MPOL_F_LOCAL) nid =3D numa_node_id(); @@ -2120,6 +2138,9 @@ bool mempolicy_nodemask_intersects(struct task_stru= ct *tsk, * nodes in mask. */ break; + case MPOL_PREFERRED_MANY: + ret =3D nodes_intersects(mempolicy->v.preferred_nodes, *mask); + break; case MPOL_BIND: case MPOL_INTERLEAVE: ret =3D nodes_intersects(mempolicy->v.nodes, *mask); @@ -2204,10 +2225,13 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_a= rea_struct *vma, * node and don't fall back to other nodes, as the cost of * remote accesses would likely offset THP benefits. * - * If the policy is interleave, or does not allow the current - * node in its nodemask, we allocate the standard way. + * If the policy is interleave or multiple preferred nodes, or + * does not allow the current node in its nodemask, we allocate + * the standard way. */ - if (pol->mode =3D=3D MPOL_PREFERRED && !(pol->flags & MPOL_F_LOCAL)) + if ((pol->mode =3D=3D MPOL_PREFERRED || + pol->mode =3D=3D MPOL_PREFERRED_MANY) && + !(pol->flags & MPOL_F_LOCAL)) hpage_node =3D first_node(pol->v.preferred_nodes); =20 nmask =3D policy_nodemask(gfp, pol); @@ -2343,6 +2367,9 @@ bool __mpol_equal(struct mempolicy *a, struct mempo= licy *b) case MPOL_BIND: case MPOL_INTERLEAVE: return !!nodes_equal(a->v.nodes, b->v.nodes); + case MPOL_PREFERRED_MANY: + return !!nodes_equal(a->v.preferred_nodes, + b->v.preferred_nodes); case MPOL_PREFERRED: /* a's ->flags is the same as b's */ if (a->flags & MPOL_F_LOCAL) @@ -2511,6 +2538,8 @@ int mpol_misplaced(struct page *page, struct vm_are= a_struct *vma, unsigned long polnid =3D zone_to_nid(z->zone); break; =20 + /* case MPOL_PREFERRED_MANY: */ + default: BUG(); } @@ -2862,6 +2891,7 @@ static const char * const policy_modes[] =3D [MPOL_BIND] =3D "bind", [MPOL_INTERLEAVE] =3D "interleave", [MPOL_LOCAL] =3D "local", + [MPOL_PREFERRED_MANY] =3D "prefer (many)", }; =20 =20 @@ -2941,6 +2971,7 @@ int mpol_parse_str(char *str, struct mempolicy **mp= ol) if (!nodelist) err =3D 0; goto out; + case MPOL_PREFERRED_MANY: case MPOL_BIND: /* * Insist on a nodelist @@ -3023,6 +3054,9 @@ void mpol_to_str(char *buffer, int maxlen, struct m= empolicy *pol) switch (mode) { case MPOL_DEFAULT: break; + case MPOL_PREFERRED_MANY: + WARN_ON(flags & MPOL_F_LOCAL); + fallthrough; case MPOL_PREFERRED: if (flags & MPOL_F_LOCAL) mode =3D MPOL_LOCAL; --=20 2.29.2