mm: remove MIGRATEPAGE_*
Subsystems (13)
cover mm: remove MIGRATEPAGE_*
This is against mm/mm-new.
This series gets rid of MIGRATEPAGE_UNMAP, to then convert the remaining MIGRATEPAGE_SUCCESS usage to simply use 0 instead.
Not sure if it makes sense to split the second patch up, a treewide cleanup felt more reasonable for this simple change in an area where I don't expect a lot of churn.
Briefly tested with virtio-mem in a VM, making sure that basic page migration keeps working.
David Hildenbrand (2):
mm/migrate: remove MIGRATEPAGE_UNMAP
treewide: remove MIGRATEPAGE_SUCCESS
arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +- fs/btrfs/inode.c | 4 +- fs/hugetlbfs/inode.c | 4 +- fs/jfs/jfs_metapage.c | 8 +-- include/linux/migrate.h | 11 +--- mm/migrate.c | 80 ++++++++++++++-------------- mm/migrate_device.c | 2 +- mm/zsmalloc.c | 4 +- 11 files changed, 56 insertions(+), 67 deletions(-)
base-commit: 53c448023185717d0ed56b5546dc2be405da92ff
Signature · 1 line
2.50.1
PATCH 1/2 mm/migrate: remove MIGRATEPAGE_UNMAP
migrate_folio_unmap() is the only user of MIGRATEPAGE_UNMAP. We want to remove MIGRATEPAGE_* completely.
It's rather weird to have a generic MIGRATEPAGE_UNMAP, documented to be returned from address-space callbacks, when it's only used for an internal helper.
Let's start by having only a single "success" return value for migrate_folio_unmap() -- 0 -- by moving the "folio was already freed" check into the single caller.
There is a remaining comment for PG_isolated, which we renamed to PG_movable_ops_isolated recently and forgot to update.
While we might still run into that case with zsmalloc, it's something we want to get rid of soon. So let's just focus that optimization on real folios only for now by excluding movable_ops pages. Note that concurrent freeing can happen at any time and this "already freed" check is not relevant for correctness.
--- include/linux/migrate.h | 1 - mm/migrate.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-)
include/linux/migrate.h +0 -1
@@ -18,7 +18,6 @@ struct migration_target_control;* - zero on page migration success; */ #define MIGRATEPAGE_SUCCESS 0 -#define MIGRATEPAGE_UNMAP 1/** * struct movable_operations - Driver page migration
mm/migrate.c +20 -20
@@ -1176,16 +1176,6 @@ static int migrate_folio_unmap(new_folio_t get_new_folio,bool locked = false;bool dst_locked = false; -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 ; - } - dst =get_new_folio (src, private);if (!dst)return -ENOMEM ;
@@ -1275,7 +1265,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio,if (unlikely (page_has_movable_ops (&src->page))) {__migrate_folio_record (dst, old_page_state, anon_vma); -return MIGRATEPAGE_UNMAP ; +return 0 ; }/*
@@ -1305,7 +1295,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio,if (!folio_mapped (src)) {__migrate_folio_record (dst, old_page_state, anon_vma); -return MIGRATEPAGE_UNMAP ; +return 0 ; } out:
@@ -1848,14 +1838,28 @@ static int migrate_pages_batch(struct list_head *from,continue ; } +/* +* If we are holding the last folio reference, the folio +* was freed from under us, so just drop our reference. +*/ +if (likely (!page_has_movable_ops (&folio->page)) && +folio_ref_count (folio) ==1 ) { +folio_clear_active (folio); +folio_clear_unevictable (folio); +list_del (&folio->lru); +migrate_folio_done (folio, reason); + stats->nr_succeeded += nr_pages; + stats->nr_thp_succeeded += is_thp; +continue ; + } + rc =migrate_folio_unmap (get_new_folio, put_new_folio, private, folio, &dst, mode, reason, ret_folios);/* * The rules are: -* Success: folio will be freed -* Unmap: folio will be put on unmap_folios list, -* dst folio put on dst_folios list +* 0: folio will be put on unmap_folios list, +* dst folio put on dst_folios list * -EAGAIN: stay on the from list * -ENOMEM: stay on the from list * Other errno: put on ret_folios list
@@ -1905,11 +1909,7 @@ static int migrate_pages_batch(struct list_head *from, thp_retry += is_thp; nr_retry_pages += nr_pages;break ; -case MIGRATEPAGE_SUCCESS : - stats->nr_succeeded += nr_pages; - stats->nr_thp_succeeded += is_thp; -break ; -case MIGRATEPAGE_UNMAP : +case 0 :list_move_tail (&folio->lru, &unmap_folios);list_add_tail (&dst->lru, &dst_folios);break ;
Signature · 1 line
2.50.1
Zi Yan
reviewerRe: [PATCH v1 1/2] mm/migrate: remove MIGRATEPAGE_UNMAP
Quoted 20 lines · David Hildenbrand
migrate_folio_unmap()is the only user ofMIGRATEPAGE_UNMAP. We want to remove MIGRATEPAGE_* completely.It's rather weird to have a generic
MIGRATEPAGE_UNMAP, documented to be returned from address-space callbacks, when it's only used for an internal helper.Let's start by having only a single "success" return value for
migrate_folio_unmap()-- 0 -- by moving the "folio was already freed" check into the single caller.There is a remaining comment for
PG_isolated, which we renamed toPG_movable_ops_isolatedrecently and forgot to update.While we might still run into that case with zsmalloc, it's something we want to get rid of soon. So let's just focus that optimization on real folios only for now by excluding
movable_opspages. Note that concurrent freeing can happen at any time and this "already freed" check is not relevant for correctness.
Quoted 6 lines
Signed-off-by David Hildenbrand <[email protected]>--- include/linux/migrate.h | 1 - mm/migrate.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-)
LGTM. Reviewed-by: Zi Yan <[email protected]>
Best Regards,
Yan, Zi
Re: [PATCH v1 1/2] mm/migrate: remove MIGRATEPAGE_UNMAP
In reply to David HildenbrandQuoted 1 line · David Hildenbrand
[...]
Quoted 45 lines
+++
b/mm/migrate.cmm/migrate.c +7
-12@@ -1176,16 +1176,6 @@ static int migrate_folio_unmap(new_folio_t get_new_folio,bool locked = false;bool dst_locked = false; -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 ; - } - dst =get_new_folio (src, private);if (!dst)return -ENOMEM ;@@ -1275,7 +1265,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio,if (unlikely (page_has_movable_ops (&src->page))) {__migrate_folio_record (dst, old_page_state, anon_vma); -return MIGRATEPAGE_UNMAP ; +return 0 ; }/* @@ -1305,7 +1295,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio,if (!folio_mapped (src)) {__migrate_folio_record (dst, old_page_state, anon_vma); -return MIGRATEPAGE_UNMAP ; +return 0 ; } out:@@ -1848,14 +1838,28 @@ static int migrate_pages_batch(struct list_head *from,continue ; } +/* +* If we are holding the last folio reference, the folio +* was freed from under us, so just drop our reference. +*/ + if (likely(!page_has_movable_ops(&folio->page)) &&
mm/migrate.c static int migrate_pages_batch(struct list_head *from, · line 1855
Quoted 10 lines
mm/migrate.c +10
-0+ folio_ref_count(folio) == 1) { +folio_clear_active (folio); +folio_clear_unevictable (folio); +list_del (&folio->lru); +migrate_folio_done (folio, reason); + stats->nr_succeeded += nr_pages; + stats->nr_thp_succeeded += is_thp; +continue ; + } +
It seems the reason parameter is no longer used within migrate_folio_unmap() after this patch.
Perhaps it could be removed from the function's signature ;)
mm/migrate.c static int migrate_pages_batch(struct list_head *from, · line 1858
Quoted 3 lines
mm/migrate.c +0
-0rc =migrate_folio_unmap (get_new_folio, put_new_folio, private, folio, &dst, mode, reason, ret_folios);
Anyway, just a small thought. Feel free to add:
Thanks,
Lance
Re: [PATCH v1 1/2] mm/migrate: remove MIGRATEPAGE_UNMAP
Quoted 62 lines · Lance Yang
Quoted 1 line · David Hildenbrand
[...]
Quoted 45 lines
+++
b/mm/migrate.c(quoted diff) +7
-12@@ -1176,16 +1176,6 @@ static int migrate_folio_unmap(new_folio_t get_new_folio, bool locked = false; bool dst_locked = false; - 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; - } - dst = get_new_folio(src, private); if (!dst) return -ENOMEM;@@ -1275,7 +1265,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio, if (unlikely(page_has_movable_ops(&src->page))) { __migrate_folio_record(dst, old_page_state, anon_vma); - return MIGRATEPAGE_UNMAP; + return 0; } /*@@ -1305,7 +1295,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio, if (!folio_mapped(src)) { __migrate_folio_record(dst, old_page_state, anon_vma); - return MIGRATEPAGE_UNMAP; + return 0; } out:@@ -1848,14 +1838,28 @@ static int migrate_pages_batch(struct list_head *from, continue; } + /* + * If we are holding the last folio reference, the folio + * was freed from under us, so just drop our reference. + */ + if (likely(!page_has_movable_ops(&folio->page)) &&Review static int migrate_pages_batch(struct list_head *from, · line 1855
Quoted 10 lines
(quoted diff) +10
-0+ folio_ref_count(folio) == 1) { + folio_clear_active(folio); + folio_clear_unevictable(folio); + list_del(&folio->lru); + migrate_folio_done(folio, reason); + stats->nr_succeeded += nr_pages; + stats->nr_thp_succeeded += is_thp; + continue; + } +It seems the reason parameter is no longer used within
migrate_folio_unmap()after this patch.
Quoted 1 line
Perhaps it could be removed from the function's signature ;)
Thanks, well spotted, @Andrew can you squash the following?
From 40938bb0de20e03250c813d5abc7286aea69d835 Mon Sep 17 00:00:00 2001
From: David Hildenbrand <[email protected]>
Date: Mon, 18 Aug 2025 13:26:05 +0200
Subject: [PATCH] fixup: mm/migrate: remove MIGRATEPAGE_UNMAP
No need to pass "reason" to migrate_folio_unmap().
--- mm/migrate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
mm/migrate.c +2 -3
@@ -1166,7 +1166,7 @@ static void migrate_folio_done(struct folio *src,static int migrate_folio_unmap (new_folio_t get_new_folio,free_folio_t put_new_folio,unsigned long private,struct folio *src,struct folio **dstp,enum migrate_mode mode, -enum migrate_reason reason,struct list_head *ret) +struct list_head *ret) {struct folio *dst;int rc = -EAGAIN ;
@@ -1852,8 +1852,7 @@ static int migrate_pages_batch(struct list_head *from, } rc =migrate_folio_unmap (get_new_folio, put_new_folio, - private, folio, &dst, mode, reason, - ret_folios); + private, folio, &dst, mode, ret_folios);/* * The rules are: * 0: folio will be put on unmap_folios list,
Signature · 7 lines
2.50.1 -- Cheers David / dhildenb
PATCH 2/2 treewide: remove MIGRATEPAGE_SUCCESS
In reply to David HildenbrandAt this point MIGRATEPAGE_SUCCESS is misnamed for all folio users, and now that we remove MIGRATEPAGE_UNMAP, it's really the only "success" return value that the code uses and expects.
Let's just get rid of MIGRATEPAGE_SUCCESS completely and just use "0" for success.
--- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +-- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +- fs/btrfs/inode.c | 4 +-- fs/hugetlbfs/inode.c | 4 +-- fs/jfs/jfs_metapage.c | 8 +++--- include/linux/migrate.h | 10 +------ mm/migrate.c | 40 +++++++++++++--------------- mm/migrate_device.c | 2 +- mm/zsmalloc.c | 4 +-- 11 files changed, 36 insertions(+), 46 deletions(-)
arch/powerpc/platforms/pseries/cmm.c +1 -1
@@ -545,7 +545,7 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info,/* balloon page list reference */ put_page (page); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }static void cmm_balloon_compaction_init (void )
drivers/misc/vmw_balloon.c +2 -2
@@ -1806,7 +1806,7 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info,* the list after acquiring the lock. */ get_page (newpage); - ret =MIGRATEPAGE_SUCCESS ; + ret =0 ; }/* Update the balloon list under the @pages_lock */
@@ -1817,7 +1817,7 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info,* If we succeed just insert it to the list and update the statistics * under the lock. */ -if (ret ==MIGRATEPAGE_SUCCESS ) { +if (!ret) {balloon_page_insert (&b->b_dev_info, newpage);__count_vm_event (BALLOON_MIGRATE ); }
drivers/virtio/virtio_balloon.c +1 -1
@@ -875,7 +875,7 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info,balloon_page_finalize (page);put_page (page);/* balloon reference */ - return MIGRATEPAGE_SUCCESS; + return 0; }#endif /* CONFIG_BALLOON_COMPACTION */
fs/aio.c +1 -1
@@ -445,7 +445,7 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst,folio_get (dst); rc =folio_migrate_mapping (mapping, dst, src,1 ); -if (rc !=MIGRATEPAGE_SUCCESS ) { +if (rc) {folio_put (dst); goto out_unlock; }
fs/btrfs/inode.c +2 -2
@@ -7411,7 +7411,7 @@ static int btrfs_migrate_folio(struct address_space *mapping, {int ret =filemap_migrate_folio (mapping, dst, src, mode); -if (ret !=MIGRATEPAGE_SUCCESS ) +if (ret)return ret;if (folio_test_ordered (src)) {
@@ -7419,7 +7419,7 @@ static int btrfs_migrate_folio(struct address_space *mapping, folio_set_ordered(dst); } -return MIGRATEPAGE_SUCCESS ; +return 0 ; }#else #define btrfs_migrate_folio NULL
fs/hugetlbfs/inode.c +2 -2
@@ -1052,7 +1052,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,int rc; rc =migrate_huge_page_move_mapping (mapping, dst, src); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (hugetlb_folio_subpool (src)) {
@@ -1063,7 +1063,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,folio_migrate_flags (dst, src); - return MIGRATEPAGE_SUCCESS; + return 0; }#else #define hugetlbfs_migrate_folio NULL
fs/jfs/jfs_metapage.c +4 -4
@@ -169,7 +169,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, } rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;for (i =0 ; i <MPS_PER_PAGE ; i++) {
@@ -199,7 +199,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, } } -return MIGRATEPAGE_SUCCESS ; +return 0 ; }#endif /* CONFIG_MIGRATION */
@@ -242,7 +242,7 @@ static int __metapage_migrate_folio(struct address_space *mapping,return -EAGAIN ; rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (unlikely (insert_metapage (dst, mp)))
@@ -253,7 +253,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, mp->folio = dst;remove_metapage (src, mp); - return MIGRATEPAGE_SUCCESS; + return 0; }#endif /* CONFIG_MIGRATION */
include/linux/migrate.h +1 -9
@@ -12,13 +12,6 @@ typedef void free_folio_t(struct folio *folio, unsigned long private);struct migration_target_control ; -/* -* Return values from addresss_space_operations.migratepage(): -* - negative errno on page migration failure; -* - zero on page migration success; -*/ -#define MIGRATEPAGE_SUCCESS 0 -/** * struct movable_operations - Driver page migration * @isolate_page:
@@ -34,8 +27,7 @@ struct migration_target_control;* @src page. The driver should copy the contents of the * @src page to the @dst page and set up the fields of @dst page. * Both pages are locked. -* If page migration is successful, the driver should -* return MIGRATEPAGE_SUCCESS. +* If page migration is successful, the driver should return 0. * If the driver cannot migrate the page at the moment, it can return * -EAGAIN. The VM interprets this as a temporary migration failure and * will retry it later. Any other error value is a permanent migration
mm/migrate.c +19 -21
@@ -209,18 +209,17 @@ static void putback_movable_ops_page(struct page *page)* 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. +* Returns 0 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 ; +int rc;VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (src), src);VM_WARN_ON_ONCE_PAGE (!PageMovableOpsIsolated (src), src); rc =page_movable_ops (src)->migrate_page (dst, src, mode); -if (rc ==MIGRATEPAGE_SUCCESS ) +if (!rc)ClearPageMovableOpsIsolated (src);return rc; }
@@ -565,7 +564,7 @@ static int __folio_migrate_mapping(struct address_space *mapping,if (folio_test_swapbacked (folio))__folio_set_swapbacked (newfolio); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } oldzone =folio_zone (folio);
@@ -666,7 +665,7 @@ static int __folio_migrate_mapping(struct address_space *mapping, }local_irq_enable (); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } int folio_migrate_mapping(struct address_space *mapping,
@@ -715,7 +714,7 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,xas_unlock_irq (&xas); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }/*
@@ -831,14 +830,14 @@ static int __migrate_folio(struct address_space *mapping, struct folio *dst,return rc; rc =__folio_migrate_mapping (mapping, dst, src, expected_count); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (src_private)folio_attach_private (dst,folio_detach_private (src));folio_migrate_flags (dst, src); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }/**
@@ -945,7 +944,7 @@ static int __buffer_migrate_folio(struct address_space *mapping, } rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc) goto unlock_buffers; bh = head;
@@ -1049,7 +1048,7 @@ static int fallback_migrate_folio(struct address_space *mapping,* * Return value: * < 0 - error code -* MIGRATEPAGE_SUCCESS - success +* 0 - success */ static int move_to_new_folio (struct folio *dst,struct folio *src,enum migrate_mode mode)
@@ -1077,7 +1076,7 @@ static int move_to_new_folio(struct folio *dst, struct folio *src,else rc =fallback_migrate_folio (mapping, dst, src, mode); -if (rc ==MIGRATEPAGE_SUCCESS ) { +if (!rc) {/* * For pagecache folios, src->mapping must be cleared before src * is freed. Anonymous folios must stay anonymous until freed.
@@ -1427,7 +1426,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,if (folio_ref_count (src) ==1 ) {/* page was freed from under us. So we are done. */ folio_putback_hugetlb (src); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } dst =get_new_folio (src, private);
@@ -1490,8 +1489,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, rc =move_to_new_folio (dst, src, mode);if (page_was_mapped) -remove_migration_ptes (src, - rc ==MIGRATEPAGE_SUCCESS ? dst : src,0 ); +remove_migration_ptes (src, !rc ? dst : src,0 ); unlock_put_anon:folio_unlock (dst);
@@ -1500,7 +1498,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,if (anon_vma)put_anon_vma (anon_vma); -if (rc ==MIGRATEPAGE_SUCCESS ) { +if (!rc) {move_hugetlb_state (src, dst, reason); put_new_folio =NULL ; }
@@ -1508,7 +1506,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, out_unlock:folio_unlock (src); out: -if (rc ==MIGRATEPAGE_SUCCESS ) +if (!rc)folio_putback_hugetlb (src);else if (rc != -EAGAIN )list_move_tail (&src->lru, ret);
@@ -1618,7 +1616,7 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio, reason, ret_folios);/* * The rules are: -* Success: hugetlb folio will be put back +* 0: hugetlb folio will be put back * -EAGAIN: stay on the from list * -ENOMEM: stay on the from list * Other errno: put on ret_folios list
@@ -1635,7 +1633,7 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio, retry++; nr_retry_pages += nr_pages;break ; -case MIGRATEPAGE_SUCCESS : +case 0 : stats->nr_succeeded += nr_pages;break ;default :
@@ -1689,7 +1687,7 @@ static void migrate_folios_move(struct list_head *src_folios, reason, ret_folios);/* * The rules are: -* Success: folio will be freed +* 0: folio will be freed * -EAGAIN: stay on the unmap_folios list * Other errno: put on ret_folios list */
@@ -1699,7 +1697,7 @@ static void migrate_folios_move(struct list_head *src_folios, *thp_retry += is_thp; *nr_retry_pages += nr_pages;break ; -case MIGRATEPAGE_SUCCESS : +case 0 : stats->nr_succeeded += nr_pages; stats->nr_thp_succeeded += is_thp;break ;
mm/migrate_device.c +1 -1
@@ -778,7 +778,7 @@ static void __migrate_device_pages(unsigned long *src_pfns,if (migrate && migrate->fault_page == page) extra_cnt =1 ; r =folio_migrate_mapping (mapping, newfolio, folio, extra_cnt); -if (r !=MIGRATEPAGE_SUCCESS ) +if (r) src_pfns[i] &= ~MIGRATE_PFN_MIGRATE ;else folio_migrate_flags (newfolio, folio);
mm/zsmalloc.c +2 -2
@@ -1746,7 +1746,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,* instead. */ if (!zpdesc->zspage) -return MIGRATEPAGE_SUCCESS ; +return 0 ;/* The page is locked, so this pointer must remain valid */ zspage =get_zspage (zpdesc);
@@ -1813,7 +1813,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,reset_zpdesc (zpdesc);zpdesc_put (zpdesc); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }static void zs_page_putback (struct page *page)
Signature · 1 line
2.50.1
Re: [PATCH v1 2/2] treewide: remove MIGRATEPAGE_SUCCESS
Quoted 8 lines · David Hildenbrand
At this point
MIGRATEPAGE_SUCCESSis misnamed for all folio users, and now that we removeMIGRATEPAGE_UNMAP, it's really the only "success" return value that the code uses and expects.Let's just get rid of
MIGRATEPAGE_SUCCESScompletely and just use "0" for success.Signed-off-by David Hildenbrand <[email protected]>
For jfs:
Quoted 392 lines
--- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +-- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +- fs/btrfs/inode.c | 4 +-- fs/hugetlbfs/inode.c | 4 +-- fs/jfs/jfs_metapage.c | 8 +++--- include/linux/migrate.h | 10 +------ mm/migrate.c | 40 +++++++++++++--------------- mm/migrate_device.c | 2 +- mm/zsmalloc.c | 4 +-- 11 files changed, 36 insertions(+), 46 deletions(-)arch/powerpc/platforms/pseries/cmm.c +1
-1@@ -545,7 +545,7 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info,/* balloon page list reference */ put_page (page); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }static void cmm_balloon_compaction_init (void )drivers/misc/vmw_balloon.c +2
-2@@ -1806,7 +1806,7 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info,* the list after acquiring the lock. */ get_page (newpage); - ret =MIGRATEPAGE_SUCCESS ; + ret =0 ; }/* Update the balloon list under the @pages_lock */ @@ -1817,7 +1817,7 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info,* If we succeed just insert it to the list and update the statistics * under the lock. */ -if (ret ==MIGRATEPAGE_SUCCESS ) { +if (!ret) {balloon_page_insert (&b->b_dev_info, newpage);__count_vm_event (BALLOON_MIGRATE ); }drivers/virtio/virtio_balloon.c +1
-1@@ -875,7 +875,7 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info,balloon_page_finalize (page);put_page (page);/* balloon reference */ - return MIGRATEPAGE_SUCCESS; + return 0; }#endif /* CONFIG_BALLOON_COMPACTION */ fs/aio.c +1
-1@@ -445,7 +445,7 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst,folio_get (dst); rc =folio_migrate_mapping (mapping, dst, src,1 ); -if (rc !=MIGRATEPAGE_SUCCESS ) { +if (rc) {folio_put (dst); goto out_unlock; }fs/btrfs/inode.c +2
-2@@ -7411,7 +7411,7 @@ static int btrfs_migrate_folio(struct address_space *mapping, {int ret =filemap_migrate_folio (mapping, dst, src, mode); -if (ret !=MIGRATEPAGE_SUCCESS ) +if (ret)return ret;if (folio_test_ordered (src)) {@@ -7419,7 +7419,7 @@ static int btrfs_migrate_folio(struct address_space *mapping, folio_set_ordered(dst); } -return MIGRATEPAGE_SUCCESS ; +return 0 ; }#else #define btrfs_migrate_folio NULLfs/hugetlbfs/inode.c +2
-2@@ -1052,7 +1052,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,int rc; rc =migrate_huge_page_move_mapping (mapping, dst, src); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (hugetlb_folio_subpool (src)) {@@ -1063,7 +1063,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,folio_migrate_flags (dst, src); - return MIGRATEPAGE_SUCCESS; + return 0; }#else #define hugetlbfs_migrate_folio NULLfs/jfs/jfs_metapage.c +4
-4@@ -169,7 +169,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, } rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;for (i =0 ; i <MPS_PER_PAGE ; i++) {@@ -199,7 +199,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, } } -return MIGRATEPAGE_SUCCESS ; +return 0 ; }#endif /* CONFIG_MIGRATION */ @@ -242,7 +242,7 @@ static int __metapage_migrate_folio(struct address_space *mapping,return -EAGAIN ; rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (unlikely (insert_metapage (dst, mp)))@@ -253,7 +253,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, mp->folio = dst;remove_metapage (src, mp); - return MIGRATEPAGE_SUCCESS; + return 0; }#endif /* CONFIG_MIGRATION */ include/linux/migrate.h +1
-9@@ -12,13 +12,6 @@ typedef void free_folio_t(struct folio *folio, unsigned long private);struct migration_target_control ; -/* -* Return values from addresss_space_operations.migratepage(): -* - negative errno on page migration failure; -* - zero on page migration success; -*/ -#define MIGRATEPAGE_SUCCESS 0 -/** * struct movable_operations - Driver page migration * @isolate_page: @@ -34,8 +27,7 @@ struct migration_target_control;* @src page. The driver should copy the contents of the * @src page to the @dst page and set up the fields of @dst page. * Both pages are locked. -* If page migration is successful, the driver should -* return MIGRATEPAGE_SUCCESS. +* If page migration is successful, the driver should return 0. * If the driver cannot migrate the page at the moment, it can return * -EAGAIN. The VM interprets this as a temporary migration failure and * will retry it later. Any other error value is a permanent migration mm/migrate.c +19
-21@@ -209,18 +209,17 @@ static void putback_movable_ops_page(struct page *page)* 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. +* Returns 0 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 ; +int rc;VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (src), src);VM_WARN_ON_ONCE_PAGE (!PageMovableOpsIsolated (src), src); rc =page_movable_ops (src)->migrate_page (dst, src, mode); -if (rc ==MIGRATEPAGE_SUCCESS ) +if (!rc)ClearPageMovableOpsIsolated (src);return rc; }@@ -565,7 +564,7 @@ static int __folio_migrate_mapping(struct address_space *mapping,if (folio_test_swapbacked (folio))__folio_set_swapbacked (newfolio); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } oldzone =folio_zone (folio);@@ -666,7 +665,7 @@ static int __folio_migrate_mapping(struct address_space *mapping, }local_irq_enable (); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } int folio_migrate_mapping(struct address_space *mapping,@@ -715,7 +714,7 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,xas_unlock_irq (&xas); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }/* @@ -831,14 +830,14 @@ static int __migrate_folio(struct address_space *mapping, struct folio *dst,return rc; rc =__folio_migrate_mapping (mapping, dst, src, expected_count); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (src_private)folio_attach_private (dst,folio_detach_private (src));folio_migrate_flags (dst, src); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }/** @@ -945,7 +944,7 @@ static int __buffer_migrate_folio(struct address_space *mapping, } rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc) goto unlock_buffers; bh = head;@@ -1049,7 +1048,7 @@ static int fallback_migrate_folio(struct address_space *mapping,* * Return value: * < 0 - error code -* MIGRATEPAGE_SUCCESS - success +* 0 - success */ static int move_to_new_folio (struct folio *dst,struct folio *src,enum migrate_mode mode)@@ -1077,7 +1076,7 @@ static int move_to_new_folio(struct folio *dst, struct folio *src,else rc =fallback_migrate_folio (mapping, dst, src, mode); -if (rc ==MIGRATEPAGE_SUCCESS ) { +if (!rc) {/* * For pagecache folios, src->mapping must be cleared before src * is freed. Anonymous folios must stay anonymous until freed. @@ -1427,7 +1426,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,if (folio_ref_count (src) ==1 ) {/* page was freed from under us. So we are done. */ folio_putback_hugetlb (src); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } dst =get_new_folio (src, private);@@ -1490,8 +1489,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, rc =move_to_new_folio (dst, src, mode);if (page_was_mapped) -remove_migration_ptes (src, - rc ==MIGRATEPAGE_SUCCESS ? dst : src,0 ); +remove_migration_ptes (src, !rc ? dst : src,0 ); unlock_put_anon:folio_unlock (dst);@@ -1500,7 +1498,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,if (anon_vma)put_anon_vma (anon_vma); -if (rc ==MIGRATEPAGE_SUCCESS ) { +if (!rc) {move_hugetlb_state (src, dst, reason); put_new_folio =NULL ; }@@ -1508,7 +1506,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, out_unlock:folio_unlock (src); out: -if (rc ==MIGRATEPAGE_SUCCESS ) +if (!rc)folio_putback_hugetlb (src);else if (rc != -EAGAIN )list_move_tail (&src->lru, ret);@@ -1618,7 +1616,7 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio, reason, ret_folios);/* * The rules are: -* Success: hugetlb folio will be put back +* 0: hugetlb folio will be put back * -EAGAIN: stay on the from list * -ENOMEM: stay on the from list * Other errno: put on ret_folios list @@ -1635,7 +1633,7 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio, retry++; nr_retry_pages += nr_pages;break ; -case MIGRATEPAGE_SUCCESS : +case 0 : stats->nr_succeeded += nr_pages;break ;default :@@ -1689,7 +1687,7 @@ static void migrate_folios_move(struct list_head *src_folios, reason, ret_folios);/* * The rules are: -* Success: folio will be freed +* 0: folio will be freed * -EAGAIN: stay on the unmap_folios list * Other errno: put on ret_folios list */ @@ -1699,7 +1697,7 @@ static void migrate_folios_move(struct list_head *src_folios, *thp_retry += is_thp; *nr_retry_pages += nr_pages;break ; -case MIGRATEPAGE_SUCCESS : +case 0 : stats->nr_succeeded += nr_pages; stats->nr_thp_succeeded += is_thp;break ;mm/migrate_device.c +1
-1@@ -778,7 +778,7 @@ static void __migrate_device_pages(unsigned long *src_pfns,if (migrate && migrate->fault_page == page) extra_cnt =1 ; r =folio_migrate_mapping (mapping, newfolio, folio, extra_cnt); -if (r !=MIGRATEPAGE_SUCCESS ) +if (r) src_pfns[i] &= ~MIGRATE_PFN_MIGRATE ;else folio_migrate_flags (newfolio, folio);mm/zsmalloc.c +2
-2@@ -1746,7 +1746,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,* instead. */ if (!zpdesc->zspage) -return MIGRATEPAGE_SUCCESS ; +return 0 ;/* The page is locked, so this pointer must remain valid */ zspage =get_zspage (zpdesc);@@ -1813,7 +1813,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,reset_zpdesc (zpdesc);zpdesc_put (zpdesc); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }static void zs_page_putback (struct page *page)
Zi Yan
reviewerRe: [PATCH v1 2/2] treewide: remove MIGRATEPAGE_SUCCESS
In reply to David HildenbrandQuoted 19 lines · David Hildenbrand
At this point
MIGRATEPAGE_SUCCESSis misnamed for all folio users, and now that we removeMIGRATEPAGE_UNMAP, it's really the only "success" return value that the code uses and expects.Let's just get rid of
MIGRATEPAGE_SUCCESScompletely and just use "0" for success.Signed-off-by David Hildenbrand <[email protected]>--- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +-- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +- fs/btrfs/inode.c | 4 +-- fs/hugetlbfs/inode.c | 4 +-- fs/jfs/jfs_metapage.c | 8 +++---
Quoted 6 lines
include/linux/migrate.h | 10 +------ mm/migrate.c | 40 +++++++++++++--------------- mm/migrate_device.c | 2 +- mm/zsmalloc.c | 4 +-- 11 files changed, 36 insertions(+), 46 deletions(-)
For the mm part, LGTM. Reviewed-by: Zi Yan <[email protected]>
Best Regards,
Yan, Zi
Re: [PATCH v1 2/2] treewide: remove MIGRATEPAGE_SUCCESS
In reply to David HildenbrandQuoted 8 lines · David Hildenbrand
At this point
MIGRATEPAGE_SUCCESSis misnamed for all folio users, and now that we removeMIGRATEPAGE_UNMAP, it's really the only "success" return value that the code uses and expects.Let's just get rid of
MIGRATEPAGE_SUCCESScompletely and just use "0" for success.Signed-off-by David Hildenbrand <[email protected]>
FWIW,
Re: [PATCH v1 2/2] treewide: remove MIGRATEPAGE_SUCCESS
In reply to David HildenbrandQuoted 8 lines · David Hildenbrand
At this point
MIGRATEPAGE_SUCCESSis misnamed for all folio users, and now that we removeMIGRATEPAGE_UNMAP, it's really the only "success" return value that the code uses and expects.Let's just get rid of
MIGRATEPAGE_SUCCESScompletely and just use "0" for success.Signed-off-by David Hildenbrand <[email protected]>
Quoted 13 lines
--- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +-- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +- fs/btrfs/inode.c | 4 +-- fs/hugetlbfs/inode.c | 4 +-- fs/jfs/jfs_metapage.c | 8 +++--- include/linux/migrate.h | 10 +------ mm/migrate.c | 40 +++++++++++++--------------- mm/migrate_device.c | 2 +- mm/zsmalloc.c | 4 +-- 11 files changed, 36 insertions(+), 46 deletions(-)
Re: [PATCH v1 2/2] treewide: remove MIGRATEPAGE_SUCCESS
In reply to David HildenbrandQuoted 7 lines · David Hildenbrand
At this point
MIGRATEPAGE_SUCCESSis misnamed for all folio users, and now that we removeMIGRATEPAGE_UNMAP, it's really the only "success" return value that the code uses and expects.Let's just get rid of
MIGRATEPAGE_SUCCESScompletely and just use "0" for success.
Quoted 6 lines
Signed-off-by David Hildenbrand <[email protected]>--- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +-- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +-
For
Quoted 1 line
fs/btrfs/inode.c | 4 +--
Re: [PATCH v1 2/2] treewide: remove MIGRATEPAGE_SUCCESS
In reply to David HildenbrandQuoted 27 lines · David Hildenbrand
At this point
MIGRATEPAGE_SUCCESSis misnamed for all folio users, and now that we removeMIGRATEPAGE_UNMAP, it's really the only "success" return value that the code uses and expects.Let's just get rid of
MIGRATEPAGE_SUCCESScompletely and just use "0" for success.Signed-off-by David Hildenbrand <[email protected]>--- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +-- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +- fs/btrfs/inode.c | 4 +-- fs/hugetlbfs/inode.c | 4 +-- fs/jfs/jfs_metapage.c | 8 +++--- include/linux/migrate.h | 10 +------ mm/migrate.c | 40 +++++++++++++--------------- mm/migrate_device.c | 2 +- mm/zsmalloc.c | 4 +-- 11 files changed, 36 insertions(+), 46 deletions(-)arch/powerpc/platforms/pseries/cmm.c +0
-0
arch/powerpc/platforms/pseries/cmm.c static int cmm_migratepage(struct balloon_dev_info *b_dev_info, · line 548
Quoted 5 lines
arch/powerpc/platforms/pseries/cmm.c +1
-1@@ -545,7 +545,7 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info,/* balloon page list reference */ put_page (page); -return MIGRATEPAGE_SUCCESS ; +return 0 ;
Yeah. The unnecessary thing has been kept. Looks better to me.
Byungchul
Quoted 369 lines
arch/powerpc/platforms/pseries/cmm.c +0
-0static void cmm_balloon_compaction_init (void )drivers/misc/vmw_balloon.c +2
-2@@ -1806,7 +1806,7 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info,* the list after acquiring the lock. */ get_page (newpage); - ret =MIGRATEPAGE_SUCCESS ; + ret =0 ; }/* Update the balloon list under the @pages_lock */ @@ -1817,7 +1817,7 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info,* If we succeed just insert it to the list and update the statistics * under the lock. */ -if (ret ==MIGRATEPAGE_SUCCESS ) { +if (!ret) {balloon_page_insert (&b->b_dev_info, newpage);__count_vm_event (BALLOON_MIGRATE ); }drivers/virtio/virtio_balloon.c +1
-1@@ -875,7 +875,7 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info,balloon_page_finalize (page);put_page (page);/* balloon reference */ - return MIGRATEPAGE_SUCCESS; + return 0; }#endif /* CONFIG_BALLOON_COMPACTION */ fs/aio.c +1
-1@@ -445,7 +445,7 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst,folio_get (dst); rc =folio_migrate_mapping (mapping, dst, src,1 ); -if (rc !=MIGRATEPAGE_SUCCESS ) { +if (rc) {folio_put (dst); goto out_unlock; }fs/btrfs/inode.c +2
-2@@ -7411,7 +7411,7 @@ static int btrfs_migrate_folio(struct address_space *mapping, {int ret =filemap_migrate_folio (mapping, dst, src, mode); -if (ret !=MIGRATEPAGE_SUCCESS ) +if (ret)return ret;if (folio_test_ordered (src)) {@@ -7419,7 +7419,7 @@ static int btrfs_migrate_folio(struct address_space *mapping, folio_set_ordered(dst); } -return MIGRATEPAGE_SUCCESS ; +return 0 ; }#else #define btrfs_migrate_folio NULLfs/hugetlbfs/inode.c +2
-2@@ -1052,7 +1052,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,int rc; rc =migrate_huge_page_move_mapping (mapping, dst, src); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (hugetlb_folio_subpool (src)) {@@ -1063,7 +1063,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,folio_migrate_flags (dst, src); - return MIGRATEPAGE_SUCCESS; + return 0; }#else #define hugetlbfs_migrate_folio NULLfs/jfs/jfs_metapage.c +4
-4@@ -169,7 +169,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, } rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;for (i =0 ; i <MPS_PER_PAGE ; i++) {@@ -199,7 +199,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, } } -return MIGRATEPAGE_SUCCESS ; +return 0 ; }#endif /* CONFIG_MIGRATION */ @@ -242,7 +242,7 @@ static int __metapage_migrate_folio(struct address_space *mapping,return -EAGAIN ; rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (unlikely (insert_metapage (dst, mp)))@@ -253,7 +253,7 @@ static int __metapage_migrate_folio(struct address_space *mapping, mp->folio = dst;remove_metapage (src, mp); - return MIGRATEPAGE_SUCCESS; + return 0; }#endif /* CONFIG_MIGRATION */ include/linux/migrate.h +1
-9@@ -12,13 +12,6 @@ typedef void free_folio_t(struct folio *folio, unsigned long private);struct migration_target_control ; -/* -* Return values from addresss_space_operations.migratepage(): -* - negative errno on page migration failure; -* - zero on page migration success; -*/ -#define MIGRATEPAGE_SUCCESS 0 -/** * struct movable_operations - Driver page migration * @isolate_page: @@ -34,8 +27,7 @@ struct migration_target_control;* @src page. The driver should copy the contents of the * @src page to the @dst page and set up the fields of @dst page. * Both pages are locked. -* If page migration is successful, the driver should -* return MIGRATEPAGE_SUCCESS. +* If page migration is successful, the driver should return 0. * If the driver cannot migrate the page at the moment, it can return * -EAGAIN. The VM interprets this as a temporary migration failure and * will retry it later. Any other error value is a permanent migration mm/migrate.c +19
-21@@ -209,18 +209,17 @@ static void putback_movable_ops_page(struct page *page)* 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. +* Returns 0 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 ; +int rc;VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (src), src);VM_WARN_ON_ONCE_PAGE (!PageMovableOpsIsolated (src), src); rc =page_movable_ops (src)->migrate_page (dst, src, mode); -if (rc ==MIGRATEPAGE_SUCCESS ) +if (!rc)ClearPageMovableOpsIsolated (src);return rc; }@@ -565,7 +564,7 @@ static int __folio_migrate_mapping(struct address_space *mapping,if (folio_test_swapbacked (folio))__folio_set_swapbacked (newfolio); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } oldzone =folio_zone (folio);@@ -666,7 +665,7 @@ static int __folio_migrate_mapping(struct address_space *mapping, }local_irq_enable (); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } int folio_migrate_mapping(struct address_space *mapping,@@ -715,7 +714,7 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,xas_unlock_irq (&xas); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }/* @@ -831,14 +830,14 @@ static int __migrate_folio(struct address_space *mapping, struct folio *dst,return rc; rc =__folio_migrate_mapping (mapping, dst, src, expected_count); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc)return rc;if (src_private)folio_attach_private (dst,folio_detach_private (src));folio_migrate_flags (dst, src); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }/** @@ -945,7 +944,7 @@ static int __buffer_migrate_folio(struct address_space *mapping, } rc =filemap_migrate_folio (mapping, dst, src, mode); -if (rc !=MIGRATEPAGE_SUCCESS ) +if (rc) goto unlock_buffers; bh = head;@@ -1049,7 +1048,7 @@ static int fallback_migrate_folio(struct address_space *mapping,* * Return value: * < 0 - error code -* MIGRATEPAGE_SUCCESS - success +* 0 - success */ static int move_to_new_folio (struct folio *dst,struct folio *src,enum migrate_mode mode)@@ -1077,7 +1076,7 @@ static int move_to_new_folio(struct folio *dst, struct folio *src,else rc =fallback_migrate_folio (mapping, dst, src, mode); -if (rc ==MIGRATEPAGE_SUCCESS ) { +if (!rc) {/* * For pagecache folios, src->mapping must be cleared before src * is freed. Anonymous folios must stay anonymous until freed. @@ -1427,7 +1426,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,if (folio_ref_count (src) ==1 ) {/* page was freed from under us. So we are done. */ folio_putback_hugetlb (src); -return MIGRATEPAGE_SUCCESS ; +return 0 ; } dst =get_new_folio (src, private);@@ -1490,8 +1489,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, rc =move_to_new_folio (dst, src, mode);if (page_was_mapped) -remove_migration_ptes (src, - rc ==MIGRATEPAGE_SUCCESS ? dst : src,0 ); +remove_migration_ptes (src, !rc ? dst : src,0 ); unlock_put_anon:folio_unlock (dst);@@ -1500,7 +1498,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio,if (anon_vma)put_anon_vma (anon_vma); -if (rc ==MIGRATEPAGE_SUCCESS ) { +if (!rc) {move_hugetlb_state (src, dst, reason); put_new_folio =NULL ; }@@ -1508,7 +1506,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, out_unlock:folio_unlock (src); out: -if (rc ==MIGRATEPAGE_SUCCESS ) +if (!rc)folio_putback_hugetlb (src);else if (rc != -EAGAIN )list_move_tail (&src->lru, ret);@@ -1618,7 +1616,7 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio, reason, ret_folios);/* * The rules are: -* Success: hugetlb folio will be put back +* 0: hugetlb folio will be put back * -EAGAIN: stay on the from list * -ENOMEM: stay on the from list * Other errno: put on ret_folios list @@ -1635,7 +1633,7 @@ static int migrate_hugetlbs(struct list_head *from, new_folio_t get_new_folio, retry++; nr_retry_pages += nr_pages;break ; -case MIGRATEPAGE_SUCCESS : +case 0 : stats->nr_succeeded += nr_pages;break ;default :@@ -1689,7 +1687,7 @@ static void migrate_folios_move(struct list_head *src_folios, reason, ret_folios);/* * The rules are: -* Success: folio will be freed +* 0: folio will be freed * -EAGAIN: stay on the unmap_folios list * Other errno: put on ret_folios list */ @@ -1699,7 +1697,7 @@ static void migrate_folios_move(struct list_head *src_folios, *thp_retry += is_thp; *nr_retry_pages += nr_pages;break ; -case MIGRATEPAGE_SUCCESS : +case 0 : stats->nr_succeeded += nr_pages; stats->nr_thp_succeeded += is_thp;break ;mm/migrate_device.c +1
-1@@ -778,7 +778,7 @@ static void __migrate_device_pages(unsigned long *src_pfns,if (migrate && migrate->fault_page == page) extra_cnt =1 ; r =folio_migrate_mapping (mapping, newfolio, folio, extra_cnt); -if (r !=MIGRATEPAGE_SUCCESS ) +if (r) src_pfns[i] &= ~MIGRATE_PFN_MIGRATE ;else folio_migrate_flags (newfolio, folio);mm/zsmalloc.c +2
-3@@ -1746,7 +1746,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,* instead. */ if (!zpdesc->zspage) -return MIGRATEPAGE_SUCCESS ; +return 0 ;/* The page is locked, so this pointer must remain valid */ zspage =get_zspage (zpdesc);@@ -1813,7 +1813,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,reset_zpdesc (zpdesc);zpdesc_put (zpdesc); -return MIGRATEPAGE_SUCCESS ; +return 0 ; }static void zs_page_putback (struct page *page) --2.50.1
Hi, David,
Quoted 45 lines · David Hildenbrand
This is against
mm/mm-new.This series gets rid of
MIGRATEPAGE_UNMAP, to then convert the remainingMIGRATEPAGE_SUCCESSusage to simply use 0 instead.Not sure if it makes sense to split the second patch up, a treewide cleanup felt more reasonable for this simple change in an area where I don't expect a lot of churn.
Briefly tested with virtio-mem in a VM, making sure that basic page migration keeps working.
Cc Andrew Morton <[email protected]>Cc Madhavan Srinivasan <[email protected]>Cc Michael Ellerman <[email protected]>Cc Nicholas Piggin <[email protected]>Cc Christophe Leroy <[email protected]>Cc Jerrin Shaji George <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Jason Wang <[email protected]>Cc Xuan Zhuo <[email protected]>Cc "Eugenio Pérez" <[email protected]>Cc Alexander Viro <[email protected]>Cc Christian Brauner <[email protected]>Cc Jan Kara <[email protected]>Cc Benjamin LaHaise <[email protected]>Cc Chris Mason <[email protected]>Cc Josef Bacik <[email protected]>Cc David Sterba <[email protected]>Cc Muchun Song <[email protected]>Cc Oscar Salvador <[email protected]>Cc Dave Kleikamp <[email protected]>Cc Zi Yan <[email protected]>Cc Matthew Brost <[email protected]>Cc Joshua Hahn <[email protected]>Cc Rakie Kim <[email protected]>Cc Byungchul Park <[email protected]>Cc Gregory Price <[email protected]>Cc Ying Huang <[email protected]>Cc Alistair Popple <[email protected]>Cc Minchan Kim <[email protected]>Cc Sergey Senozhatsky <[email protected]>
Quoted 3 lines
David Hildenbrand (2):
mm/migrate: removeMIGRATEPAGE_UNMAP
treewide: removeMIGRATEPAGE_SUCCESS
LGTM. Feel free to add my
for the whole series in the future versions.
Quoted 14 lines
arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 4 +- drivers/virtio/virtio_balloon.c | 2 +- fs/aio.c | 2 +- fs/btrfs/inode.c | 4 +- fs/hugetlbfs/inode.c | 4 +- fs/jfs/jfs_metapage.c | 8 +-- include/linux/migrate.h | 11 +--- mm/migrate.c | 80 ++++++++++++++-------------- mm/migrate_device.c | 2 +- mm/zsmalloc.c | 4 +- 11 files changed, 56 insertions(+), 67 deletions(-)
Quoted 1 line
base-commit:
53c448023185717d0ed56b5546dc2be405da92ff
---
Best Regards,
Huang, Ying