f2fs: fix to reorder set_page_dirty and wait_on_page_writeback
PATCH 1/3 f2fs: fix to reorder set_page_dirty and wait_on_page_writeback
This patch reorders flow from
- update page
- set_page_dirty
- wait_on_page_writeback
to
- wait_on_page_writeback
- update page
- set_page_dirty
The reason is:
- set_page_dirty will increase reference of dirty page, the reference should be cleared before wait_on_page_writeback to keep its consistency.
- some devices need stable page during page writebacking, so we should not change page's data.
--- fs/f2fs/checkpoint.c | 7 ++++--- fs/f2fs/gc.c | 5 +++-- fs/f2fs/node.c | 5 +++-- fs/f2fs/segment.c | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-)
fs/f2fs/checkpoint.c +4 -3
@@ -1290,11 +1290,12 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,struct page *page =f2fs_grab_meta_page (sbi, blk_addr);int err; -memcpy (page_address (page), src,PAGE_SIZE ); -set_page_dirty (page); -f2fs_wait_on_page_writeback (page,META , true);f2fs_bug_on (sbi,PageWriteback (page)); + +memcpy (page_address (page), src,PAGE_SIZE ); + +set_page_dirty (page);if (unlikely (!clear_page_dirty_for_io (page)))f2fs_bug_on (sbi,1 );
fs/f2fs/gc.c +3 -2
@@ -829,8 +829,8 @@ static int move_data_block(struct inode *inode, block_t bidx, } write_page: -set_page_dirty (fio.encrypted_page);f2fs_wait_on_page_writeback (fio.encrypted_page,DATA , true); +set_page_dirty (fio.encrypted_page);if (clear_page_dirty_for_io (fio.encrypted_page))dec_page_count (fio.sbi,F2FS_DIRTY_META );
@@ -924,8 +924,9 @@ static int move_data_page(struct inode *inode, block_t bidx, int gc_type,bool is_dirty =PageDirty (page); retry: -set_page_dirty (page);f2fs_wait_on_page_writeback (page,DATA , true); + +set_page_dirty (page);if (clear_page_dirty_for_io (page)) {inode_dec_dirty_pages (inode);f2fs_remove_dirty_inode (inode);
fs/f2fs/node.c +3 -2
@@ -1598,10 +1598,11 @@ int f2fs_move_node_page(struct page *node_page, int gc_type) .for_reclaim = 0, }; -set_page_dirty (node_page);f2fs_wait_on_page_writeback (node_page,NODE , true); -f2fs_bug_on (F2FS_P_SB (node_page),PageWriteback (node_page)); + +set_page_dirty (node_page); +if (!clear_page_dirty_for_io (node_page)) { err = -EAGAIN ; goto out_page;
fs/f2fs/segment.c +2 -1
@@ -387,8 +387,9 @@ static int __f2fs_commit_inmem_pages(struct inode *inode)if (page->mapping == inode->i_mapping) {trace_f2fs_commit_inmem_page (page,INMEM ); -set_page_dirty (page);f2fs_wait_on_page_writeback (page,DATA , true); + +set_page_dirty (page);if (clear_page_dirty_for_io (page)) {inode_dec_dirty_pages (inode);f2fs_remove_dirty_inode (inode);
Signature · 1 line
2.18.0.rc1
PATCH 2/3 f2fs: check PageWriteback flag for ordered case
For all ordered cases in f2fs_wait_on_page_writeback(), we need to check PageWriteback status, so let's clean up to relocate the check into f2fs_wait_on_page_writeback().
--- fs/f2fs/checkpoint.c | 1 - fs/f2fs/node.c | 3 --- fs/f2fs/segment.c | 6 ++++-- 3 files changed, 4 insertions(+), 6 deletions(-)
fs/f2fs/checkpoint.c +0 -1
@@ -1291,7 +1291,6 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,int err;f2fs_wait_on_page_writeback (page,META , true); -f2fs_bug_on (sbi,PageWriteback (page));memcpy (page_address (page), src,PAGE_SIZE );
fs/f2fs/node.c +0 -3
@@ -1599,7 +1599,6 @@ int f2fs_move_node_page(struct page *node_page, int gc_type) };f2fs_wait_on_page_writeback (node_page,NODE , true); -f2fs_bug_on (F2FS_P_SB (node_page),PageWriteback (node_page));set_page_dirty (node_page);
@@ -1691,7 +1690,6 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, }f2fs_wait_on_page_writeback (page,NODE , true); -BUG_ON (PageWriteback (page));set_fsync_mark (page,0 );set_dentry_mark (page,0 );
@@ -1825,7 +1823,6 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi,f2fs_wait_on_page_writeback (page,NODE , true); -BUG_ON (PageWriteback (page));if (!clear_page_dirty_for_io (page)) goto continue_unlock;
fs/f2fs/segment.c +4 -2
@@ -3281,10 +3281,12 @@ void f2fs_wait_on_page_writeback(struct page *page,struct f2fs_sb_info *sbi =F2FS_P_SB (page);f2fs_submit_merged_write_cond (sbi,NULL , page,0 , type); -if (ordered) +if (ordered) {wait_on_page_writeback (page); -else +f2fs_bug_on (sbi,PageWriteback (page)); + }else {wait_for_stable_page (page); + } } }
Signature · 1 line
2.18.0.rc1
PATCH 3/3 f2fs: clean up checkpoint flow
In reply to Chao YuThis patch cleans up checkpoint flow a bit:
- remove unneeded circulation of flushing meta pages.
- don't flush nat_bits pages in prior to other checkpoint pages.
- add bug_on to check remained meta pages after flushing.
--- fs/f2fs/checkpoint.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
fs/f2fs/checkpoint.c +5 -13
@@ -1328,11 +1328,9 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)int err;/* Flush all the NAT/SIT pages */ -while (get_pages (sbi,F2FS_DIRTY_META )) { -f2fs_sync_meta_pages (sbi,META ,LONG_MAX ,FS_CP_META_IO ); -if (unlikely (f2fs_cp_error (sbi))) -break ; - } +f2fs_sync_meta_pages (sbi,META ,LONG_MAX ,FS_CP_META_IO ); +f2fs_bug_on (sbi,get_pages (sbi,F2FS_DIRTY_META ) && + !f2fs_cp_error (sbi));/* * modify checkpoint
@@ -1405,14 +1403,6 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)for (i =0 ; i < nm_i->nat_bits_blocks; i++)f2fs_update_meta_page (sbi, nm_i->nat_bits + (i <<F2FS_BLKSIZE_BITS ), blk + i); - -/* Flush all the NAT BITS pages */ -while (get_pages (sbi,F2FS_DIRTY_META )) { -f2fs_sync_meta_pages (sbi,META ,LONG_MAX , -FS_CP_META_IO ); -if (unlikely (f2fs_cp_error (sbi))) -break ; - } }/* write out checkpoint buffer at block 0 */
@@ -1448,6 +1438,8 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)/* Here, we have one bio having CP pack except cp pack 2 page */ f2fs_sync_meta_pages (sbi,META ,LONG_MAX ,FS_CP_META_IO ); +f2fs_bug_on (sbi,get_pages (sbi,F2FS_DIRTY_META ) && + !f2fs_cp_error (sbi));/* wait for previous submitted meta pages writeback */ f2fs_wait_on_all_pages_writeback (sbi);
Signature · 1 line
2.18.0.rc1