]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
f2fs: fix to avoid touching checkpointed data in get_victim()
authorChao Yu <yuchao0@huawei.com>
Wed, 24 Mar 2021 03:18:28 +0000 (11:18 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:29:38 +0000 (10:29 +0200)
[ Upstream commit 61461fc921b756ae16e64243f72af2bfc2e620db ]

In CP disabling mode, there are two issues when using LFS or SSR | AT_SSR
mode to select victim:

1. LFS is set to find source section during GC, the victim should have
no checkpointed data, since after GC, section could not be set free for
reuse.

Previously, we only check valid chpt blocks in current segment rather
than section, fix it.

2. SSR | AT_SSR are set to find target segment for writes which can be
fully filled by checkpointed and newly written blocks, we should never
select such segment, otherwise it can cause panic or data corruption
during allocation, potential case is described as below:

 a) target segment has 'n' (n < 512) ckpt valid blocks
 b) GC migrates 'n' valid blocks to other segment (segment is still
    in dirty list)
 c) GC migrates '512 - n' blocks to target segment (segment has 'n'
    cp_vblocks and '512 - n' vblocks)
 d) If GC selects target segment via {AT,}SSR allocator, however there
    is no free space in targe segment.

Fixes: 4354994f097d ("f2fs: checkpoint disabling")
Fixes: 093749e296e2 ("f2fs: support age threshold based garbage collection")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/f2fs/f2fs.h
fs/f2fs/gc.c
fs/f2fs/segment.c
fs/f2fs/segment.h

index e72ed7baf17fb058715cdf69fe1b443823eb2e80..c9d54652a518fc8ebe837819f9e8ecca7435e685 100644 (file)
@@ -3322,6 +3322,7 @@ block_t f2fs_get_unusable_blocks(struct f2fs_sb_info *sbi);
 int f2fs_disable_cp_again(struct f2fs_sb_info *sbi, block_t unusable);
 void f2fs_release_discard_addrs(struct f2fs_sb_info *sbi);
 int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra);
+bool f2fs_segment_has_free_slot(struct f2fs_sb_info *sbi, int segno);
 void f2fs_init_inmem_curseg(struct f2fs_sb_info *sbi);
 void f2fs_save_inmem_curseg(struct f2fs_sb_info *sbi);
 void f2fs_restore_inmem_curseg(struct f2fs_sb_info *sbi);
index b206797d202b5f48d643804b3e51b54f3757a55a..f4e426352aadc9ef9f4ce5d20ea68ffabcaf3142 100644 (file)
@@ -392,10 +392,6 @@ static void add_victim_entry(struct f2fs_sb_info *sbi,
                if (p->gc_mode == GC_AT &&
                        get_valid_blocks(sbi, segno, true) == 0)
                        return;
-
-               if (p->alloc_mode == AT_SSR &&
-                       get_seg_entry(sbi, segno)->ckpt_valid_blocks == 0)
-                       return;
        }
 
        for (i = 0; i < sbi->segs_per_sec; i++)
@@ -728,11 +724,27 @@ retry:
 
                if (sec_usage_check(sbi, secno))
                        goto next;
+
                /* Don't touch checkpointed data */
-               if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED) &&
-                                       get_ckpt_valid_blocks(sbi, segno) &&
-                                       p.alloc_mode == LFS))
-                       goto next;
+               if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
+                       if (p.alloc_mode == LFS) {
+                               /*
+                                * LFS is set to find source section during GC.
+                                * The victim should have no checkpointed data.
+                                */
+                               if (get_ckpt_valid_blocks(sbi, segno, true))
+                                       goto next;
+                       } else {
+                               /*
+                                * SSR | AT_SSR are set to find target segment
+                                * for writes which can be full by checkpointed
+                                * and newly written blocks.
+                                */
+                               if (!f2fs_segment_has_free_slot(sbi, segno))
+                                       goto next;
+                       }
+               }
+
                if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap))
                        goto next;
 
