migrate_pages-move-migrate_folio_unmap.patch removed from -mm tree
The quilt patch titled
Subject: migrate_pages: move migrate_folio_unmap()
has been removed from the -mm tree. Its filename was
migrate_pages-move-migrate_folio_unmap.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: Huang Ying <[email protected]>
Subject: migrate_pages: move migrate_folio_unmap()
Date: Mon, 13 Feb 2023 20:34:41 +0800
Just move the position of the functions. There's no any functionality change. This is to make it easier to review the next patch via putting code near its position in the next patch.
Signed-off-by "Huang, Ying" <[email protected]>
Reviewed-by Zi Yan <[email protected]>
Cc Yang Shi <[email protected]>
Cc Baolin Wang <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Bharata B Rao <[email protected]>
Cc Alistair Popple <[email protected]>
Cc Xin Hao <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Mike Kravetz <[email protected]>
Cc Hyeonggon Yoo <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/migrate.c renamed from mm/migrate.c~migrate_pages-move-migrate_folio_unmap +50 -50
@@ -1236,6 +1236,56 @@ out:return rc; } +/* Obtain the lock on page, remove all ptes. */ +static int migrate_folio_unmap (new_page_t get_new_page,free_page_t put_new_page, +unsigned long private,struct folio *src, +struct folio **dstp,int force,bool avoid_force_lock, +enum migrate_mode mode,enum migrate_reason reason, +struct list_head *ret) +{ +struct folio *dst; +int rc =MIGRATEPAGE_UNMAP ; +struct page *newpage =NULL ; + +if (!thp_migration_supported () &&folio_test_transhuge (src)) +return -ENOSYS ; + +if (folio_ref_count (src) ==1 ) { +/* Folio was freed from under us. So we are done. */ +folio_clear_active (src); +folio_clear_unevictable (src); +/* free_pages_prepare() will clear PG_isolated. */ +list_del (&src->lru); +migrate_folio_done (src, reason); +return MIGRATEPAGE_SUCCESS ; + } + + newpage =get_new_page (&src->page, private); +if (!newpage) +return -ENOMEM ; + dst =page_folio (newpage); + *dstp = dst; + + dst->private =NULL ; + rc =__migrate_folio_unmap (src, dst, force, avoid_force_lock, mode); +if (rc ==MIGRATEPAGE_UNMAP ) +return rc; + +/* +* A folio that has not been unmapped will be restored to +* right list unless we want to retry. +*/ +if (rc != -EAGAIN && rc != -EDEADLOCK ) +list_move_tail (&src->lru, ret); + +if (put_new_page) +put_new_page (&dst->page, private); +else +folio_put (dst); + +return rc; +} +static int __migrate_folio_move (struct folio *src,struct folio *dst,enum migrate_mode mode) {
@@ -1294,56 +1344,6 @@ out_unlock_both:folio_put (dst);return rc; -} - -/* Obtain the lock on page, remove all ptes. */ -static int migrate_folio_unmap (new_page_t get_new_page,free_page_t put_new_page, -unsigned long private,struct folio *src, -struct folio **dstp,int force,bool avoid_force_lock, -enum migrate_mode mode,enum migrate_reason reason, -struct list_head *ret) -{ -struct folio *dst; -int rc =MIGRATEPAGE_UNMAP ; -struct page *newpage =NULL ; - -if (!thp_migration_supported () &&folio_test_transhuge (src)) -return -ENOSYS ; - -if (folio_ref_count (src) ==1 ) { -/* Folio was freed from under us. So we are done. */ -folio_clear_active (src); -folio_clear_unevictable (src); -/* free_pages_prepare() will clear PG_isolated. */ -list_del (&src->lru); -migrate_folio_done (src, reason); -return MIGRATEPAGE_SUCCESS ; - } - - newpage =get_new_page (&src->page, private); -if (!newpage) -return -ENOMEM ; - dst =page_folio (newpage); - *dstp = dst; - - dst->private =NULL ; - rc =__migrate_folio_unmap (src, dst, force, avoid_force_lock, mode); -if (rc ==MIGRATEPAGE_UNMAP ) -return rc; - -/* -* A folio that has not been unmapped will be restored to -* right list unless we want to retry. -*/ -if (rc != -EAGAIN && rc != -EDEADLOCK ) -list_move_tail (&src->lru, ret); - -if (put_new_page) -put_new_page (&dst->page, private); -else -folio_put (dst); - -return rc; }/* Migrate the folio to the newly allocated folio in dst. */
_
Patches currently in -mm which might be from [email protected] are