mm-rename-page_mapping_-to-folio_mapping_.patch removed from -mm tree
The quilt patch titled
Subject: mm: rename PAGE_MAPPING_* to FOLIO_MAPPING_*
has been removed from the -mm tree. Its filename was
mm-rename-page_mapping_-to-folio_mapping_.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: David Hildenbrand <[email protected]>
Subject: mm: rename PAGE_MAPPING_* to FOLIO_MAPPING_*
Date: Fri, 4 Jul 2025 12:25:20 +0200
Now that the mapping flags are only used for folios, let's rename the defines.
---
fs/proc/page.c | 4 ++-- include/linux/fs.h | 2 +- include/linux/mm_types.h | 1 - include/linux/page-flags.h | 20 ++++++++++---------- include/linux/pagemap.h | 2 +- mm/gup.c | 4 ++-- mm/internal.h | 2 +- mm/ksm.c | 4 ++-- mm/rmap.c | 16 ++++++++-------- mm/util.c | 6 +++--- 10 files changed, 30 insertions(+), 31 deletions(-)
fs/proc/page.c renamed from fs/proc/page.c~mm-rename-page_mapping_-to-folio_mapping_ +2 -2
@@ -149,7 +149,7 @@ u64 stable_page_flags(const struct page k = folio->flags; mapping = (unsigned long )folio->mapping; - is_anon = mapping &PAGE_MAPPING_ANON ; + is_anon = mapping &FOLIO_MAPPING_ANON ;/* * pseudo flags for the well known (anonymous) memory mapped pages
@@ -158,7 +158,7 @@ u64 stable_page_flags(const struct page u |=1 <<KPF_MMAP ;if (is_anon) { u |=1 <<KPF_ANON ; -if (mapping &PAGE_MAPPING_KSM ) +if (mapping &FOLIO_MAPPING_KSM ) u |=1 <<KPF_KSM ; }
include/linux/fs.h renamed from include/linux/fs.h~mm-rename-page_mapping_-to-folio_mapping_ +1 -1
@@ -526,7 +526,7 @@ struct address_space {/* * On most architectures that alignment is already the case; but * must be enforced here for CRIS, to let the least significant bit -* of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON. +* of struct folio's "mapping" pointer be used for FOLIO_MAPPING_ANON. */ /* XArray tags, for tagging dirty and writeback pages in the pagecache. */
include/linux/mm_types.h renamed from include/linux/mm_types.h~mm-rename-page_mapping_-to-folio_mapping_ +0 -1
@@ -105,7 +105,6 @@ struct page {unsigned int order; }; }; -/* See page-flags.h for PAGE_MAPPING_FLAGS */ struct address_space *mapping;union {pgoff_t __folio_index;/* Our offset within mapping. */
include/linux/page-flags.h renamed from include/linux/page-flags.h~mm-rename-page_mapping_-to-folio_mapping_ +10 -10
@@ -695,10 +695,10 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemma/* * On an anonymous folio mapped into a user virtual memory area, * folio->mapping points to its anon_vma, not to a struct address_space; -* with the PAGE_MAPPING_ANON bit set to distinguish it. See rmap.h. +* with the FOLIO_MAPPING_ANON bit set to distinguish it. See rmap.h. * * On an anonymous folio in a VM_MERGEABLE area, if CONFIG_KSM is enabled, -* the PAGE_MAPPING_ANON_KSM bit may be set along with the PAGE_MAPPING_ANON +* the FOLIO_MAPPING_ANON_KSM bit may be set along with the FOLIO_MAPPING_ANON * bit; and then folio->mapping points, not to an anon_vma, but to a private * structure which KSM associates with that merged folio. See ksm.h. *
@@ -713,21 +713,21 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemma* false before calling the following functions (e.g., folio_test_anon). * See mm/slab.h. */ -#define PAGE_MAPPING_ANON 0x1 -#define PAGE_MAPPING_ANON_KSM 0x2 -#define PAGE_MAPPING_KSM (PAGE_MAPPING_ANON | PAGE_MAPPING_ANON_KSM) -#define PAGE_MAPPING_FLAGS (PAGE_MAPPING_ANON | PAGE_MAPPING_ANON_KSM) +#define FOLIO_MAPPING_ANON 0x1 +#define FOLIO_MAPPING_ANON_KSM 0x2 +#define FOLIO_MAPPING_KSM (FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM) +#define FOLIO_MAPPING_FLAGS (FOLIO_MAPPING_ANON | FOLIO_MAPPING_ANON_KSM) static __always_inline bool folio_test_anon(const struct folio *folio) { -return ((unsigned long )folio->mapping &PAGE_MAPPING_ANON ) !=0 ; +return ((unsigned long )folio->mapping &FOLIO_MAPPING_ANON ) !=0 ; } static __always_inline bool PageAnonNotKsm(const struct page *page) {unsigned long flags = (unsigned long )page_folio (page)->mapping; -return (flags &PAGE_MAPPING_FLAGS ) ==PAGE_MAPPING_ANON ; +return (flags &FOLIO_MAPPING_FLAGS ) ==FOLIO_MAPPING_ANON ; } static __always_inline bool PageAnon(const struct page *page)
@@ -743,8 +743,8 @@ static __always_inline bool PageAnon(con*/ static __always_inline bool folio_test_ksm(const struct folio *folio) { -return ((unsigned long )folio->mapping &PAGE_MAPPING_FLAGS ) == -PAGE_MAPPING_KSM ; +return ((unsigned long )folio->mapping &FOLIO_MAPPING_FLAGS ) == +FOLIO_MAPPING_KSM ; }#else FOLIO_TEST_FLAG_FALSE (ksm)
include/linux/pagemap.h renamed from include/linux/pagemap.h~mm-rename-page_mapping_-to-folio_mapping_ +1 -1
@@ -502,7 +502,7 @@ static inline pgoff_t mapping_align_indestatic inline bool mapping_large_folio_support (struct address_space *mapping) {/* AS_FOLIO_ORDER is only reasonable for pagecache folios */ -VM_WARN_ONCE ((unsigned long )mapping &PAGE_MAPPING_ANON , +VM_WARN_ONCE ((unsigned long )mapping &FOLIO_MAPPING_ANON ,"Anonymous mapping always supports large folio" );return mapping_max_folio_order (mapping) >0 ;
mm/gup.c renamed from mm/gup.c~mm-rename-page_mapping_-to-folio_mapping_ +2 -2
@@ -2804,9 +2804,9 @@ static bool gup_fast_folio_allowed(strucreturn false;/* Anonymous folios pose no problem. */ - mapping_flags = (unsigned long )mapping &PAGE_MAPPING_FLAGS ; + mapping_flags = (unsigned long )mapping &FOLIO_MAPPING_FLAGS ;if (mapping_flags) -return mapping_flags &PAGE_MAPPING_ANON ; +return mapping_flags &FOLIO_MAPPING_ANON ;/* * At this point, we know the mapping is non-null and points to an
mm/internal.h renamed from mm/internal.h~mm-rename-page_mapping_-to-folio_mapping_ +1 -1
@@ -149,7 +149,7 @@ static inline void *folio_raw_mapping(co {unsigned long mapping = (unsigned long )folio->mapping; -return (void *)(mapping & ~PAGE_MAPPING_FLAGS ); +return (void *)(mapping & ~FOLIO_MAPPING_FLAGS ); }/*
mm/ksm.c renamed from mm/ksm.c~mm-rename-page_mapping_-to-folio_mapping_ +2 -2
@@ -893,7 +893,7 @@ static struct folio *ksm_get_folio(strucunsigned long kpfn; expected_mapping = (void *)((unsigned long )stable_node | -PAGE_MAPPING_KSM ); +FOLIO_MAPPING_KSM ); again: kpfn =READ_ONCE (stable_node->kpfn);/* Address dependency. */ folio =pfn_folio (kpfn);
@@ -1070,7 +1070,7 @@ static inline void folio_set_stable_node struct ksm_stable_node *stable_node) {VM_WARN_ON_FOLIO (folio_test_anon (folio) &&PageAnonExclusive (&folio->page), folio); - folio->mapping = (void *)((unsigned long )stable_node |PAGE_MAPPING_KSM ); + folio->mapping = (void *)((unsigned long )stable_node |FOLIO_MAPPING_KSM ); }#ifdef CONFIG_SYSFS
mm/rmap.c renamed from mm/rmap.c~mm-rename-page_mapping_-to-folio_mapping_ +8 -8
@@ -503,12 +503,12 @@ struct anon_vma *folio_get_anon_vma(consrcu_read_lock (); anon_mapping = (unsigned long )READ_ONCE (folio->mapping); -if ((anon_mapping &PAGE_MAPPING_FLAGS ) !=PAGE_MAPPING_ANON ) +if ((anon_mapping &FOLIO_MAPPING_FLAGS ) !=FOLIO_MAPPING_ANON ) goto out;if (!folio_mapped (folio)) goto out; - anon_vma = (struct anon_vma *) (anon_mapping -PAGE_MAPPING_ANON ); + anon_vma = (struct anon_vma *) (anon_mapping -FOLIO_MAPPING_ANON );if (!atomic_inc_not_zero (&anon_vma->refcount)) { anon_vma =NULL ; goto out;
@@ -550,12 +550,12 @@ struct anon_vma *folio_lock_anon_vma_rea retry:rcu_read_lock (); anon_mapping = (unsigned long )READ_ONCE (folio->mapping); -if ((anon_mapping &PAGE_MAPPING_FLAGS ) !=PAGE_MAPPING_ANON ) +if ((anon_mapping &FOLIO_MAPPING_FLAGS ) !=FOLIO_MAPPING_ANON ) goto out;if (!folio_mapped (folio)) goto out; - anon_vma = (struct anon_vma *) (anon_mapping -PAGE_MAPPING_ANON ); + anon_vma = (struct anon_vma *) (anon_mapping -FOLIO_MAPPING_ANON ); root_anon_vma =READ_ONCE (anon_vma->root);if (down_read_trylock (&root_anon_vma->rwsem)) {/*
@@ -1334,9 +1334,9 @@ void folio_move_anon_rmap(struct folio *VM_BUG_ON_FOLIO (!folio_test_locked (folio), folio);VM_BUG_ON_VMA (!anon_vma, vma); - anon_vma +=PAGE_MAPPING_ANON ; + anon_vma +=FOLIO_MAPPING_ANON ;/* -* Ensure that anon_vma and the PAGE_MAPPING_ANON bit are written +* Ensure that anon_vma and the FOLIO_MAPPING_ANON bit are written * simultaneously, so a concurrent reader (eg folio_referenced()'s * folio_test_anon()) will not see one without the other. */
@@ -1367,10 +1367,10 @@ static void __folio_set_anon(struct foli/* * page_idle does a lockless/optimistic rmap scan on folio->mapping. * Make sure the compiler doesn't split the stores of anon_vma and -* the PAGE_MAPPING_ANON type identifier, otherwise the rmap code +* the FOLIO_MAPPING_ANON type identifier, otherwise the rmap code * could mistake the mapping for a struct address_space and crash. */ - anon_vma = (void *) anon_vma +PAGE_MAPPING_ANON ; + anon_vma = (void *) anon_vma +FOLIO_MAPPING_ANON ;WRITE_ONCE (folio->mapping, (struct address_space *) anon_vma); folio->index =linear_page_index (vma, address); }
mm/util.c renamed from mm/util.c~mm-rename-page_mapping_-to-folio_mapping_ +3 -3
@@ -670,9 +670,9 @@ struct anon_vma *folio_anon_vma(const st {unsigned long mapping = (unsigned long )folio->mapping; -if ((mapping &PAGE_MAPPING_FLAGS ) !=PAGE_MAPPING_ANON ) +if ((mapping &FOLIO_MAPPING_FLAGS ) !=FOLIO_MAPPING_ANON )return NULL ; -return (void *)(mapping -PAGE_MAPPING_ANON ); +return (void *)(mapping -FOLIO_MAPPING_ANON ); }/**
@@ -699,7 +699,7 @@ struct address_space *folio_mapping(strureturn swap_address_space (folio->swap); mapping = folio->mapping; -if ((unsigned long )mapping &PAGE_MAPPING_FLAGS ) +if ((unsigned long )mapping &FOLIO_MAPPING_FLAGS )return NULL ;return mapping;
_
Patches currently in -mm which might be from [email protected] are
mm-convert-fpb_ignore_-into-fpb_respect_.patch mm-smaller-folio_pte_batch-improvements.patch mm-split-folio_pte_batch-into-folio_pte_batch-and-folio_pte_batch_flags.patch mm-remove-boolean-output-parameters-from-folio_pte_batch_ext.patch mm-memory-introduce-is_huge_zero_pfn-and-use-it-in-vm_normal_page_pmd.patch