f2fs: maintain one time GC mode is enabled during whole zoned GC cycle

The current version missed setting one time GC for normal zoned GC
cycle. So, valid threshold control is not working. Need to fix it to
prevent excessive GC for zoned devices.

Fixes: e791d00bd06c ("f2fs: add valid block ratio not to do excessive GC for one time GC")
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index a7708cf80c04ed35806debb8dff2e62ebd1a3d45..8abf521530ff3f293148b3c9a634fdb143e1d409 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -38,13 +38,14 @@ static int gc_thread_func(void *data)
        struct f2fs_gc_control gc_control = {
                .victim_segno = NULL_SEGNO,
                .should_migrate_blocks = false,
-               .err_gc_skipped = false };
+               .err_gc_skipped = false,
+               .one_time = false };
 
        wait_ms = gc_th->min_sleep_time;
 
        set_freezable();
        do {
-               bool sync_mode, foreground = false;
+               bool sync_mode, foreground = false, gc_boost = false;
 
                wait_event_freezable_timeout(*wq,
                                kthread_should_stop() ||
@@ -52,8 +53,12 @@ static int gc_thread_func(void *data)
                                gc_th->gc_wake,
                                msecs_to_jiffies(wait_ms));
 
-               if (test_opt(sbi, GC_MERGE) && waitqueue_active(fggc_wq))
+               if (test_opt(sbi, GC_MERGE) && waitqueue_active(fggc_wq)) {
                        foreground = true;
+                       gc_control.one_time = false;
+               } else if (f2fs_sb_has_blkzoned(sbi)) {
+                       gc_control.one_time = true;
+               }
 
                /* give it a try one time */
                if (gc_th->gc_wake)
@@ -81,8 +86,6 @@ static int gc_thread_func(void *data)
                        continue;
                }
 
-               gc_control.one_time = false;
-
                /*
                 * [GC triggering condition]
                 * 0. GC is not conducted currently.
@@ -132,7 +135,7 @@ static int gc_thread_func(void *data)
                if (need_to_boost_gc(sbi)) {
                        decrease_sleep_time(gc_th, &wait_ms);
                        if (f2fs_sb_has_blkzoned(sbi))
-                               gc_control.one_time = true;
+                               gc_boost = true;
                } else {
                        increase_sleep_time(gc_th, &wait_ms);
                }
@@ -141,7 +144,7 @@ do_gc:
                                        FOREGROUND : BACKGROUND);
 
                sync_mode = (F2FS_OPTION(sbi).bggc_mode == BGGC_MODE_SYNC) ||
-                       (gc_control.one_time && gc_th->boost_gc_greedy);
+                       (gc_boost && gc_th->boost_gc_greedy);
 
                /* foreground GC was been triggered via f2fs_balance_fs() */
                if (foreground && !f2fs_sb_has_blkzoned(sbi))