f2fs: dump more information for f2fs_{enable,disable}_checkpoint()

[ Upstream commit 80b6d1d2535a343e43d658777a46f1ebce8f3413 ]

Changes as below:
- print more logs for f2fs_{enable,disable}_checkpoint()
- account and dump time stats for f2fs_enable_checkpoint()

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: be112e7449a6 ("f2fs: fix to propagate error from f2fs_enable_checkpoint()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 5b98277f1259f5652dbc81b6f0768b572b4b52d6..f103d979a65a41a58caaf18cec3d4240cdfd3b4e 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2278,15 +2278,24 @@ out_unlock:
 restore_flag:
        sbi->gc_mode = gc_mode;
        sbi->sb->s_flags = s_flags;     /* Restore SB_RDONLY status */
+       f2fs_info(sbi, "f2fs_disable_checkpoint() finish, err:%d", err);
        return err;
 }
 
 static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
 {
        unsigned int nr_pages = get_pages(sbi, F2FS_DIRTY_DATA) / 16;
+       long long start, writeback, end;
+
+       f2fs_info(sbi, "f2fs_enable_checkpoint() starts, meta: %lld, node: %lld, data: %lld",
+                                       get_pages(sbi, F2FS_DIRTY_META),
+                                       get_pages(sbi, F2FS_DIRTY_NODES),
+                                       get_pages(sbi, F2FS_DIRTY_DATA));
 
        f2fs_update_time(sbi, ENABLE_TIME);
 
+       start = ktime_get();
+
        /* we should flush all the data to keep data consistency */
        while (get_pages(sbi, F2FS_DIRTY_DATA)) {
                writeback_inodes_sb_nr(sbi->sb, nr_pages, WB_REASON_SYNC);
@@ -2295,6 +2304,7 @@ static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
                if (f2fs_time_over(sbi, ENABLE_TIME))
                        break;
        }
+       writeback = ktime_get();
 
        sync_inodes_sb(sbi->sb);
 
@@ -2313,6 +2323,12 @@ static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
 
        /* Let's ensure there's no pending checkpoint anymore */
        f2fs_flush_ckpt_thread(sbi);
+
+       end = ktime_get();
+
+       f2fs_info(sbi, "f2fs_enable_checkpoint() finishes, writeback:%llu, sync:%llu",
+                                       ktime_ms_delta(writeback, start),
+                                       ktime_ms_delta(end, writeback));
 }
 
 static int f2fs_remount(struct super_block *sb, int *flags, char *data)