jfs-implement-migrate_folio-for-jfs_metapage_aops.patch removed from -mm tree
The quilt patch titled
Subject: jfs: implement migrate_folio for jfs_metapage_aops
has been removed from the -mm tree. Its filename was
jfs-implement-migrate_folio-for-jfs_metapage_aops.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: Shivank Garg <[email protected]>
Subject: jfs: implement migrate_folio for jfs_metapage_aops
Date: Wed, 30 Apr 2025 10:01:52 +0000
Add the missing migrate_folio operation to jfs_metapage_aops to fix warnings during memory compaction. These warnings were introduced by commit 7ee3647243e5 ("migrate: Remove call to ->writepage") which added explicit warnings when filesystems don't implement migrate_folio.
System reports following warnings:
jfs_metapage_aops does not implement migrate_folio
WARNING: CPU: 0 PID: 6870 at mm/migrate.c:955 fallback_migrate_folio mm/migrate.c:953 [inline] WARNING: CPU: 0 PID: 6870 at mm/migrate.c:955 move_to_new_folio+0x70e/0x840 mm/migrate.c:1007
Implement metapage_migrate_folio() which handles both single and multiple metapages per page configurations.
---
fs/jfs/jfs_metapage.c | 106 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)
fs/jfs/jfs_metapage.c renamed from fs/jfs/jfs_metapage.c~jfs-implement-migrate_folio-for-jfs_metapage_aops +106 -0
@@ -15,6 +15,7 @@#include <linux/mempool.h> #include <linux/seq_file.h> #include <linux/writeback.h> +#include <linux/migrate.h> #include "jfs_incore.h" #include "jfs_superblock.h" #include "jfs_filsys.h"
@@ -151,7 +152,59 @@ static inline void dec_io(struct folio *handler (folio, anchor->status); } +#ifdef CONFIG_MIGRATION +static int __metapage_migrate_folio (struct address_space *mapping, +struct folio *dst,struct folio *src, +enum migrate_mode mode) +{ +struct meta_anchor *src_anchor = src->private; +struct metapage *mps[MPS_PER_PAGE ] = {0 }; +struct metapage *mp; +int i, rc; + +for (i =0 ; i <MPS_PER_PAGE ; i++) { + mp = src_anchor->mp[i]; +if (mp &&metapage_locked (mp)) +return -EAGAIN ; + } + + rc =filemap_migrate_folio (mapping, dst, src, mode); +if (rc !=MIGRATEPAGE_SUCCESS ) +return rc; + +for (i =0 ; i <MPS_PER_PAGE ; i++) { + mp = src_anchor->mp[i]; +if (!mp) +continue ; +if (unlikely (insert_metapage (dst, mp))) { +/* If error, roll-back previosly inserted pages */ +for (int j =0 ; j < i; j++) { +if (mps[j]) +remove_metapage (dst, mps[j]); + } +return -EAGAIN ; + } + mps[i] = mp; + } + +/* Update the metapage and remove it from src */ +for (i =0 ; i <MPS_PER_PAGE ; i++) { + mp = mps[i]; +if (mp) { +int page_offset = mp->data -folio_address (src); + + mp->data =folio_address (dst) + page_offset; + mp->folio = dst; +remove_metapage (src, mp); + } + } + +return MIGRATEPAGE_SUCCESS ; +} +#endif /* CONFIG_MIGRATION */ +#else +static inline struct metapage *folio_to_mp (struct folio *folio,int offset) {return folio->private;
@@ -175,6 +228,35 @@ static inline void remove_metapage(struc#define inc_io (folio) do {} while(0)#define dec_io (folio, status, handler) handler(folio, status) +#ifdef CONFIG_MIGRATION +static int __metapage_migrate_folio (struct address_space *mapping, +struct folio *dst,struct folio *src, +enum migrate_mode mode) +{ +struct metapage *mp; +int page_offset; +int rc; + + mp =folio_to_mp (src,0 ); +if (metapage_locked (mp)) +return -EAGAIN ; + + rc =filemap_migrate_folio (mapping, dst, src, mode); +if (rc !=MIGRATEPAGE_SUCCESS ) +return rc; + +if (unlikely (insert_metapage (dst, mp))) +return -EAGAIN ; + + page_offset = mp->data -folio_address (src); + mp->data =folio_address (dst) + page_offset; + mp->folio = dst; +remove_metapage (src, mp); + +return MIGRATEPAGE_SUCCESS ; +} +#endif /* CONFIG_MIGRATION */ +#endif static inline struct metapage *alloc_metapage (gfp_t gfp_mask)
@@ -554,6 +636,29 @@ static bool metapage_release_folio(strucreturn ret; } +#ifdef CONFIG_MIGRATION +/* +* metapage_migrate_folio - Migration function for JFS metapages +*/ +static int metapage_migrate_folio (struct address_space *mapping, +struct folio *dst,struct folio *src, +enum migrate_mode mode) +{ +int expected_count; + +if (!src->private) +return filemap_migrate_folio (mapping, dst, src, mode); + +/* Check whether page does not have extra refs before we do more work */ + expected_count =folio_expected_ref_count (src) +1 ; +if (folio_ref_count (src) != expected_count) +return -EAGAIN ; +return __metapage_migrate_folio (mapping, dst, src, mode); +} +#else +#define metapage_migrate_folio NULL +#endif /* CONFIG_MIGRATION */ +static void metapage_invalidate_folio (struct folio *folio,size_t offset,size_t length) {
@@ -570,6 +675,7 @@ const struct address_space_operations jf .release_folio = metapage_release_folio, .invalidate_folio = metapage_invalidate_folio, .dirty_folio = filemap_dirty_folio, + .migrate_folio = metapage_migrate_folio, }; struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
_
Patches currently in -mm which might be from [email protected] are