f2fs: attach/detach private value in pair
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: attach/detach private value in pair
set_page_private_# increases a refcount after attaching page->private, and clear_page_private_# decreases it.
But, f2fs_release_folio and f2fs_invalidate_folio call folio_detach_private() which decreases the refcount again, which corrupts the page cache.
Cc <[email protected]>
Fixes b763f3bedc2d ("f2fs: restructure f2fs page.private layout")
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/compress.c | 4 ++-- fs/f2fs/data.c | 6 ++++-- fs/f2fs/f2fs.h | 48 ++++++++++++++++------------------------------ 3 files changed, 22 insertions(+), 36 deletions(-)
fs/f2fs/compress.c +2 -2
@@ -1854,7 +1854,7 @@ void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi, struct page *page,return ; } -set_page_private_data (cpage, ino); +set_page_private_ino (cpage, ino);if (!f2fs_is_valid_blkaddr (sbi, blkaddr,DATA_GENERIC_ENHANCE_READ )) goto out;
@@ -1917,7 +1917,7 @@ void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino)continue ; } -if (ino !=get_page_private_data (&folio->page)) { +if (ino !=get_page_private_ino (&folio->page)) {folio_unlock (folio);continue ; }
fs/f2fs/data.c +4 -2
@@ -3724,8 +3724,9 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)if (test_opt (sbi,COMPRESS_CACHE ) && inode->i_ino ==F2FS_COMPRESS_INO (sbi)) -clear_page_private_data (&folio->page); +clear_page_private_ino (&folio->page); +WARN_ON_ONCE (page_private (&folio->page));folio_detach_private (folio); }
@@ -3742,12 +3743,13 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)struct inode *inode = folio->mapping->host;if (inode->i_ino ==F2FS_COMPRESS_INO (sbi)) -clear_page_private_data (&folio->page); +clear_page_private_ino (&folio->page); }clear_page_private_reference (&folio->page);clear_page_private_gcing (&folio->page); +WARN_ON_ONCE (page_private (&folio->page));folio_detach_private (folio);return true; }
fs/f2fs/f2fs.h +16 -32
95 lines not on this page · raw message
Signature · 8 lines
2.40.0.348.gf938b09366-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerset_page_private_# increases a refcount after attaching page->private, and clear_page_private_# decreases it.
But, f2fs_release_folio and f2fs_invalidate_folio call folio_detach_private() which decreases the refcount again, which corrupts the page cache.
Cc <[email protected]>
Fixes b763f3bedc2d ("f2fs: restructure f2fs page.private layout")
Signed-off-by Jaegeuk Kim <[email protected]>
---
Change log from v1:
- update comment
- remove unnecessary zeroing bits in invalidate/release page
fs/f2fs/compress.c | 4 ++-- fs/f2fs/data.c | 21 ------------------- fs/f2fs/f2fs.h | 50 ++++++++++++++++------------------------------ 3 files changed, 19 insertions(+), 56 deletions(-)
fs/f2fs/compress.c +2 -2
@@ -1854,7 +1854,7 @@ void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi, struct page *page,return ; } -set_page_private_data (cpage, ino); +set_page_private_ino (cpage, ino);if (!f2fs_is_valid_blkaddr (sbi, blkaddr,DATA_GENERIC_ENHANCE_READ )) goto out;
@@ -1917,7 +1917,7 @@ void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino)continue ; } -if (ino !=get_page_private_data (&folio->page)) { +if (ino !=get_page_private_ino (&folio->page)) {folio_unlock (folio);continue ; }
fs/f2fs/data.c +0 -21
@@ -3722,36 +3722,15 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)f2fs_remove_dirty_inode (inode); } } - -clear_page_private_reference (&folio->page); -clear_page_private_gcing (&folio->page); - -if (test_opt (sbi,COMPRESS_CACHE ) && - inode->i_ino ==F2FS_COMPRESS_INO (sbi)) -clear_page_private_data (&folio->page); -folio_detach_private (folio); }bool f2fs_release_folio (struct folio *folio,gfp_t wait) { -struct f2fs_sb_info *sbi; -/* If this is dirty folio, keep private data */ if (folio_test_dirty (folio))return false; - sbi =F2FS_M_SB (folio->mapping); -if (test_opt (sbi,COMPRESS_CACHE )) { -struct inode *inode = folio->mapping->host; - -if (inode->i_ino ==F2FS_COMPRESS_INO (sbi)) -clear_page_private_data (&folio->page); - } - -clear_page_private_reference (&folio->page); -clear_page_private_gcing (&folio->page); -folio_detach_private (folio);return true; }
fs/f2fs/f2fs.h +17 -33
103 lines not on this page · raw message
Signature · 1 line
2.40.0.577.gac1e443424-goog