Skip to contentSkip to conversation

mm-rmap-inline-folio_test_large_maybe_mapped_shared-into-callers.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 13, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/rmap: inline folio_test_large_maybe_mapped_shared() into callers
has been removed from the -mm tree. Its filename was
mm-rmap-inline-folio_test_large_maybe_mapped_shared-into-callers.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Lance Yang <[email protected]>
Subject: mm/rmap: inline folio_test_large_maybe_mapped_shared() into callers
Date: Thu, 24 Apr 2025 23:56:06 +0800

To prevent the function from being used when CONFIG_MM_ID is disabled, we intend to inline it into its few callers, which also would help maintain the expected code placement.

---

 include/linux/mm.h         |    2 +-
 include/linux/page-flags.h |    4 ----
 include/linux/rmap.h       |    2 +-
 mm/memory.c                |    4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-rmap-inline-folio_test_large_maybe_mapped_shared-into-callers +1 -1
@@ -2111,7 +2111,7 @@ static inline bool folio_maybe_mapped_sh
 	 */
 	if (mapcount <= 1)
 		return false;
-	return folio_test_large_maybe_mapped_shared(folio);
+	return test_bit(FOLIO_MM_IDS_SHARED_BITNUM, &folio->_mm_ids);
 }
 
 #ifndef HAVE_ARCH_MAKE_FOLIO_ACCESSIBLE
include/linux/page-flags.h renamed from include/linux/page-flags.h~mm-rmap-inline-folio_test_large_maybe_mapped_shared-into-callers +0 -4
@@ -1230,10 +1230,6 @@ static inline int folio_has_private(cons
 	return !!(folio->flags & PAGE_FLAGS_PRIVATE);
 }
 
-static inline bool folio_test_large_maybe_mapped_shared(const struct folio *folio)
-{
-	return test_bit(FOLIO_MM_IDS_SHARED_BITNUM, &folio->_mm_ids);
-}
 #undef PF_ANY
 #undef PF_HEAD
 #undef PF_NO_TAIL
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-inline-folio_test_large_maybe_mapped_shared-into-callers +1 -1
@@ -223,7 +223,7 @@ static inline void __folio_large_mapcoun
 	VM_WARN_ON_ONCE(folio_mm_id(folio, 1) != MM_ID_DUMMY &&
 			folio->_mm_id_mapcount[1] < 0);
 	VM_WARN_ON_ONCE(!folio_mapped(folio) &&
-			folio_test_large_maybe_mapped_shared(folio));
+			test_bit(FOLIO_MM_IDS_SHARED_BITNUM, &folio->_mm_ids));
 }
 
 static __always_inline void folio_set_large_mapcount(struct folio *folio,
mm/memory.c renamed from mm/memory.c~mm-rmap-inline-folio_test_large_maybe_mapped_shared-into-callers +2 -2
@@ -3768,7 +3768,7 @@ static bool __wp_can_reuse_large_anon_fo
 	 * If all folio references are from mappings, and all mappings are in
 	 * the page tables of this MM, then this folio is exclusive to this MM.
 	 */
-	if (folio_test_large_maybe_mapped_shared(folio))
+	if (test_bit(FOLIO_MM_IDS_SHARED_BITNUM, &folio->_mm_ids))
 		return false;
 
 	VM_WARN_ON_ONCE(folio_test_ksm(folio));
@@ -3791,7 +3791,7 @@ static bool __wp_can_reuse_large_anon_fo
 	folio_lock_large_mapcount(folio);
 	VM_WARN_ON_ONCE_FOLIO(folio_large_mapcount(folio) > folio_ref_count(folio), folio);
 
-	if (folio_test_large_maybe_mapped_shared(folio))
+	if (test_bit(FOLIO_MM_IDS_SHARED_BITNUM, &folio->_mm_ids))
 		goto unlock;
 	if (folio_large_mapcount(folio) != folio_ref_count(folio))
 		goto unlock;

_

Patches currently in -mm which might be from [email protected] are