mm-migrate-factor-out-movable_ops-page-handling-into-migrate_movable_ops_page.patch removed from -mm tree
The quilt patch titled
Subject: mm/migrate: factor out movable_ops page handling into migrate_movable_ops_page()
has been removed from the -mm tree. Its filename was
mm-migrate-factor-out-movable_ops-page-handling-into-migrate_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: factor out movable_ops page handling into migrate_movable_ops_page()
Date: Fri, 4 Jul 2025 12:25:03 +0200
Let's factor it out, simplifying the calling code.
Before this change, we would have called flush_dcache_folio() also on movable_ops pages. As documented in Documentation/core-api/cachetlb.rst:
"This routine need only be called for page cache pages which can
potentially ever be mapped into the address space of a user process."
So don't do it for movable_ops pages. If there would ever be such a movable_ops page user, it should do the flushing itself after performing the copy.
Note that we can now change folio_mapping_flags() to folio_test_anon() to make it clearer, because movable_ops pages will never take that path.
---
mm/migrate.c | 84 +++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 37 deletions(-)
mm/migrate.c renamed from mm/migrate.c~mm-migrate-factor-out-movable_ops-page-handling-into-migrate_movable_ops_page +47 -37
@@ -159,6 +159,47 @@ static void putback_movable_ops_page(strfolio_put (folio); } +/** +* migrate_movable_ops_page - migrate an isolated movable_ops page +* @dst: The destination page. +* @src: The source page. +* @mode: The migration mode. +* +* Migrate an isolated movable_ops page. +* +* If the src page was already released by its owner, the src page is +* un-isolated (putback) and migration succeeds; the migration core will be the +* owner of both pages. +* +* If the src page was not released by its owner and the migration was +* successful, the owner of the src page and the dst page are swapped and +* the src page is un-isolated. +* +* If migration fails, the ownership stays unmodified and the src page +* remains isolated: migration may be retried later or the page can be putback. +* +* TODO: migration core will treat both pages as folios and lock them before +* this call to unlock them after this call. Further, the folio refcounts on +* src and dst are also released by migration core. These pages will not be +* folios in the future, so that must be reworked. +* +* Returns MIGRATEPAGE_SUCCESS on success, otherwise a negative error +* code. +*/ +static int migrate_movable_ops_page (struct page *dst,struct page *src, +enum migrate_mode mode) +{ +int rc =MIGRATEPAGE_SUCCESS ; + +VM_WARN_ON_ONCE_PAGE (!PageIsolated (src), src); +/* If the page was released by it's owner, there is nothing to do. */ +if (PageMovable (src)) + rc =page_movable_ops (src)->migrate_page (dst, src, mode); +if (rc ==MIGRATEPAGE_SUCCESS ) +ClearPageIsolated (src); +return rc; +} +/* * Put previously isolated pages back onto the appropriate lists * from where they were once taken off for compaction/migration.
@@ -1023,51 +1064,20 @@ static int move_to_new_folio(struct foli mode); else rc =fallback_migrate_folio (mapping, dst, src, mode); - }else { -const struct movable_operations *mops; -/* -* In case of non-lru page, it could be released after -* isolation step. In that case, we shouldn't try migration. -*/ -VM_BUG_ON_FOLIO (!folio_test_isolated (src), src); -if (!folio_test_movable (src)) { - rc =MIGRATEPAGE_SUCCESS ; -folio_clear_isolated (src); +if (rc !=MIGRATEPAGE_SUCCESS ) goto out; - } - - mops =folio_movable_ops (src); - rc = mops->migrate_page (&dst->page, &src->page, mode); -WARN_ON_ONCE (rc ==MIGRATEPAGE_SUCCESS && - !folio_test_isolated (src)); - } - -/* -* When successful, old pagecache src->mapping must be cleared before -* src is freed; but stats require that PageAnon be left as PageAnon. -*/ -if (rc ==MIGRATEPAGE_SUCCESS ) { -if (__folio_test_movable (src)) { -VM_BUG_ON_FOLIO (!folio_test_isolated (src), src); - -/* -* We clear PG_movable under page_lock so any compactor -* cannot try to migrate this page. -*/ -folio_clear_isolated (src); - } -/* -* Anonymous and movable src->mapping will be cleared by -* free_pages_prepare so don't reset it here for keeping -* the type to work PageAnon, for example. +* For pagecache folios, src->mapping must be cleared before src +* is freed. Anonymous folios must stay anonymous until freed. */ -if (!folio_mapping_flags (src)) +if (!folio_test_anon (src)) src->mapping =NULL ;if (likely (!folio_is_zone_device (dst)))flush_dcache_folio (dst); + }else { + rc =migrate_movable_ops_page (&dst->page, &src->page, mode); } out:return rc;
_
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