f2fs: fix out-of free segments

This patch also reverts d0db7703ac1 ("f2fs: do SSR in higher priority").

This patch fixes out of free segments caused by many small file creation by
1) mkfs -s 1 2G
2) mount
3) untar
 - preoduce 60000 small files burstly
4) sync
 - flush node pages
 - flush imeta

Here, when we do f2fs_balance_fs, we missed # of imeta blocks, resulting in
skipping to check has_not_enough_free_secs.

Another test is done by
1) mkfs -s 12 2G
2) mount
3) untar
 - preoduce 60000 small files burstly
4) sync
 - flush node pages
 - flush imeta

In this case, this patch also fixes wrong block allocation under large section
size.

Reported-by: William Brana <wbrana@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 7d46a8e6d35019ee649eeb0103734107d307efc0..b8dcd1e224e855edaf4bd0899a7799924c70acf3 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1472,7 +1472,8 @@ out:
        }
 
        unlock_page(page);
-       f2fs_balance_fs(sbi, need_balance_fs);
+       if (!S_ISDIR(inode->i_mode))
+               f2fs_balance_fs(sbi, need_balance_fs);
 
        if (unlikely(f2fs_cp_error(sbi))) {
                f2fs_submit_merged_bio(sbi, DATA, WRITE);

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 0900814485c74d7247c115db984ba1a992b556e0..518f49643092582ae256c425616e942ed2392c40 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -338,7 +338,8 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)
         * We need to balance fs here to prevent from producing dirty node pages
         * during the urgent cleaning time when runing out of free sections.
         */
-       if (update_inode_page(inode) && wbc && wbc->nr_to_write)
+       update_inode_page(inode);
+       if (wbc && wbc->nr_to_write)
                f2fs_balance_fs(sbi, true);
        return 0;
 }

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 1b16770f9d2ea14e43808d1f46b95cf7d4414610..45da59b72035023ab8e9a98551f878f1f0070c0a 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -388,11 +388,8 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)
        }
 #endif
 
-       if (!need)
-               return;
-
        /* balance_fs_bg is able to be pending */
-       if (excess_cached_nats(sbi))
+       if (need && excess_cached_nats(sbi))
                f2fs_balance_fs_bg(sbi);
 
        /*
@@ -1639,6 +1636,17 @@ static void write_current_sum_page(struct f2fs_sb_info *sbi,
        f2fs_put_page(page, 1);
 }
 
+static int is_next_segment_free(struct f2fs_sb_info *sbi, int type)
+{
+       struct curseg_info *curseg = CURSEG_I(sbi, type);
+       unsigned int segno = curseg->segno + 1;
+       struct free_segmap_info *free_i = FREE_I(sbi);
+
+       if (segno < MAIN_SEGS(sbi) && segno % sbi->segs_per_sec)
+               return !test_bit(segno, free_i->free_segmap);
+       return 0;
+}
+
 /*
  * Find a new segment from the free segments bitmap to right order
  * This function should be returned with success, otherwise BUG
@@ -1752,6 +1760,10 @@ static void reset_curseg(struct f2fs_sb_info *sbi, int type, int modified)
 
 static unsigned int __get_next_segno(struct f2fs_sb_info *sbi, int type)
 {
+       /* if segs_per_sec is large than 1, we need to keep original policy. */
+       if (sbi->segs_per_sec != 1)
+               return CURSEG_I(sbi, type)->segno;
+
        if (type == CURSEG_HOT_DATA || IS_NODESEG(type))
                return 0;
 
@@ -1901,17 +1913,21 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type)
 static void allocate_segment_by_default(struct f2fs_sb_info *sbi,
                                                int type, bool force)
 {
+       struct curseg_info *curseg = CURSEG_I(sbi, type);
+
        if (force)
                new_curseg(sbi, type, true);
        else if (!is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_FLAG) &&
                                        type == CURSEG_WARM_NODE)
                new_curseg(sbi, type, false);
+       else if (curseg->alloc_type == LFS && is_next_segment_free(sbi, type))
+               new_curseg(sbi, type, false);
        else if (need_SSR(sbi) && get_ssr_segment(sbi, type))
                change_curseg(sbi, type, true);
        else
                new_curseg(sbi, type, false);
 
-       stat_inc_seg_type(sbi, CURSEG_I(sbi, type));
+       stat_inc_seg_type(sbi, curseg);
 }
 
 void allocate_new_segments(struct f2fs_sb_info *sbi)