index 86bbba93c349965720f14b607f79739e94b94f91..ab0a2d2de9a9828ef6584c1e9174c7e7c0bfbf80 100644 (file)
@@ -878,7 +878,7 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno)
        mutex_lock(&dirty_i->seglist_lock);
 
        valid_blocks = get_valid_blocks(sbi, segno, false);
-       ckpt_valid_blocks = get_ckpt_valid_blocks(sbi, segno);
+       ckpt_valid_blocks = get_ckpt_valid_blocks(sbi, segno, false);
 
        if (valid_blocks == 0 && (!is_sbi_flag_set(sbi, SBI_CP_DISABLED) ||
                ckpt_valid_blocks == usable_blocks)) {
@@ -963,7 +963,7 @@ static unsigned int get_free_segment(struct f2fs_sb_info *sbi)
        for_each_set_bit(segno, dirty_i->dirty_segmap[DIRTY], MAIN_SEGS(sbi)) {
                if (get_valid_blocks(sbi, segno, false))
                        continue;
-               if (get_ckpt_valid_blocks(sbi, segno))
+               if (get_ckpt_valid_blocks(sbi, segno, false))
                        continue;
                mutex_unlock(&dirty_i->seglist_lock);
                return segno;
@@ -2653,6 +2653,23 @@ static void __refresh_next_blkoff(struct f2fs_sb_info *sbi,
                seg->next_blkoff++;
 }
 
+bool f2fs_segment_has_free_slot(struct f2fs_sb_info *sbi, int segno)
+{
+       struct seg_entry *se = get_seg_entry(sbi, segno);
+       int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long);
+       unsigned long *target_map = SIT_I(sbi)->tmp_map;
+       unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map;
+       unsigned long *cur_map = (unsigned long *)se->cur_valid_map;
+       int i, pos;
+
+       for (i = 0; i < entries; i++)
+               target_map[i] = ckpt_map[i] | cur_map[i];
+
+       pos = __find_rev_next_zero_bit(target_map, sbi->blocks_per_seg, 0);
+
+       return pos < sbi->blocks_per_seg;
+}
+
 /*
  * This function always allocates a used segment(from dirty seglist) by SSR
  * manner, so it should recover the existing segment information of valid blocks
@@ -2923,19 +2940,8 @@ static void __allocate_new_segment(struct f2fs_sb_info *sbi, int type,
                get_valid_blocks(sbi, curseg->segno, new_sec))
                goto alloc;
 
-       if (new_sec) {
-               unsigned int segno = START_SEGNO(curseg->segno);
-               int i;
-
-               for (i = 0; i < sbi->segs_per_sec; i++, segno++) {
-                       if (get_ckpt_valid_blocks(sbi, segno))
-                               goto alloc;
-               }
-       } else {
-               if (!get_ckpt_valid_blocks(sbi, curseg->segno))
-                       return;
-       }
-
+       if (!get_ckpt_valid_blocks(sbi, curseg->segno, new_sec))
+               return;
 alloc:
        old_segno = curseg->segno;
        SIT_I(sbi)->s_ops->allocate_segment(sbi, type, true);
index 229814b4f4a6cce77cdce2f4be5898817b8ab3fc..1bf33fc27b8f83b69630c1266c67e36a45318627 100644 (file)
@@ -361,8 +361,20 @@ static inline unsigned int get_valid_blocks(struct f2fs_sb_info *sbi,
 }
 
 static inline unsigned int get_ckpt_valid_blocks(struct f2fs_sb_info *sbi,
-                               unsigned int segno)
+                               unsigned int segno, bool use_section)
 {
+       if (use_section && __is_large_section(sbi)) {
+               unsigned int start_segno = START_SEGNO(segno);
+               unsigned int blocks = 0;
+               int i;
+
+               for (i = 0; i < sbi->segs_per_sec; i++, start_segno++) {
+                       struct seg_entry *se = get_seg_entry(sbi, start_segno);
+
+                       blocks += se->ckpt_valid_blocks;
+               }
+               return blocks;
+       }
        return get_seg_entry(sbi, segno)->ckpt_valid_blocks;
 }