f2fs: add timeout in f2fs_enable_checkpoint()

[ Upstream commit 4bc347779698b5e67e1514bab105c2c083e55502 ]

During f2fs_enable_checkpoint() in remount(), if we flush a large
amount of dirty pages into slow device, it may take long time which
will block write IO, let's add a timeout machanism during dirty
pages flush to avoid long time block in 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/f2fs.h b/fs/f2fs/f2fs.h
index 6023fb557f1305163f3a6b5f40fd659c50735bb8..998ac993543e52711a753b9e75103c568ca591f4 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -249,6 +249,7 @@ enum {
 #define DEF_CP_INTERVAL                        60      /* 60 secs */
 #define DEF_IDLE_INTERVAL              5       /* 5 secs */
 #define DEF_DISABLE_INTERVAL           5       /* 5 secs */
+#define DEF_ENABLE_INTERVAL            16      /* 16 secs */
 #define DEF_DISABLE_QUICK_INTERVAL     1       /* 1 secs */
 #define DEF_UMOUNT_DISCARD_TIMEOUT     5       /* 5 secs */
 
@@ -1351,6 +1352,7 @@ enum {
        DISCARD_TIME,
        GC_TIME,
        DISABLE_TIME,
+       ENABLE_TIME,
        UMOUNT_DISCARD_TIMEOUT,
        MAX_TIME,
 };

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 1ead438735b019b4c92d31a7ade2853131f79978..5b98277f1259f5652dbc81b6f0768b572b4b52d6 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2283,16 +2283,24 @@ restore_flag:
 
 static void f2fs_enable_checkpoint(struct f2fs_sb_info *sbi)
 {
-       int retry = DEFAULT_RETRY_IO_COUNT;
+       unsigned int nr_pages = get_pages(sbi, F2FS_DIRTY_DATA) / 16;
+
+       f2fs_update_time(sbi, ENABLE_TIME);
 
        /* we should flush all the data to keep data consistency */
-       do {
-               sync_inodes_sb(sbi->sb);
+       while (get_pages(sbi, F2FS_DIRTY_DATA)) {
+               writeback_inodes_sb_nr(sbi->sb, nr_pages, WB_REASON_SYNC);
                f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);
-       } while (get_pages(sbi, F2FS_DIRTY_DATA) && retry--);
 
-       if (unlikely(retry < 0))
-               f2fs_warn(sbi, "checkpoint=enable has some unwritten data.");
+               if (f2fs_time_over(sbi, ENABLE_TIME))
+                       break;
+       }
+
+       sync_inodes_sb(sbi->sb);
+
+       if (unlikely(get_pages(sbi, F2FS_DIRTY_DATA)))
+               f2fs_warn(sbi, "checkpoint=enable has some unwritten data: %lld",
+                                       get_pages(sbi, F2FS_DIRTY_DATA));
 
        f2fs_down_write(&sbi->gc_lock);
        f2fs_dirty_to_prefree(sbi);
@@ -3868,6 +3876,7 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
        sbi->interval_time[DISCARD_TIME] = DEF_IDLE_INTERVAL;
        sbi->interval_time[GC_TIME] = DEF_IDLE_INTERVAL;
        sbi->interval_time[DISABLE_TIME] = DEF_DISABLE_INTERVAL;
+       sbi->interval_time[ENABLE_TIME] = DEF_ENABLE_INTERVAL;
        sbi->interval_time[UMOUNT_DISCARD_TIMEOUT] =
                                DEF_UMOUNT_DISCARD_TIMEOUT;
        clear_sbi_flag(sbi, SBI_NEED_FSCK);