f2fs: flush cp pack except cp pack 2 page at first

Previously, we attempt to flush the whole cp pack in a single bio,
however, when suddenly powering off at this time, we could get into
an extreme scenario that cp pack 1 page and cp pack 2 page are updated
and latest, but payload or current summaries are still partially
outdated. (see reliable write in the UFS specification)

This patch submits the whole cp pack except cp pack 2 page at first,
and then writes the cp pack 2 page with an extra independent
bio with pre-io barrier.

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index e3bf753a47be3c47efe39bc1cffd42126345e85a..5b2db75ecd5455626ba4754a1781953365cd0f9c 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -1168,6 +1168,39 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc)
        spin_unlock_irqrestore(&sbi->cp_lock, flags);
 }
 
+static void commit_checkpoint(struct f2fs_sb_info *sbi,
+       void *src, block_t blk_addr)
+{
+       struct writeback_control wbc = {
+               .for_reclaim = 0,
+       };
+
+       /*
+        * pagevec_lookup_tag and lock_page again will take
+        * some extra time. Therefore, update_meta_pages and
+        * sync_meta_pages are combined in this function.
+        */
+       struct page *page = 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));
+       if (unlikely(!clear_page_dirty_for_io(page)))
+               f2fs_bug_on(sbi, 1);
+
+       /* writeout cp pack 2 page */
+       err = __f2fs_write_meta_page(page, &wbc, FS_CP_META_IO);
+       f2fs_bug_on(sbi, err);
+
+       f2fs_put_page(page, 0);
+
+       /* submit checkpoint (with barrier if NOBARRIER is not set) */
+       f2fs_submit_merged_write(sbi, META_FLUSH);
+}
+
 static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 {
        struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
@@ -1270,16 +1303,6 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                }
        }
 
-       /* need to wait for end_io results */
-       wait_on_all_pages_writeback(sbi);
-       if (unlikely(f2fs_cp_error(sbi)))
-               return -EIO;
-
-       /* flush all device cache */
-       err = f2fs_flush_device_cache(sbi);
-       if (err)
-               return err;
-
        /* write out checkpoint buffer at block 0 */
        update_meta_page(sbi, ckpt, start_blk++);
 
@@ -1307,26 +1330,26 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                start_blk += NR_CURSEG_NODE_TYPE;
        }
 
-       /* writeout checkpoint block */
-       update_meta_page(sbi, ckpt, start_blk);
+       /* update user_block_counts */
+       sbi->last_valid_block_count = sbi->total_valid_block_count;
+       percpu_counter_set(&sbi->alloc_valid_block_count, 0);
 
-       /* wait for previous submitted node/meta pages writeback */
+       /* Here, we have one bio having CP pack except cp pack 2 page */
+       sync_meta_pages(sbi, META, LONG_MAX, FS_CP_META_IO);
+
+       /* wait for previous submitted meta pages writeback */
        wait_on_all_pages_writeback(sbi);
 
        if (unlikely(f2fs_cp_error(sbi)))
                return -EIO;
 
-       filemap_fdatawait_range(NODE_MAPPING(sbi), 0, LLONG_MAX);
-       filemap_fdatawait_range(META_MAPPING(sbi), 0, LLONG_MAX);
-
-       /* update user_block_counts */
-       sbi->last_valid_block_count = sbi->total_valid_block_count;
-       percpu_counter_set(&sbi->alloc_valid_block_count, 0);
-
-       /* Here, we only have one bio having CP pack */
-       sync_meta_pages(sbi, META_FLUSH, LONG_MAX, FS_CP_META_IO);
+       /* flush all device cache */
+       err = f2fs_flush_device_cache(sbi);
+       if (err)
+               return err;
 
-       /* wait for previous submitted meta pages writeback */
+       /* barrier and flush checkpoint cp pack 2 page if it can */
+       commit_checkpoint(sbi, ckpt, start_blk);
        wait_on_all_pages_writeback(sbi);
 
        release_ino_entry(sbi, false);