From: Max Kellermann <max.kellermann@ionos.com>
To: akpm@linux-foundation.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Cc: Max Kellermann <max.kellermann@ionos.com>
Subject: [PATCH v1 08/14] linux/mm.h: move devmap-related declarations to mm/devmap_managed.h
Date: Thu, 15 Feb 2024 15:55:56 +0100 [thread overview]
Message-ID: <20240215145602.1371274-9-max.kellermann@ionos.com> (raw)
In-Reply-To: <20240215145602.1371274-1-max.kellermann@ionos.com>
Prepare to reduce dependencies in linux/mm.h.
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
include/linux/mm.h | 24 --------------------
include/linux/mm/devmap_managed.h | 37 +++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 24 deletions(-)
create mode 100644 include/linux/mm/devmap_managed.h
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 680329ec21ba..cb2dd71e2940 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1345,30 +1345,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf);
* back into memory.
*/
-#if defined(CONFIG_ZONE_DEVICE) && defined(CONFIG_FS_DAX)
-DECLARE_STATIC_KEY_FALSE(devmap_managed_key);
-
-bool __put_devmap_managed_page_refs(struct page *page, int refs);
-static inline bool put_devmap_managed_page_refs(struct page *page, int refs)
-{
- if (!static_branch_unlikely(&devmap_managed_key))
- return false;
- if (!is_zone_device_page(page))
- return false;
- return __put_devmap_managed_page_refs(page, refs);
-}
-#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */
-static inline bool put_devmap_managed_page_refs(struct page *page, int refs)
-{
- return false;
-}
-#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */
-
-static inline bool put_devmap_managed_page(struct page *page)
-{
- return put_devmap_managed_page_refs(page, 1);
-}
-
/* 127: arbitrary random number, small enough to assemble well */
#define folio_ref_zero_or_close_to_overflow(folio) \
((unsigned int) folio_ref_count(folio) + 127u <= 127u)
diff --git a/include/linux/mm/devmap_managed.h b/include/linux/mm/devmap_managed.h
new file mode 100644
index 000000000000..0773529d80b2
--- /dev/null
+++ b/include/linux/mm/devmap_managed.h
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_MM_DEVMAP_MANAGED_H
+#define _LINUX_MM_DEVMAP_MANAGED_H
+
+#include <linux/types.h> // for bool
+
+struct page;
+
+#if defined(CONFIG_ZONE_DEVICE) && defined(CONFIG_FS_DAX)
+
+#include <linux/jump_label.h> // for DECLARE_STATIC_KEY_FALSE(), static_branch_unlikely()
+#include <linux/mmzone.h> // is_zone_device_page()
+
+DECLARE_STATIC_KEY_FALSE(devmap_managed_key);
+
+bool __put_devmap_managed_page_refs(struct page *page, int refs);
+static inline bool put_devmap_managed_page_refs(struct page *page, int refs)
+{
+ if (!static_branch_unlikely(&devmap_managed_key))
+ return false;
+ if (!is_zone_device_page(page))
+ return false;
+ return __put_devmap_managed_page_refs(page, refs);
+}
+#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */
+static inline bool put_devmap_managed_page_refs(struct page *page, int refs)
+{
+ return false;
+}
+#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */
+
+static inline bool put_devmap_managed_page(struct page *page)
+{
+ return put_devmap_managed_page_refs(page, 1);
+}
+
+#endif /* _LINUX_MM_DEVMAP_MANAGED_H */
--
2.39.2
next prev parent reply other threads:[~2024-02-15 14:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 14:55 [PATCH v1 00/14] Fast kernel headers: split linux/mm.h Max Kellermann
2024-02-15 14:55 ` [PATCH v1 01/14] drivers: add missing includes on linux/mm.h (and others) Max Kellermann
2024-02-15 14:55 ` [PATCH v1 02/14] include/drm/drm_gem.h: add poll_table_struct forward declaration Max Kellermann
2024-02-15 14:55 ` [PATCH v1 03/14] linux/mm.h: move page_kasan_tag() to mm/page_kasan_tag.h Max Kellermann
2024-02-15 14:55 ` [PATCH v1 04/14] linux/mm.h: move section functions to mm/page_section.h Max Kellermann
2024-02-15 14:55 ` [PATCH v1 05/14] linux/mm.h: move page_address() and others to mm/page_address.h Max Kellermann
2024-02-15 14:55 ` [PATCH v1 06/14] linux/mm.h: move page_size() to mm/page_size.h Max Kellermann
2024-02-15 19:26 ` Matthew Wilcox
2024-02-15 19:35 ` Max Kellermann
2024-02-15 14:55 ` [PATCH v1 07/14] linux/mm.h: move folio_next() to mm/folio_next.h Max Kellermann
2024-02-15 19:27 ` Matthew Wilcox
2024-02-15 19:41 ` Max Kellermann
2024-02-15 14:55 ` Max Kellermann [this message]
2024-02-15 14:55 ` [PATCH v1 09/14] linux/mm.h: move usage count functions to mm/page_usage.h Max Kellermann
2024-02-15 19:30 ` Matthew Wilcox
2024-02-15 19:33 ` Max Kellermann
2024-02-15 14:55 ` [PATCH v1 10/14] linux/mm.h: move page_zone_id() and more to mm/page_zone.h Max Kellermann
2024-02-15 14:55 ` [PATCH v1 11/14] linux/mm.h: move pfmemalloc-related functions to pfmemalloc.h Max Kellermann
2024-02-15 14:56 ` [PATCH v1 12/14] linux/mm.h: move is_vmalloc_addr() to mm/vmalloc_addr.h Max Kellermann
2024-02-15 14:56 ` [PATCH v1 13/14] linux/mm.h: move high_memory to mm/high_memory.h Max Kellermann
2024-02-15 14:56 ` [PATCH v1 14/14] include: reduce dependencies on linux/mm.h Max Kellermann
2024-02-17 16:02 ` kernel test robot
2024-02-17 17:27 ` kernel test robot
2024-02-17 19:13 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240215145602.1371274-9-max.kellermann@ionos.com \
--to=max.kellermann@ionos.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.