From patchwork Wed Oct 11 17:04:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13417644 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 56177CDB46B for ; Wed, 11 Oct 2023 17:04:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A80B8D00CD; Wed, 11 Oct 2023 13:04:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 957C38D0050; Wed, 11 Oct 2023 13:04:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 783288D00CD; Wed, 11 Oct 2023 13:04:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5497B8D0050 for ; Wed, 11 Oct 2023 13:04:40 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1C04714031F for ; Wed, 11 Oct 2023 17:04:40 +0000 (UTC) X-FDA: 81333804720.07.4CCF63B Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by imf11.hostedemail.com (Postfix) with ESMTP id 4105740015 for ; Wed, 11 Oct 2023 17:04:37 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dgLM0lvf; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697043878; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LMA7kWpWolO6o46k4syPx6Ijzen7WBJLxGU37wBIQCk=; b=p2uoKaYburNa08ww8sTaHRIXtP2MTKhH/wupSHrxFQ1JNWoLu2eBLDSXBnk/a+O/xwnJ+p h7XqBneIoK1aEpSKWCxGEHA6t/xFf/Q8bcnw0R7OJrNApq69gnx0pnEQg5EgzW8I/cMx1Y NLRIL5Eq4OX3ni4MyjiRIK9oh40sUB0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697043878; a=rsa-sha256; cv=none; b=omqWuTmq/rEEhZDg5BzS+RvkbSvv1Vxt3ca+NPP7c3SUjBp6QQLFANv6LE+B2mbUqpsu9N n9I6wZJ5Uvq3vv5Aa4dGhXoUBSEwCR0gNL8ZzrofAdrFYuEssfn7t0hQTw39KVcBfFPzId T51JQ/5CdpuujVStWcCiXuqgckSS5BY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dgLM0lvf; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-406609df1a6so1099895e9.3 for ; Wed, 11 Oct 2023 10:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697043876; x=1697648676; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LMA7kWpWolO6o46k4syPx6Ijzen7WBJLxGU37wBIQCk=; b=dgLM0lvfH4DFGNxvtlvVKuYFs5Lncs7zw0Qt8cDZbp0mjm2r2zrAMBZCHTWm+Eiq+/ PwA4rrrPaq/qewPnmAqj16TRvxkMx9c+j3WmtQXhAskkUw6qvY8NrRtGCtHW2KWxJwKo DzuNXSSWNAM4Emc0ERlb+T3rCyZg160Mwcqzu7kSBManCYEM01QRTQe0h7QcQ4CV4/cR n1+dsG01ruioqLvhtBjansB5mdQxWStWbS+FQdGLi/dK7fTn051NtRNZXWMeWRecWy8w qXVk8XV605BjVeJu4YrF1lagbrzs7BBPmw7BW91ruNdBRldd6uGyr7wQG93ZnGrHC3LN 1Uvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697043876; x=1697648676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LMA7kWpWolO6o46k4syPx6Ijzen7WBJLxGU37wBIQCk=; b=jvtZEl/woeqJsxFtwquox4qiOYBoVWAUbuAKeu1Wwapyvndx5o794jftZUF7hj85dB rFJyKYRq4+XlToSKEVCzckqHMMJGKUT+5MD7wFqpURrIXGHbNuKunF1VaG2MfhLxkgr6 1PCoG6HYWmOJVc8j26I14XgR+KCEU8veECyqf8QIFktcJSprq4lST/4Y2UCie1t0zlt4 EG8WoWDFoiGBx48soSqijYBdDXxVIW4JPfhxHHHjjAtuOI/moK0u8hsEp0s8rWCqxEpy lV2OfMCLvWVN/28S/lfDsndtSma8FaQ5Tsx6EophizU5BSD1e2ly1YNPoZYUi39Y1+jk uIQw== X-Gm-Message-State: AOJu0Yxhjcue0pU1VK8YK3C7yOok6u/sw9epvLsZW20YIDAnRLtdvR3d F8bt4MV4wXpMLGmw21Zcy5F/zG33RRw= X-Google-Smtp-Source: AGHT+IErZXTtH6zFvN1YNb1XZ/7m0+WPZUjiChhxsbzC3LcbueadZBZSk23ANxe1fU5f210E6eRSvQ== X-Received: by 2002:a5d:4fd2:0:b0:31f:f829:49aa with SMTP id h18-20020a5d4fd2000000b0031ff82949aamr17193935wrw.23.1697043876067; Wed, 11 Oct 2023 10:04:36 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id y19-20020a05600c20d300b004075b3ce03asm3834495wmm.6.2023.10.11.10.04.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 10:04:34 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Alexander Viro , Christian Brauner Cc: "=Liam R . Howlett" , Vlastimil Babka , linux-fsdevel@vger.kernel.org, Lorenzo Stoakes Subject: [PATCH v4 1/5] mm: move vma_policy() and anon_vma_name() decls to mm_types.h Date: Wed, 11 Oct 2023 18:04:27 +0100 Message-ID: <24bfc6c9e382fffbcb0ea8d424392c27d56cc8ca.1697043508.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: 11sab31ycadqxjtioscp9bogmb85dbxc X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4105740015 X-Rspam-User: X-HE-Tag: 1697043877-842585 X-HE-Meta: U2FsdGVkX19m/7SoOqGfR+Bk6XRLtGKM+mmLbuSxnN35RPs8+BOZaqfD92Th93LpnXiOjTl58S9Zo6mXXsseMadlkG/3YiTRTay/8dFCAIDs7ijmk+Vn52l/Qe60KIYthc+t7OMjQ2aqTjSnbzT9btJGbBcGGfApyMFs2H3Z7yxpCp4h4neqUIsKc9Q8wE/tC/ET2KqB5F1C8jQ7wJBvX+8dPOYKRpIheClV75zJ/SlNhpvM7nR2tZjBbqbaUyEE1agk5TESkh8XTNBHVJp1JVtd4fWf8fVKUV1SCN86qJHDrY3AHJFL7VeCXGE+FuyfevGkHuEPA5eK5tXLenVEF2mqapYv5aAMAyVWksM5lf2KxeHxUNeFD9hw/eAxLD+cXLKFhQvTpcuAsBSotDrjojDmCeXnWgG/6dTeOTLi0GmC52HypNckZGdyPwVZ6n/rWg1I104ya7wn57gksva2q+Dd71ACYr5XQbTNtholk7cwMFap/n5Xr2LreMoBF7XCVycTCciCXByob+PLP73HFCFBSS6IKS/K57kwWYwMNV68nEploOBnh1wrKCjr6s+pceF0eGZNOiERmim7iz3WTp/d6Ga+w6zmuto9fu6FGRuZkwrxedoekaf9spKIpn7kpyreLASIh7rWKKa3A5Cjb0lkBDpsYZ3yLWW89V7Dc2Wf4jt0sqI2c4xLTQYX+zxdVclp1TrhG+dQ3NN1n3KiRueZ11fhpL8T2e8X29deVbk20fwv8dVXgrVKBNn8PqqWX3YuTqqxrElJh48Pez276RNd04TTasbVG9CqK5bDWSriBxCdD8paI3ILC2TkYMU4GVhqKLaKuPwglwqFLAylDD5E+GFUwAVM5MnRDfH3WjESOvIsdbp5M+cZWvGy/++ZmUK6k6lDONcaEyMszjN0iOLV4yOap8ZoI63qujOpKk0beApIsDsjCHZ3c0eSJ9CTFgxYdCjp5mWzE8Qf2BB MRbM42gR IWN+/TW8DYyic1uUKyvLLV1m0EUuwOaWqLlVZnxbUBdsNaJEYOw1pOpqna/mk26Zd98Q9VY3x8/IkQoM5T1UN33f9M+Sz9H/H2W7HN8jx0W4eUIYF86WTGMgQ36IVexMlX4wTTMlMPE4GjSxajMHVlXxrnRmbFCs0RVv+yKB4d4hkj2F7VoxMpwrB+XdJHVD9u6EJYuxzpjQl/jCEp00rm7Okiq+NuIpvGJ3pGvonaso5wBkZFzNoPwbFMeYbRKYe7C0lnWMe8OQUtSE55QNrJFhBpHGRu+SVodeBI/zc0l/CX0a9zhqK0MzWm7DhxmV0ihW77ghUCaX202lKqpqe0GZJ+3YFDp6CYjSUXWwr110ZxppoiwEcNVHUl2XL1io1gWRU1RsQYliSRICXl9rnnwKZJT5Wt3zqniziP7ioYWuYgAbSs3GGf11uZRUW5DbbSBMJDYMkWGKHOVjlgNI+O6aMnwpsbB+yDl1EIcvzTEEU22E6l4h0zXB0EBsWkNPOED8CQ51DnD73V+PVFnRb5Dwz0TbB0Kup7xj5PECWCqUfqJ6BcfNOgJb+xbSshh47ec2RPEaBxHO4GNWjXvNIurGeRA== 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: The vma_policy() define is a helper specifically for a VMA field so it makes sense to host it in the memory management types header. The anon_vma_name(), anon_vma_name_alloc() and anon_vma_name_free() functions are a little out of place in mm_inline.h as they define external functions, and so it makes sense to locate them in mm_types.h. The purpose of these relocations is to make it possible to abstract static inline wrappers which invoke both of these helpers. Reviewed-by: Vlastimil Babka Signed-off-by: Lorenzo Stoakes --- include/linux/mempolicy.h | 4 ---- include/linux/mm_inline.h | 20 +------------------- include/linux/mm_types.h | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 3c208d4f0ee9..2801d5b0a4e9 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -89,8 +89,6 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol) return pol; } -#define vma_policy(vma) ((vma)->vm_policy) - static inline void mpol_get(struct mempolicy *pol) { if (pol) @@ -222,8 +220,6 @@ static inline struct mempolicy *get_vma_policy(struct vm_area_struct *vma, return NULL; } -#define vma_policy(vma) NULL - static inline int vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst) { diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 8148b30a9df1..9ae7def16cb2 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -352,15 +353,6 @@ void lruvec_del_folio(struct lruvec *lruvec, struct folio *folio) } #ifdef CONFIG_ANON_VMA_NAME -/* - * mmap_lock should be read-locked when calling anon_vma_name(). Caller should - * either keep holding the lock while using the returned pointer or it should - * raise anon_vma_name refcount before releasing the lock. - */ -extern struct anon_vma_name *anon_vma_name(struct vm_area_struct *vma); -extern struct anon_vma_name *anon_vma_name_alloc(const char *name); -extern void anon_vma_name_free(struct kref *kref); - /* mmap_lock should be read-locked */ static inline void anon_vma_name_get(struct anon_vma_name *anon_name) { @@ -415,16 +407,6 @@ static inline bool anon_vma_name_eq(struct anon_vma_name *anon_name1, } #else /* CONFIG_ANON_VMA_NAME */ -static inline struct anon_vma_name *anon_vma_name(struct vm_area_struct *vma) -{ - return NULL; -} - -static inline struct anon_vma_name *anon_vma_name_alloc(const char *name) -{ - return NULL; -} - static inline void anon_vma_name_get(struct anon_vma_name *anon_name) {} static inline void anon_vma_name_put(struct anon_vma_name *anon_name) {} static inline void dup_anon_vma_name(struct vm_area_struct *orig_vma, diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 36c5b43999e6..21eb56145f57 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -546,6 +546,27 @@ struct anon_vma_name { char name[]; }; +#ifdef CONFIG_ANON_VMA_NAME +/* + * mmap_lock should be read-locked when calling anon_vma_name(). Caller should + * either keep holding the lock while using the returned pointer or it should + * raise anon_vma_name refcount before releasing the lock. + */ +struct anon_vma_name *anon_vma_name(struct vm_area_struct *vma); +struct anon_vma_name *anon_vma_name_alloc(const char *name); +void anon_vma_name_free(struct kref *kref); +#else /* CONFIG_ANON_VMA_NAME */ +static inline struct anon_vma_name *anon_vma_name(struct vm_area_struct *vma) +{ + return NULL; +} + +static inline struct anon_vma_name *anon_vma_name_alloc(const char *name) +{ + return NULL; +} +#endif + struct vma_lock { struct rw_semaphore lock; }; @@ -662,6 +683,12 @@ struct vm_area_struct { struct vm_userfaultfd_ctx vm_userfaultfd_ctx; } __randomize_layout; +#ifdef CONFIG_NUMA +#define vma_policy(vma) ((vma)->vm_policy) +#else +#define vma_policy(vma) NULL +#endif + #ifdef CONFIG_SCHED_MM_CID struct mm_cid { u64 time;