mm-migrate-rename-putback_movable_folio-to-putback_movable_ops_page.patch removed from -mm tree
The quilt patch titled
Subject: mm/migrate: rename putback_movable_folio() to putback_movable_ops_page()
has been removed from the -mm tree. Its filename was
mm-migrate-rename-putback_movable_folio-to-putback_movable_ops_page.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/migrate: rename putback_movable_folio() to putback_movable_ops_page()
Date: Fri, 4 Jul 2025 12:25:02 +0200
... and factor the complete handling of movable_ops pages out. Convert it similar to isolate_movable_ops_page().
While at it, convert the VM_BUG_ON_FOLIO() into a VM_WARN_ON_PAGE().
---
mm/migrate.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-)
mm/migrate.c renamed from mm/migrate.c~mm-migrate-rename-putback_movable_folio-to-putback_movable_ops_page +23 -12
@@ -133,12 +133,30 @@ out:return false; } -static void putback_movable_folio (struct folio *folio) +/** +* putback_movable_ops_page - putback an isolated movable_ops page +* @page: The isolated page. +* +* Putback an isolated movable_ops page. +* +* After the page was putback, it might get freed instantly. +*/ +static void putback_movable_ops_page (struct page *page) { -const struct movable_operations *mops =folio_movable_ops (folio); +/* +* TODO: these pages will not be folios in the future. All +* folio dependencies will have to be removed. +*/ +struct folio *folio =page_folio (page); - mops->putback_page (&folio->page); -folio_clear_isolated (folio); +VM_WARN_ON_ONCE_PAGE (!PageIsolated (page), page); +folio_lock (folio); +/* If the page was released by it's owner, there is nothing to do. */ +if (PageMovable (page)) +page_movable_ops (page)->putback_page (page); +ClearPageIsolated (page); +folio_unlock (folio); +folio_put (folio); }/*
@@ -166,14 +184,7 @@ void putback_movable_pages(struct list_h* have PAGE_MAPPING_MOVABLE. */ if (unlikely (__folio_test_movable (folio))) { -VM_BUG_ON_FOLIO (!folio_test_isolated (folio), folio); -folio_lock (folio); -if (folio_test_movable (folio)) -putback_movable_folio (folio); -else -folio_clear_isolated (folio); -folio_unlock (folio); -folio_put (folio); +putback_movable_ops_page (&folio->page); }else {node_stat_mod_folio (folio,NR_ISOLATED_ANON +folio_is_file_lru (folio), -folio_nr_pages (folio));
_
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