mm-rename-__pagemovable-to-page_has_movable_ops.patch removed from -mm tree
The quilt patch titled
Subject: mm: rename __PageMovable() to page_has_movable_ops()
has been removed from the -mm tree. Its filename was
mm-rename-__pagemovable-to-page_has_movable_ops.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 __PageMovable() to page_has_movable_ops()
Date: Fri, 4 Jul 2025 12:25:10 +0200
Let's make it clearer that we are talking about movable_ops pages.
While at it, convert a VM_BUG_ON to a VM_WARN_ON_ONCE_PAGE.
---
include/linux/migrate.h | 2 +- include/linux/page-flags.h | 2 +- mm/compaction.c | 7 ++----- mm/memory-failure.c | 4 ++-- mm/memory_hotplug.c | 10 ++++------ mm/migrate.c | 8 ++++---- mm/page_alloc.c | 2 +- mm/page_isolation.c | 10 +++++----- 8 files changed, 20 insertions(+), 25 deletions(-)
include/linux/migrate.h renamed from include/linux/migrate.h~mm-rename-__pagemovable-to-page_has_movable_ops +1 -1
@@ -115,7 +115,7 @@ static inline void __SetPageMovable(strustatic inline const struct movable_operations *page_movable_ops (struct page *page) { -VM_BUG_ON (!__PageMovable (page)); +VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (page), page);return (const struct movable_operations *) ((unsigned long )page->mapping -PAGE_MAPPING_MOVABLE );
include/linux/page-flags.h renamed from include/linux/page-flags.h~mm-rename-__pagemovable-to-page_has_movable_ops +1 -1
@@ -750,7 +750,7 @@ static __always_inline bool __folio_testPAGE_MAPPING_MOVABLE ; } -static __always_inline bool __PageMovable(const struct page *page) +static __always_inline bool page_has_movable_ops(const struct page *page) {return ((unsigned long )page->mapping &PAGE_MAPPING_FLAGS ) ==PAGE_MAPPING_MOVABLE ;
mm/compaction.c renamed from mm/compaction.c~mm-rename-__pagemovable-to-page_has_movable_ops +2 -5
@@ -1056,11 +1056,8 @@ isolate_migratepages_block(struct compac* Skip any other type of page */ if (!PageLRU (page)) { -/* -* __PageMovable can return false positive so we need -* to verify it under page_lock. -*/ -if (unlikely (__PageMovable (page)) && +/* Isolation code will deal with any races. */ +if (unlikely (page_has_movable_ops (page)) && !PageIsolated (page)) {if (locked) {unlock_page_lruvec_irqrestore (locked, flags);
mm/memory-failure.c renamed from mm/memory-failure.c~mm-rename-__pagemovable-to-page_has_movable_ops +2 -2
@@ -1388,8 +1388,8 @@ static inline bool HWPoisonHandlable(strif (PageSlab (page))return false; -/* Soft offline could migrate non-LRU movable pages */ -if ((flags &MF_SOFT_OFFLINE ) &&__PageMovable (page)) +/* Soft offline could migrate movable_ops pages */ +if ((flags &MF_SOFT_OFFLINE ) &&page_has_movable_ops (page))return true;return PageLRU (page) ||is_free_buddy_page (page);
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-rename-__pagemovable-to-page_has_movable_ops +4 -6
@@ -1739,8 +1739,8 @@ bool mhp_range_allowed(u64 start, u64 si#ifdef CONFIG_MEMORY_HOTREMOVE /* -* Scan pfn range [start,end) to find movable/migratable pages (LRU pages, -* non-lru movable pages and hugepages). Will skip over most unmovable +* Scan pfn range [start,end) to find movable/migratable pages (LRU and +* hugetlb folio, movable_ops pages). Will skip over most unmovable * pages (esp., pages that can be skipped when offlining), but bail out on * definitely unmovable pages. *
@@ -1759,13 +1759,11 @@ static int scan_movable_pages(unsigned lstruct folio *folio; page =pfn_to_page (pfn); -if (PageLRU (page)) - goto found; -if (__PageMovable (page)) +if (PageLRU (page) ||page_has_movable_ops (page)) goto found;/* -* PageOffline() pages that are not marked __PageMovable() and +* PageOffline() pages that do not have movable_ops and * have a reference count > 0 (after MEM_GOING_OFFLINE) are * definitely unmovable. If their reference count would be 0, * they could at least be skipped when offlining memory.
mm/migrate.c renamed from mm/migrate.c~mm-rename-__pagemovable-to-page_has_movable_ops +4 -4
@@ -94,7 +94,7 @@ bool isolate_movable_ops_page(struct pag* Note that once a page has movable_ops, it will stay that way * until the page was freed. */ -if (unlikely (!__PageMovable (page))) +if (unlikely (!page_has_movable_ops (page))) goto out_putfolio;/*
@@ -111,7 +111,7 @@ bool isolate_movable_ops_page(struct pagif (unlikely (!folio_trylock (folio))) goto out_putfolio; -VM_WARN_ON_ONCE_PAGE (!__PageMovable (page), page); +VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (page), page);if (PageIsolated (page)) goto out_no_isolated;
@@ -153,7 +153,7 @@ static void putback_movable_ops_page(str*/ struct folio *folio =page_folio (page); -VM_WARN_ON_ONCE_PAGE (!__PageMovable (page), page); +VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (page), page);VM_WARN_ON_ONCE_PAGE (!PageIsolated (page), page);folio_lock (folio);page_movable_ops (page)->putback_page (page);
@@ -194,7 +194,7 @@ static int migrate_movable_ops_page(stru {int rc =MIGRATEPAGE_SUCCESS ; -VM_WARN_ON_ONCE_PAGE (!__PageMovable (src), src); +VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (src), src);VM_WARN_ON_ONCE_PAGE (!PageIsolated (src), src); rc =page_movable_ops (src)->migrate_page (dst, src, mode);if (rc ==MIGRATEPAGE_SUCCESS )
mm/page_alloc.c renamed from mm/page_alloc.c~mm-rename-__pagemovable-to-page_has_movable_ops +1 -1
@@ -2006,7 +2006,7 @@ static bool prep_move_freepages_block(st* migration are movable. But we don't actually try * isolating, as that would be expensive. */ -if (PageLRU (page) ||__PageMovable (page)) +if (PageLRU (page) ||page_has_movable_ops (page)) (*num_movable)++; pfn++; }
mm/page_isolation.c renamed from mm/page_isolation.c~mm-rename-__pagemovable-to-page_has_movable_ops +5 -5
@@ -21,9 +21,9 @@* consequently belong to a single zone. * * PageLRU check without isolation or lru_lock could race so that -* MIGRATE_MOVABLE block might include unmovable pages. And __PageMovable -* check without lock_page also may miss some movable non-lru pages at -* race condition. So you can't expect this function should be exact. +* MIGRATE_MOVABLE block might include unmovable pages. Similarly, pages +* with movable_ops can only be identified some time after they were +* allocated. So you can't expect this function should be exact. * * Returns a page without holding a reference. If the caller wants to * dereference that page (e.g., dumping), it has to make sure that it
@@ -133,7 +133,7 @@ static struct page *has_unmovable_pages(if ((mode ==PB_ISOLATE_MODE_MEM_OFFLINE ) &&PageOffline (page))continue ; -if (__PageMovable (page) ||PageLRU (page)) +if (PageLRU (page) ||page_has_movable_ops (page))continue ;/*
@@ -421,7 +421,7 @@ static int isolate_single_pageblock(unsi* proper free and split handling for them. */ VM_WARN_ON_ONCE_PAGE (PageLRU (page), page); -VM_WARN_ON_ONCE_PAGE (__PageMovable (page), page); +VM_WARN_ON_ONCE_PAGE (page_has_movable_ops (page), page); goto failed; }
_
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