f2fs: convert f2fs_compress_ctx_add_page() to use folio
Chao Yu
maintainerPATCH 1/9 f2fs: convert f2fs_compress_ctx_add_page() to use folio
onvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/compress.c | 14 +++++++------- fs/f2fs/data.c | 4 ++-- fs/f2fs/f2fs.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)
fs/f2fs/compress.c +7 -7
@@ -160,17 +160,17 @@ void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse) cc->cluster_idx =NULL_CLUSTER ; } -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page) +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio) {unsigned int cluster_ofs; -if (!f2fs_cluster_can_merge_page (cc, page->index)) +if (!f2fs_cluster_can_merge_page (cc, folio->index))f2fs_bug_on (F2FS_I_SB (cc->inode),1 ); - cluster_ofs =offset_in_cluster (cc, page->index); - cc->rpages[cluster_ofs] = page; + cluster_ofs =offset_in_cluster (cc, folio->index); + cc->rpages[cluster_ofs] =folio_page (folio,0 ); cc->nr_rpages++; - cc->cluster_idx =cluster_idx (cc, page->index); + cc->cluster_idx =cluster_idx (cc, folio->index); }#ifdef CONFIG_F2FS_FS_LZO
@@ -1093,7 +1093,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,if (PageUptodate (page))f2fs_put_page (page,1 );else -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page)); }if (!f2fs_cluster_is_empty (cc)) {
@@ -1123,7 +1123,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, }f2fs_wait_on_page_writeback (page,DATA , true, true); -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page));if (!PageUptodate (page)) { release_and_retry:
fs/f2fs/data.c +2 -2
@@ -2429,7 +2429,7 @@ static int f2fs_mpage_readpages(struct inode *inode,if (ret) goto set_error_page; -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio); goto next_page; read_single_page:
@@ -3161,7 +3161,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,#ifdef CONFIG_F2FS_FS_COMPRESSION if (f2fs_compressed_file (inode)) {folio_get (folio); -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio);continue ; }#endif
fs/f2fs/f2fs.h +1 -1
@@ -4322,7 +4322,7 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);bool f2fs_all_cluster_page_ready (struct compress_ctx *cc,struct page **pages,int index,int nr_pages,bool uptodate);bool f2fs_sanity_check_cluster (struct dnode_of_data *dn); -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page); +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio); int f2fs_write_multi_pages(struct compress_ctx *cc, int *submitted, struct writeback_control *wbc,
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 2/9 f2fs: convert f2fs_vm_page_mkwrite() to use folio
Convert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/file.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
fs/f2fs/file.c +16 -16
@@ -53,7 +53,7 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)static vm_fault_t f2fs_vm_page_mkwrite (struct vm_fault *vmf) { -struct page *page = vmf->page; +struct folio *folio =page_folio (vmf->page);struct inode *inode =file_inode (vmf->vma->vm_file);struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct dnode_of_data dn;
@@ -85,7 +85,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)#ifdef CONFIG_F2FS_FS_COMPRESSION if (f2fs_compressed_file (inode)) { -int ret =f2fs_is_compressed_cluster (inode, page->index); +int ret =f2fs_is_compressed_cluster (inode, folio->index);if (ret <0 ) { err = ret;
@@ -105,11 +105,11 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)file_update_time (vmf->vma->vm_file);filemap_invalidate_lock_shared (inode->i_mapping); -lock_page (page); -if (unlikely (page->mapping != inode->i_mapping || -page_offset (page) >i_size_read (inode) || - !PageUptodate (page))) { -unlock_page (page); +folio_lock (folio); +if (unlikely (folio->mapping != inode->i_mapping || +folio_pos (folio) >i_size_read (inode) || + !folio_test_uptodate (folio))) { +folio_unlock (folio); err = -EFAULT ; goto out_sem; }
@@ -117,9 +117,9 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)set_new_dnode (&dn, inode,NULL ,NULL ,0 );if (need_alloc) {/* block allocation */ - err =f2fs_get_block_locked (&dn, page->index); + err =f2fs_get_block_locked (&dn, folio->index); }else { - err =f2fs_get_dnode_of_data (&dn, page->index,LOOKUP_NODE ); + err =f2fs_get_dnode_of_data (&dn, folio->index,LOOKUP_NODE );f2fs_put_dnode (&dn);if (f2fs_is_pinned_file (inode) && !__is_valid_data_blkaddr (dn.data_blkaddr))
@@ -127,11 +127,11 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) }if (err) { -unlock_page (page); +folio_unlock (folio); goto out_sem; } -f2fs_wait_on_page_writeback (page,DATA , false, true); +f2fs_wait_on_page_writeback (folio_page (folio,0 ),DATA , false, true);/* wait for GCed page writeback via META_MAPPING */ f2fs_wait_on_block_writeback (inode, dn.data_blkaddr);
@@ -139,18 +139,18 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)/* * check to see if the page is mapped already (no holes) */ -if (PageMappedToDisk (page)) +if (folio_test_mappedtodisk (folio)) goto out_sem;/* page is wholly or partially inside EOF */ -if (((loff_t)(page->index +1 ) <<PAGE_SHIFT ) > +if (((loff_t)(folio->index +1 ) <<PAGE_SHIFT ) >i_size_read (inode)) {loff_t offset; offset =i_size_read (inode) & ~PAGE_MASK ; -zero_user_segment (page, offset,PAGE_SIZE ); +folio_zero_segment (folio, offset,folio_size (folio)); } -set_page_dirty (page); +folio_mark_dirty (folio);f2fs_update_iostat (sbi, inode,APP_MAPPED_IO ,F2FS_BLKSIZE );f2fs_update_time (sbi,REQ_TIME );
@@ -162,7 +162,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) out: ret =vmf_fs_error (err); -trace_f2fs_vm_page_mkwrite (inode, page->index, vmf->vma->vm_flags, ret); +trace_f2fs_vm_page_mkwrite (inode, folio->index, vmf->vma->vm_flags, ret);return ret; }
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 3/9 f2fs: convert f2fs_clear_page_cache_dirty_tag() to use folio
In reply to Chao YuConvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/data.c | 3 +-- fs/f2fs/dir.c | 2 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/inline.c | 2 +- fs/f2fs/node.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-)
fs/f2fs/data.c +1 -2
@@ -4117,9 +4117,8 @@ const struct address_space_operations f2fs_dblock_aops = { .swap_deactivate = f2fs_swap_deactivate, }; -void f2fs_clear_page_cache_dirty_tag (struct page *page) +void f2fs_clear_page_cache_dirty_tag (struct folio *folio) { -struct folio *folio =page_folio (page);struct address_space *mapping = folio->mapping;unsigned long flags;
fs/f2fs/dir.c +1 -1
@@ -868,7 +868,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,if (bit_pos ==NR_DENTRY_IN_BLOCK && !f2fs_truncate_hole (dir, page->index, page->index +1 )) { -f2fs_clear_page_cache_dirty_tag (page); +f2fs_clear_page_cache_dirty_tag (page_folio (page));clear_page_dirty_for_io (page);ClearPageUptodate (page);clear_page_private_all (page);
fs/f2fs/f2fs.h +1 -1
@@ -3890,7 +3890,7 @@ void f2fs_write_failed(struct inode *inode, loff_t to);void f2fs_invalidate_folio (struct folio *folio,size_t offset,size_t length);bool f2fs_release_folio (struct folio *folio,gfp_t wait);bool f2fs_overwrite_io (struct inode *inode,loff_t pos,size_t len); -void f2fs_clear_page_cache_dirty_tag (struct page *page); +void f2fs_clear_page_cache_dirty_tag (struct folio *folio);int f2fs_init_post_read_processing (void );void f2fs_destroy_post_read_processing (void );int f2fs_init_post_read_wq (struct f2fs_sb_info *sbi);
fs/f2fs/inline.c +1 -1
@@ -281,7 +281,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) page, 0, MAX_INLINE_DATA(inode));set_page_dirty (ipage); -f2fs_clear_page_cache_dirty_tag (page); +f2fs_clear_page_cache_dirty_tag (page_folio (page));set_inode_flag (inode,FI_APPEND_WRITE );set_inode_flag (inode,FI_DATA_EXIST );
fs/f2fs/node.c +1 -1
@@ -123,7 +123,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)static void clear_node_page_dirty (struct page *page) {if (PageDirty (page)) { -f2fs_clear_page_cache_dirty_tag (page); +f2fs_clear_page_cache_dirty_tag (page_folio (page));clear_page_dirty_for_io (page);dec_page_count (F2FS_P_SB (page),F2FS_DIRTY_NODES ); }
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 4/9 f2fs: convert f2fs_write_inline_data() to use folio
In reply to Chao YuConvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/data.c | 2 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/inline.c | 10 +++++----- fs/f2fs/node.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
fs/f2fs/data.c +1 -1
@@ -2866,7 +2866,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, err = -EAGAIN ;if (f2fs_has_inline_data (inode)) { - err =f2fs_write_inline_data (inode, page); + err =f2fs_write_inline_data (inode, folio);if (!err) goto out; }
fs/f2fs/f2fs.h +1 -1
@@ -4185,7 +4185,7 @@ int f2fs_read_inline_data(struct inode *inode, struct folio *folio);int f2fs_convert_inline_page (struct dnode_of_data *dn,struct page *page);int f2fs_convert_inline_inode (struct inode *inode);int f2fs_try_convert_inline_dir (struct inode *dir,struct dentry *dentry); -int f2fs_write_inline_data (struct inode *inode,struct page *page); +int f2fs_write_inline_data (struct inode *inode,struct folio *folio);int f2fs_recover_inline_data (struct inode *inode,struct page *npage); struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir, const struct f2fs_filename *fname,
fs/f2fs/inline.c +5 -5
@@ -260,7 +260,7 @@ int f2fs_convert_inline_inode(struct inode *inode)return err; } -int f2fs_write_inline_data (struct inode *inode,struct page *page) +int f2fs_write_inline_data (struct inode *inode,struct folio *folio) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *ipage;
@@ -274,14 +274,14 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)return -EAGAIN ; } -f2fs_bug_on (F2FS_I_SB (inode), page->index); +f2fs_bug_on (F2FS_I_SB (inode), folio->index);f2fs_wait_on_page_writeback (ipage,NODE , true, true); -memcpy_from_page (inline_data_addr (inode, ipage), - page,0 ,MAX_INLINE_DATA (inode)); +memcpy_from_folio (inline_data_addr (inode, ipage), + folio,0 ,MAX_INLINE_DATA (inode));set_page_dirty (ipage); -f2fs_clear_page_cache_dirty_tag (page_folio (page)); +f2fs_clear_page_cache_dirty_tag (folio);set_inode_flag (inode,FI_APPEND_WRITE );set_inode_flag (inode,FI_DATA_EXIST );
fs/f2fs/node.c +1 -1
@@ -1535,7 +1535,7 @@ static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)if (!clear_page_dirty_for_io (page)) goto page_out; - ret =f2fs_write_inline_data (inode, page); + ret =f2fs_write_inline_data (inode,page_folio (page));inode_dec_dirty_pages (inode);f2fs_remove_dirty_inode (inode);if (ret)
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 5/9 f2fs: convert f2fs_write_single_data_page() to use folio
In reply to Chao YuConvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/compress.c | 3 ++- fs/f2fs/data.c | 29 +++++++++++++++-------------- fs/f2fs/f2fs.h | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-)
fs/f2fs/compress.c +2 -1
@@ -1523,7 +1523,8 @@ static int f2fs_write_raw_pages(struct compress_ctx *cc,if (!clear_page_dirty_for_io (cc->rpages[i])) goto continue_unlock; - ret =f2fs_write_single_data_page (cc->rpages[i], &submitted, + ret =f2fs_write_single_data_page (page_folio (cc->rpages[i]), + &submitted,NULL ,NULL , wbc, io_type, compr_blocks, false);if (ret) {
fs/f2fs/data.c +15 -14
@@ -2764,7 +2764,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)return err; } -int f2fs_write_single_data_page(struct page *page, int *submitted, +int f2fs_write_single_data_page(struct folio *folio, int *submitted, struct bio **bio, sector_t *last_block, struct writeback_control *wbc,
@@ -2772,12 +2772,13 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, int compr_blocks, bool allow_balance) { -struct inode *inode = page->mapping->host; +struct inode *inode = folio->mapping->host; +struct page *page =folio_page (folio,0 );struct f2fs_sb_info *sbi =F2FS_I_SB (inode);loff_t i_size =i_size_read (inode);const pgoff_t end_index = ((unsigned long long )i_size) >>PAGE_SHIFT ; -loff_t psize = (loff_t)(page->index +1 ) <<PAGE_SHIFT ; +loff_t psize = (loff_t)(folio->index +1 ) <<PAGE_SHIFT ;unsigned offset =0 ;bool need_balance_fs = false;bool quota_inode =IS_NOQUOTA (inode);
@@ -2801,11 +2802,11 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, .last_block = last_block, }; -trace_f2fs_writepage (page_folio (page),DATA ); +trace_f2fs_writepage (folio,DATA );/* we should bypass data pages to proceed the kworker jobs */ if (unlikely (f2fs_cp_error (sbi))) { -mapping_set_error (page->mapping, -EIO ); +mapping_set_error (folio->mapping, -EIO );/* * don't drop any dirty dentry pages for keeping lastest * directory structure.
@@ -2823,7 +2824,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,if (unlikely (is_sbi_flag_set (sbi,SBI_POR_DOING ))) goto redirty_out; -if (page->index < end_index || +if (folio->index < end_index ||f2fs_verity_in_progress (inode) || compr_blocks) goto write;
@@ -2833,10 +2834,10 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,* this page does not have to be written to disk. */ offset = i_size & (PAGE_SIZE -1 ); -if ((page->index >= end_index +1 ) || !offset) +if ((folio->index >= end_index +1 ) || !offset) goto out; -zero_user_segment (page, offset,PAGE_SIZE ); +folio_zero_segment (folio, offset,folio_size (folio)); write:/* Dentry/quota blocks are controlled by checkpoint */ if (S_ISDIR (inode->i_mode) || quota_inode) {
@@ -2896,7 +2897,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, out:inode_dec_dirty_pages (inode);if (err) { -ClearPageUptodate (page); +folio_clear_uptodate (folio);clear_page_private_gcing (page); }
@@ -2906,7 +2907,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,f2fs_remove_dirty_inode (inode); submitted =NULL ; } -unlock_page (page); +folio_unlock (folio);if (!S_ISDIR (inode->i_mode) && !IS_NOQUOTA (inode) && !F2FS_I (inode)->wb_task && allow_balance)f2fs_balance_fs (sbi, need_balance_fs);
@@ -2924,7 +2925,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,return 0 ; redirty_out: -redirty_page_for_writepage (wbc, page); +folio_redirty_for_writepage (wbc, folio);/* * pageout() in MM translates EAGAIN, so calls handle_write_error() * -> mapping_set_error() -> set_bit(AS_EIO, ...).
@@ -2933,7 +2934,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,*/ if (!err || wbc->for_reclaim)return AOP_WRITEPAGE_ACTIVATE ; -unlock_page (page); +folio_unlock (folio);return err; }
@@ -2955,7 +2956,7 @@ static int f2fs_write_data_page(struct page *page, out:#endif -return f2fs_write_single_data_page (page,NULL ,NULL ,NULL , +return f2fs_write_single_data_page (page_folio (page),NULL ,NULL ,NULL , wbc,FS_DATA_IO ,0 , true); }
@@ -3165,7 +3166,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, continue; }#endif - ret =f2fs_write_single_data_page (&folio->page, + ret =f2fs_write_single_data_page (folio, &submitted, &bio, &last_block, wbc, io_type,0 , true);if (ret ==AOP_WRITEPAGE_ACTIVATE )
fs/f2fs/f2fs.h +1 -1
@@ -3881,7 +3881,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,int f2fs_encrypt_one_page (struct f2fs_io_info *fio);bool f2fs_should_update_inplace (struct inode *inode,struct f2fs_io_info *fio);bool f2fs_should_update_outplace (struct inode *inode,struct f2fs_io_info *fio); -int f2fs_write_single_data_page(struct page *page, int *submitted, +int f2fs_write_single_data_page(struct folio *folio, int *submitted, struct bio **bio, sector_t *last_block, struct writeback_control *wbc, enum iostat_type io_type,
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 6/9 f2fs: convert f2fs_do_write_meta_page() to use folio
In reply to Chao YuConvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/checkpoint.c | 2 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/segment.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-)
fs/f2fs/checkpoint.c +1 -1
@@ -362,7 +362,7 @@ static int __f2fs_write_meta_page(struct page *page,if (wbc->for_reclaim && page->index <GET_SUM_BLOCK (sbi,0 )) goto redirty_out; -f2fs_do_write_meta_page (sbi, page, io_type); +f2fs_do_write_meta_page (sbi,page_folio (page), io_type);dec_page_count (sbi,F2FS_DIRTY_META );if (wbc->for_reclaim)
fs/f2fs/f2fs.h +1 -1
@@ -3732,7 +3732,7 @@ bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,struct page *f2fs_get_sum_page (struct f2fs_sb_info *sbi,unsigned int segno);void f2fs_update_meta_page (struct f2fs_sb_info *sbi,void *src,block_t blk_addr); -void f2fs_do_write_meta_page (struct f2fs_sb_info *sbi,struct page *page, +void f2fs_do_write_meta_page (struct f2fs_sb_info *sbi,struct folio *folio,enum iostat_type io_type);void f2fs_do_write_node_page (unsigned int nid,struct f2fs_io_info *fio); void f2fs_outplace_write_data(struct dnode_of_data *dn,
fs/f2fs/segment.c +7 -7
@@ -3822,7 +3822,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)f2fs_up_read (&fio->sbi->io_order_lock); } -void f2fs_do_write_meta_page (struct f2fs_sb_info *sbi,struct page *page, +void f2fs_do_write_meta_page (struct f2fs_sb_info *sbi,struct folio *folio,enum iostat_type io_type) {struct f2fs_io_info fio = {
@@ -3831,20 +3831,20 @@ void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct page *page, .temp = HOT, .op = REQ_OP_WRITE, .op_flags = REQ_SYNC | REQ_META | REQ_PRIO, - .old_blkaddr = page->index, - .new_blkaddr = page->index, - .page = page, + .old_blkaddr = folio->index, + .new_blkaddr = folio->index, + .page = folio_page(folio, 0), .encrypted_page = NULL, .in_list = 0, }; -if (unlikely (page->index >=MAIN_BLKADDR (sbi))) +if (unlikely (folio->index >=MAIN_BLKADDR (sbi))) fio.op_flags &= ~REQ_META ; -set_page_writeback (page); +folio_start_writeback (folio);f2fs_submit_page_write (&fio); -stat_inc_meta_count (sbi, page->index); +stat_inc_meta_count (sbi, folio->index);f2fs_update_iostat (sbi,NULL , io_type,F2FS_BLKSIZE ); }
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 7/9 f2fs: convert __f2fs_write_meta_page() to use folio
In reply to Chao YuConvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/checkpoint.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
fs/f2fs/checkpoint.c +7 -6
@@ -345,30 +345,31 @@ static int __f2fs_write_meta_page(struct page *page, enum iostat_type io_type) {struct f2fs_sb_info *sbi =F2FS_P_SB (page); +struct folio *folio =page_folio (page); -trace_f2fs_writepage (page_folio (page),META ); +trace_f2fs_writepage (folio,META );if (unlikely (f2fs_cp_error (sbi))) {if (is_sbi_flag_set (sbi,SBI_IS_CLOSE )) { -ClearPageUptodate (page); +folio_clear_uptodate (folio);dec_page_count (sbi,F2FS_DIRTY_META ); -unlock_page (page); +folio_unlock (folio);return 0 ; } goto redirty_out; }if (unlikely (is_sbi_flag_set (sbi,SBI_POR_DOING ))) goto redirty_out; -if (wbc->for_reclaim && page->index <GET_SUM_BLOCK (sbi,0 )) +if (wbc->for_reclaim && folio->index <GET_SUM_BLOCK (sbi,0 )) goto redirty_out; -f2fs_do_write_meta_page (sbi,page_folio (page), io_type); +f2fs_do_write_meta_page (sbi, folio, io_type);dec_page_count (sbi,F2FS_DIRTY_META );if (wbc->for_reclaim)f2fs_submit_merged_write_cond (sbi,NULL , page,0 ,META ); -unlock_page (page); +folio_unlock (folio);if (unlikely (f2fs_cp_error (sbi)))f2fs_submit_merged_write (sbi,META );
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 8/9 f2fs: convert f2fs_read_multi_pages() to use folio
In reply to Chao YuConvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/data.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
fs/f2fs/data.c +16 -12
@@ -2207,19 +2207,22 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,/* get rid of pages beyond EOF */ for (i =0 ; i < cc->cluster_size; i++) {struct page *page = cc->rpages[i]; +struct folio *folio;if (!page)continue ; -if ((sector_t )page->index >= last_block_in_file) { -zero_user_segment (page,0 ,PAGE_SIZE ); -if (!PageUptodate (page)) -SetPageUptodate (page); - }else if (!PageUptodate (page)) { + + folio =page_folio (page); +if ((sector_t )folio->index >= last_block_in_file) { +folio_zero_segment (folio,0 ,folio_size (folio)); +if (!folio_test_uptodate (folio)) +folio_mark_uptodate (folio); + }else if (!folio_test_uptodate (folio)) {continue ; } -unlock_page (page); +folio_unlock (folio);if (for_write) -put_page (page); +folio_put (folio); cc->rpages[i] =NULL ; cc->nr_rpages--; }
@@ -2279,7 +2282,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, }for (i =0 ; i < cc->nr_cpages; i++) { -struct page *page = dic->cpages[i]; +struct folio *folio =page_folio (dic->cpages[i]);block_t blkaddr;struct bio_post_read_ctx *ctx;
@@ -2289,7 +2292,8 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,f2fs_wait_on_block_writeback (inode, blkaddr); -if (f2fs_load_compressed_page (sbi, page, blkaddr)) { +if (f2fs_load_compressed_page (sbi,folio_page (folio,0 ), + blkaddr)) {if (atomic_dec_and_test (&dic->remaining_pages)) {f2fs_decompress_cluster (dic, true);break ;
@@ -2299,7 +2303,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,if (bio && (!page_is_mergeable (sbi, bio, *last_block_in_bio, blkaddr) || - !f2fs_crypt_mergeable_bio (bio, inode, page->index,NULL ))) { + !f2fs_crypt_mergeable_bio (bio, inode, folio->index,NULL ))) { submit_and_realloc:f2fs_submit_read_bio (sbi, bio,DATA ); bio =NULL ;
@@ -2308,7 +2312,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,if (!bio) { bio =f2fs_grab_read_bio (inode, blkaddr, nr_pages,f2fs_ra_op_flags (rac), - page->index, for_write); + folio->index, for_write);if (IS_ERR (bio)) { ret =PTR_ERR (bio);f2fs_decompress_end_io (dic, ret, true);
@@ -2318,7 +2322,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, } } -if (bio_add_page (bio, page, blocksize,0 ) < blocksize) +if (bio_add_folio (bio, folio, blocksize,0 ) < blocksize) goto submit_and_realloc; ctx =get_post_read_ctx (bio);
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 9/9 f2fs: convert f2fs_handle_page_eio() to use folio
In reply to Chao YuConvert to use folio, so that we can get rid of 'page->index' to prepare for removal of 'index' field in structure page [1].
[1] https://lore.kernel.org/all/[email protected]/
--- fs/f2fs/checkpoint.c | 2 +- fs/f2fs/f2fs.h | 6 ++++-- fs/f2fs/node.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)
fs/f2fs/checkpoint.c +1 -1
@@ -99,7 +99,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, }if (unlikely (!PageUptodate (page))) { -f2fs_handle_page_eio (sbi, page->index,META ); +f2fs_handle_page_eio (sbi,page_folio (page),META );f2fs_put_page (page,1 );return ERR_PTR (-EIO ); }
fs/f2fs/f2fs.h +4 -2
@@ -4666,9 +4666,11 @@ static inline void f2fs_io_schedule_timeout(long timeout)io_schedule_timeout (timeout); } -static inline void f2fs_handle_page_eio (struct f2fs_sb_info *sbi,pgoff_t ofs, -enum page_type type) +static inline void f2fs_handle_page_eio (struct f2fs_sb_info *sbi, +struct folio *folio,enum page_type type) { +pgoff_t ofs = folio->index; +if (unlikely (f2fs_cp_error (sbi)))return ;
fs/f2fs/node.c +1 -1
@@ -1492,7 +1492,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, out_put_err:/* ENOENT comes from read_node_page which is not an error. */ if (err != -ENOENT ) -f2fs_handle_page_eio (sbi, page->index,NODE ); +f2fs_handle_page_eio (sbi,page_folio (page),NODE );f2fs_put_page (page,1 );return ERR_PTR (err); }
Signature · 1 line
2.40.1
Jaegeuk Kim
maintainerCould you please test this series? I hit kernel hang along with refcount warning in f2fs_put_dic, when running fsstress. You can reproduce it quickly.
Quoted 95 lines · Chao Yu
onvert to use folio, so that we can get rid of '
page->index' to prepare for removal of 'index' field in structure page [1].[1] https://lore.kernel.org/all/[email protected]/
Cc Matthew Wilcox <[email protected]>Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/compress.c | 14 +++++++------- fs/f2fs/data.c | 4 ++-- fs/f2fs/f2fs.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)fs/f2fs/compress.c +7
-7@@ -160,17 +160,17 @@ void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse) cc->cluster_idx =NULL_CLUSTER ; } -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page) +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio) {unsigned int cluster_ofs; -if (!f2fs_cluster_can_merge_page (cc, page->index)) +if (!f2fs_cluster_can_merge_page (cc, folio->index))f2fs_bug_on (F2FS_I_SB (cc->inode),1 ); - cluster_ofs =offset_in_cluster (cc, page->index); - cc->rpages[cluster_ofs] = page; + cluster_ofs =offset_in_cluster (cc, folio->index); + cc->rpages[cluster_ofs] =folio_page (folio,0 ); cc->nr_rpages++; - cc->cluster_idx =cluster_idx (cc, page->index); + cc->cluster_idx =cluster_idx (cc, folio->index); }#ifdef CONFIG_F2FS_FS_LZO @@ -1093,7 +1093,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,if (PageUptodate (page))f2fs_put_page (page,1 );else -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page)); }if (!f2fs_cluster_is_empty (cc)) {@@ -1123,7 +1123,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, }f2fs_wait_on_page_writeback (page,DATA , true, true); -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page));if (!PageUptodate (page)) { release_and_retry:fs/f2fs/data.c +2
-2@@ -2429,7 +2429,7 @@ static int f2fs_mpage_readpages(struct inode *inode,if (ret) goto set_error_page; -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio); goto next_page; read_single_page:@@ -3161,7 +3161,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,#ifdef CONFIG_F2FS_FS_COMPRESSION if (f2fs_compressed_file (inode)) {folio_get (folio); -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio);continue ; }#endif fs/f2fs/f2fs.h +1
-1@@ -4322,7 +4322,7 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);bool f2fs_all_cluster_page_ready (struct compress_ctx *cc,struct page **pages,int index,int nr_pages,bool uptodate);bool f2fs_sanity_check_cluster (struct dnode_of_data *dn); -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page); +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio); int f2fs_write_multi_pages(struct compress_ctx *cc, int *submitted, struct writeback_control *wbc,Signature · 1 line
2.40.1
Chao Yu
maintainerQuoted 1 line · Jaegeuk Kim
Could you please test this series? I hit kernel hang along with refcount warning
Oops, I've did fstest before sending this patchset, however I missed to cover w/ compression testcase..., so, too rush to push the patchset, sorry.
Will check and fix it soon.
Thanks,
Quoted 98 lines
in
f2fs_put_dic, when running fsstress. You can reproduce it quickly.Quoted 95 lines · Chao Yu
onvert to use folio, so that we can get rid of '
page->index' to prepare for removal of 'index' field in structure page [1].[1] https://lore.kernel.org/all/[email protected]/
Cc Matthew Wilcox <[email protected]>Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/compress.c | 14 +++++++------- fs/f2fs/data.c | 4 ++-- fs/f2fs/f2fs.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)fs/f2fs/compress.c +7
-7@@ -160,17 +160,17 @@ void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse) cc->cluster_idx =NULL_CLUSTER ; } -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page) +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio) {unsigned int cluster_ofs; -if (!f2fs_cluster_can_merge_page (cc, page->index)) +if (!f2fs_cluster_can_merge_page (cc, folio->index))f2fs_bug_on (F2FS_I_SB (cc->inode),1 ); - cluster_ofs =offset_in_cluster (cc, page->index); - cc->rpages[cluster_ofs] = page; + cluster_ofs =offset_in_cluster (cc, folio->index); + cc->rpages[cluster_ofs] =folio_page (folio,0 ); cc->nr_rpages++; - cc->cluster_idx =cluster_idx (cc, page->index); + cc->cluster_idx =cluster_idx (cc, folio->index); }#ifdef CONFIG_F2FS_FS_LZO @@ -1093,7 +1093,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,if (PageUptodate (page))f2fs_put_page (page,1 );else -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page)); }if (!f2fs_cluster_is_empty (cc)) {@@ -1123,7 +1123,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, }f2fs_wait_on_page_writeback (page,DATA , true, true); -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page));if (!PageUptodate (page)) { release_and_retry:fs/f2fs/data.c +2
-2@@ -2429,7 +2429,7 @@ static int f2fs_mpage_readpages(struct inode *inode,if (ret) goto set_error_page; -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio); goto next_page; read_single_page:@@ -3161,7 +3161,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,#ifdef CONFIG_F2FS_FS_COMPRESSION if (f2fs_compressed_file (inode)) {folio_get (folio); -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio);continue ; }#endif fs/f2fs/f2fs.h +1
-1@@ -4322,7 +4322,7 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);bool f2fs_all_cluster_page_ready (struct compress_ctx *cc,struct page **pages,int index,int nr_pages,bool uptodate);bool f2fs_sanity_check_cluster (struct dnode_of_data *dn); -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page); +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio); int f2fs_write_multi_pages(struct compress_ctx *cc, int *submitted, struct writeback_control *wbc,Signature · 1 line
2.40.1
Chao Yu
maintainerQuoted 2 lines · Jaegeuk Kim
Could you please test this series? I hit kernel hang along with refcount warning in
f2fs_put_dic, when running fsstress. You can reproduce it quickly.
--- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/data.c +1 -1
@@ -2322,7 +2322,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, } } -if (bio_add_folio (bio, folio, blocksize,0 ) < blocksize) +if (!bio_add_folio (bio, folio, blocksize,0 )) goto submit_and_realloc; ctx =get_post_read_ctx (bio);
Signature · 5 lines
2.40.1 After applying this, it doesn't complain now. Thanks,
Quoted 97 lines · Chao Yu
Quoted 95 lines
onvert to use folio, so that we can get rid of '
page->index' to prepare for removal of 'index' field in structure page [1].[1] https://lore.kernel.org/all/[email protected]/
Cc Matthew Wilcox <[email protected]>Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/compress.c | 14 +++++++------- fs/f2fs/data.c | 4 ++-- fs/f2fs/f2fs.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)fs/f2fs/compress.c +7
-7@@ -160,17 +160,17 @@ void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse) cc->cluster_idx =NULL_CLUSTER ; } -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page) +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio) {unsigned int cluster_ofs; -if (!f2fs_cluster_can_merge_page (cc, page->index)) +if (!f2fs_cluster_can_merge_page (cc, folio->index))f2fs_bug_on (F2FS_I_SB (cc->inode),1 ); - cluster_ofs =offset_in_cluster (cc, page->index); - cc->rpages[cluster_ofs] = page; + cluster_ofs =offset_in_cluster (cc, folio->index); + cc->rpages[cluster_ofs] =folio_page (folio,0 ); cc->nr_rpages++; - cc->cluster_idx =cluster_idx (cc, page->index); + cc->cluster_idx =cluster_idx (cc, folio->index); }#ifdef CONFIG_F2FS_FS_LZO @@ -1093,7 +1093,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,if (PageUptodate (page))f2fs_put_page (page,1 );else -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page)); }if (!f2fs_cluster_is_empty (cc)) {@@ -1123,7 +1123,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc, }f2fs_wait_on_page_writeback (page,DATA , true, true); -f2fs_compress_ctx_add_page (cc, page); +f2fs_compress_ctx_add_page (cc,page_folio (page));if (!PageUptodate (page)) { release_and_retry:fs/f2fs/data.c +2
-2@@ -2429,7 +2429,7 @@ static int f2fs_mpage_readpages(struct inode *inode,if (ret) goto set_error_page; -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio); goto next_page; read_single_page:@@ -3161,7 +3161,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,#ifdef CONFIG_F2FS_FS_COMPRESSION if (f2fs_compressed_file (inode)) {folio_get (folio); -f2fs_compress_ctx_add_page (&cc, &folio->page); +f2fs_compress_ctx_add_page (&cc, folio);continue ; }#endif fs/f2fs/f2fs.h +1
-1@@ -4322,7 +4322,7 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);bool f2fs_all_cluster_page_ready (struct compress_ctx *cc,struct page **pages,int index,int nr_pages,bool uptodate);bool f2fs_sanity_check_cluster (struct dnode_of_data *dn); -void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct page *page); +void f2fs_compress_ctx_add_page (struct compress_ctx *cc,struct folio *folio); int f2fs_write_multi_pages(struct compress_ctx *cc, int *submitted, struct writeback_control *wbc,Signature · 1 line
2.40.1
This series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 9 lines · On Tue, 13 Aug 2024 22:13:23 +0800 you wrote:
onvert to use folio, so that we can get rid of '
page->index' to prepare for removal of 'index' field in structure page [1].[1] https://lore.kernel.org/all/[email protected]/
Cc Matthew Wilcox <[email protected]>Signed-off-by Chao Yu <[email protected]>[...]
Here is the summary with links:
- [f2fs-dev,1/9] f2fs: convert f2fs_compress_ctx_add_page() to use folio
https://git.kernel.org/jaegeuk/f2fs/c/2cbbc4f94317 - [f2fs-dev,2/9] f2fs: convert f2fs_vm_page_mkwrite() to use folio https://git.kernel.org/jaegeuk/f2fs/c/8ed263450530 - [f2fs-dev,3/9] f2fs: convert f2fs_clear_page_cache_dirty_tag() to use folio https://git.kernel.org/jaegeuk/f2fs/c/71aa6bbfc247 - [f2fs-dev,4/9] f2fs: convert f2fs_write_inline_data() to use folio https://git.kernel.org/jaegeuk/f2fs/c/333ad04822f5 - [f2fs-dev,5/9] f2fs: convert f2fs_write_single_data_page() to use folio https://git.kernel.org/jaegeuk/f2fs/c/65826f2732fa - [f2fs-dev,6/9] f2fs: convert f2fs_do_write_meta_page() to use folio https://git.kernel.org/jaegeuk/f2fs/c/9f9bbd634792 - [f2fs-dev,7/9] f2fs: convert __f2fs_write_meta_page() to use folio https://git.kernel.org/jaegeuk/f2fs/c/1b9eb6539810 - [f2fs-dev,8/9] f2fs: convert f2fs_read_multi_pages() to use folio (no matching commit) - [f2fs-dev,9/9] f2fs: convert f2fs_handle_page_eio() to use folio https://git.kernel.org/jaegeuk/f2fs/c/6d899d7e3999
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html