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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81083C3ABDA for ; Wed, 14 May 2025 23:44:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 656178D0003; Wed, 14 May 2025 19:43:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DF158D0001; Wed, 14 May 2025 19:43:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E42A8D0003; Wed, 14 May 2025 19:43:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1B88F8D0001 for ; Wed, 14 May 2025 19:43:30 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4E8A41411E8 for ; Wed, 14 May 2025 23:43:31 +0000 (UTC) X-FDA: 83443142622.13.2757C6F Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf08.hostedemail.com (Postfix) with ESMTP id 7D199160002 for ; Wed, 14 May 2025 23:43:29 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=dGo0Z59a; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3oColaAsKCNExz71E81LGA33BB381.zB985AHK-997Ixz7.BE3@flex--ackerleytng.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3oColaAsKCNExz71E81LGA33BB381.zB985AHK-997Ixz7.BE3@flex--ackerleytng.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266209; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=iLum4dPU4sErthKtiaaPqZqnqSJWRV85cksXnAwJxvE=; b=Lrpp95QxUvUca2omyK4FrtYu3Ydk2BQUq3qkQAHYUiyGuFPD3pLhUixXJn8u1Y2TfOoNQ/ uTPBPurbhfrm8yfkI1lHOGqzAHz2OL7+p5Ol3FFjoY2Fnng2YIYSb5V3gJRX1DPumujNkJ 6UK/xhLRZ5cfqZF8oqr/A8T1hqKxt40= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266209; a=rsa-sha256; cv=none; b=FCKJJed1XxOjrUJJBzkJ84C/w5MuWiw7URdmv3OOPRW5ROJZ0teJv3dM1znhERF8eV8Qjb XAiVbmmImgGDYz7LjBrWitXwIjIjzZRUlrQgTUwFp2YKV+NRR+rVSt+HYMSt0z7bDGXMlf o+Sb2iUbNcYGOrItnwHL6jXoRlF2+90= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=dGo0Z59a; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3oColaAsKCNExz71E81LGA33BB381.zB985AHK-997Ixz7.BE3@flex--ackerleytng.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3oColaAsKCNExz71E81LGA33BB381.zB985AHK-997Ixz7.BE3@flex--ackerleytng.bounces.google.com Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-30ad109bc89so371352a91.0 for ; Wed, 14 May 2025 16:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266208; x=1747871008; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=iLum4dPU4sErthKtiaaPqZqnqSJWRV85cksXnAwJxvE=; b=dGo0Z59a21CTIONKJpFtcIg7Riy2DqhN5Cde62+RyoDR0Axog/kU/I+lhEOaRpv/+h HgGZ2/MPUM76E+1pH69d2V/2PIJyu5lM448pu9oXEsPzrtZ+tiNVDMLkGXFILLkq7Zgs AQbU0pwMD7AhaVJ/c36W1DFw3g8I/luBInXNlMAWQBAMAugnv3tO41gIlaz7VXiCIBWo VXgT0vUGilzlvNSoCjdcYE2uuklrCq51Sqn/bW2yhKfKUIYK9RocOeU81bEy4j3oG+D8 fXRIn/4YNF1wmBOxoVNzGYaYQqtj5VjB3DwiF0gLQKUGAK7pH+BxlL/JFLewScbmBpSd CyKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266208; x=1747871008; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iLum4dPU4sErthKtiaaPqZqnqSJWRV85cksXnAwJxvE=; b=M6UjFQkASIEVM6uZQnDM8grUPXkE5tco1hVj7bD+OWTDtsf9CKJ86GGu5U6K4y3gLg 7PI/LXBwlhX0qWpti6BK2aE0/Mv8Bp8qiCR2eD1+Jr47Muk2rZqrzMWFg3VUjvd0aLoY L3kjSDYRUI2+QVT8VtUR3GBA6jNvO9I4b8OOs64c5R/9bR5PLlYyfMy1ijWVPPqWNvMI ZgC0+Ia2NhuYIy46eemTH99zvdm7vn4E5mEXMDoj8P6KI9BWXuPP/YxMNxqO9Sq6u6gX 8LDlSORLA7eonc+zPh/rlXOVyPfKBDYfviBksj7bhxWBDsr5z+CWvgX+ciU3OBd3RIB8 Disw== X-Forwarded-Encrypted: i=1; AJvYcCVFMQ3bn5YdY6B2PL3xq412lAWedPsX0aQEqS+gvxIpV2sopfnpeknAxhl6PoKH/zxOWJp/4y0Ykw==@kvack.org X-Gm-Message-State: AOJu0Yz+Q67Ej/QPOAuAGlkiPn6N9cwWaLCf+rjRIbWXer4LOH4P5yfY Egz0RqejBsUCuf8gBuA37mGw4Y/fq8ErUFLNTk2ou+dgUz0NmpNOUDz0XLRhQ44iyjgLAIIbo0w WcItlqcueGXn/jGM++BE+Sg== X-Google-Smtp-Source: AGHT+IFTVxsTLBGkiAhxwxfXI0xdufC6Hc5PJQ+0/Nhxii2q/tPBLHxyosuWUQut2LexX0oTzZIxWEdMSOoJvrMGKg== X-Received: from pjbpm14.prod.google.com ([2002:a17:90b:3c4e:b0:2fa:15aa:4d2b]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1cce:b0:306:b6f7:58ba with SMTP id 98e67ed59e1d1-30e5156ea36mr715371a91.6.1747266208304; Wed, 14 May 2025 16:43:28 -0700 (PDT) Date: Wed, 14 May 2025 16:41:59 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: Subject: [RFC PATCH v2 20/51] mm: mempolicy: Refactor out policy_node_nodemask() From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com, kernel test robot , Gregory Price Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: qsqfz13rgm7nprr94nuu6no9znkg3kmy X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 7D199160002 X-HE-Tag: 1747266209-400774 X-HE-Meta: U2FsdGVkX19DD08HYl7Dl5ELnHRvPbzI5zV22nlAuWrd2RIA+nsPXeD1BSf85uty3ROjJT6AIKSB8Nhcjw1JoqxAfG5st+JsxMvaRChEZA7h+2R1J2APf90C7j45Q0szyk+1x/mSfysQLrV1Bkwp7Az5lcpQnmmmv8FSICe5aCvkOZhcvw6r1dj3P93obdvPisyrp4S1uPfumhgFEjWyoi2hv6uK105oG+FPd04+H5vFCJaIflQCbe2x+bP4/QxhKNYTGqIQ0rSL1/wWxcWyl7gvNjjoixu37sIAWGqoGV0bzjrrL10Q6ISKe6ZNbwiMb1QwGSwAN3BT3W2f1f9mO1FuN5m3bc9Im+zKWLXxJZR82sSJoRfSGAt0XAqvH2idci33eGu9O4ciZGrzIfH8tLfgBEX5WpPrTGqA+jgD34OC9hrZnsDjgHzLUgKB9Lco4eQqm52RhqFOnHQMm+KRTbD6kwNvvKg1vEe5SrU8kT4w5DuoSVENYHFW+NigRbGHiUyQgnC/d1uKQcOG/1sxiNCoZHQiixM7qBeVloGc+EQKMgoT5yeeU3ldgWvX8LPbyKbQ6Cxnh3sMyb63J3olxuZCOO/WpNALzVDWHIVVauM8cvXYWTfXG5268nY6SWl0rDjxh5lCemepPWeBexbwX4GXxMPkGpq2Q2TdLxJPK4T2IEGaCArxFFE0fOxqsFPwdYRT/Zaav35ZE6lxUyfMP2BqDC/Y2k1zwyGxnOMJDTeJaHAERa8aONXXPT74wPzXzU3inGxMY9b/g0mHCjeYH2drc4mWNP2IAPT2PUr3M4k+GWi5HBNpB1Hp+9AxclAR9fu/Rbzs3CI1M8l8yAxz4biZm39opo6CnJr0jCCSX1vZt6oVlehzO7Yd3//65FjsvEbAfpPIVhr5zqiOjatOHFxIXtP1Hb7NiclJ/o6cbOIwY/ByHx6vuCNaqTvl95cpTvU8XI9wqllL8DJBwFC RnTw7F0a T+y45ErZ3AU/hHHYuYkrXprBfQwZ5H1ye3vsetovnRFEFqJhLwnB6uANPOGk/PPCWOeDMm3opbtAqY8OJ/brwiT8F+raK/Zmvpyrml6ZTxW53mXb1CRE87qb3GuGeTxiKFPb4r64me4uLofsUG0xKbLPHWD3TAsy/5IxHLQieYHFLCsHtuK30b4IkxaACX93SMDx8gr+RCo7liH98n8FuTgKjixA+AbxH/7g4VleG4pk9NjxJ0U5l4eRZ6ZzqaEd1L9sg0uj2BOZLewlujn+DwWfYT6+fxxJ6BHoqT+6HTkpT4roJIzIqtabj5h/57oSlzOJiwaOJFxW/Dh3yepWs3rRJJIFuAkIzJ+ErxNbEfO0qsoMNWyQPPdcpK83S2bdZaVlmrbHt0NuXbx1O42UlOwi3GfIuUWQUOrqA48raPfyL5XLDhKPj5jrKimqA6y3xoFtIhuKClvCMR6sKp6otwadpw5KQVVuBVYsl2EukRK9akucpBDm9fAzey7AphasnEhBaowoSZveBwxtnSQTzQe7zcWYO3Y+hhJNCXVkZ+WDVg47gfSepxKJ9P1tUt2p08NMC873mUURrHXLrJvHTqroNMrOy4YDePoRp6QJD3TH9ru7gRSNB58fgPjYPjSNny47UZ/6u/LoH6JpjndgYStAb+jVWzH7afM2yJeaBpztk0mrd0Fu/WuMrN5OZcIBI8spJW9FS5eT3ZJLoj5q8KJyUiR8E6JcHvUc/Nb5C5OeHSI24RX3gjRPuvexzifqoSm3OKXdi0+5Wo5xpuY9O4cU8EWPE1pfYUgXEUfQf9VXXyGBoZIPPvfL++Q== 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: List-Subscribe: List-Unsubscribe: This was refactored out of huge_node(). huge_node()'s interpretation of vma for order assumes the hugetlb-specific storage of the hstate information in the inode. policy_node_nodemask() does not assume that, and can be used more generically. This refactoring also enforces that nid default to the current node id, which was not previously enforced. alloc_pages_mpol() is the last remaining direct user of policy_nodemask(). All its callers begin with nid being the current node id as well. More refactoring is required for to simplify that. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202409140519.DIQST28c-lkp@intel.com/ Closes: https://lore.kernel.org/oe-kbuild-all/202409140553.G2RGVWNA-lkp@intel.com/ Reviewed-by: Gregory Price Signed-off-by: Ackerley Tng Change-Id: I5774b27d2e718f4d08b59f8d2fedbb34eda7bac3 --- include/linux/mempolicy.h | 9 +++++++++ mm/mempolicy.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index ce9885e0178a..840c576abcfd 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -138,6 +138,8 @@ extern void numa_policy_init(void); extern void mpol_rebind_task(struct task_struct *tsk, const nodemask_t *new); extern void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new); +extern int policy_node_nodemask(struct mempolicy *mpol, gfp_t gfp_flags, + pgoff_t ilx, nodemask_t **nodemask); extern int huge_node(struct vm_area_struct *vma, unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol, nodemask_t **nodemask); @@ -251,6 +253,13 @@ static inline void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new) { } +static inline int policy_node_nodemask(struct mempolicy *mpol, gfp_t gfp_flags, + pgoff_t ilx, nodemask_t **nodemask) +{ + *nodemask = NULL; + return 0; +} + static inline int huge_node(struct vm_area_struct *vma, unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol, nodemask_t **nodemask) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index b28a1e6ae096..7837158ee5a8 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1261,7 +1261,7 @@ static struct folio *alloc_migration_target_by_mpol(struct folio *src, h = folio_hstate(src); gfp = htlb_alloc_mask(h); - nodemask = policy_nodemask(gfp, pol, ilx, &nid); + nid = policy_node_nodemask(pol, gfp, ilx, &nodemask); return alloc_hugetlb_folio_nodemask(h, nid, nodemask, gfp, htlb_allow_alloc_fallback(MR_MEMPOLICY_MBIND)); } @@ -2121,6 +2121,29 @@ static nodemask_t *policy_nodemask(gfp_t gfp, struct mempolicy *pol, return nodemask; } +/** + * policy_node_nodemask() - Interpret memory policy to get nodemask and nid. + * + * @mpol: the memory policy to interpret. + * @gfp_flags: gfp flags for this request. + * @ilx: interleave index, for use only when MPOL_INTERLEAVE or + * MPOL_WEIGHTED_INTERLEAVE + * @nodemask: (output) pointer to nodemask pointer for 'bind' and 'prefer-many' + * policy + * + * Context: must hold reference on @mpol. + * Return: a nid suitable for a page allocation and a pointer. If the effective + * policy is 'bind' or 'prefer-many', returns a pointer to the + * mempolicy's @nodemask for filtering the zonelist. + */ +int policy_node_nodemask(struct mempolicy *mpol, gfp_t gfp_flags, + pgoff_t ilx, nodemask_t **nodemask) +{ + int nid = numa_node_id(); + *nodemask = policy_nodemask(gfp_flags, mpol, ilx, &nid); + return nid; +} + #ifdef CONFIG_HUGETLBFS /* * huge_node(@vma, @addr, @gfp_flags, @mpol) @@ -2139,12 +2162,9 @@ int huge_node(struct vm_area_struct *vma, unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol, nodemask_t **nodemask) { pgoff_t ilx; - int nid; - nid = numa_node_id(); *mpol = get_vma_policy(vma, addr, hstate_vma(vma)->order, &ilx); - *nodemask = policy_nodemask(gfp_flags, *mpol, ilx, &nid); - return nid; + return policy_node_nodemask(*mpol, gfp_flags, ilx, nodemask); } /* @@ -2601,8 +2621,7 @@ unsigned long alloc_pages_bulk_mempolicy_noprof(gfp_t gfp, return alloc_pages_bulk_preferred_many(gfp, numa_node_id(), pol, nr_pages, page_array); - nid = numa_node_id(); - nodemask = policy_nodemask(gfp, pol, NO_INTERLEAVE_INDEX, &nid); + nid = policy_node_nodemask(pol, gfp, NO_INTERLEAVE_INDEX, &nodemask); return alloc_pages_bulk_noprof(gfp, nid, nodemask, nr_pages, page_array); } -- 2.49.0.1045.g170613ef41-goog