2018-10-10 10:53:24

by Yunlong Song

Subject: [PATCH] f2fs: fix count of seg_freed to make sec_freed correct

When sbi->segs_per_sec > 1, and if some segno has 0 valid blocks before
gc starts, do_garbage_collect will skip counting seg_freed++, and this
will cause seg_freed < sbi->segs_per_sec and finally skip sec_freed++.

Signed-off-by: Yunlong Song <[email protected]>
---
fs/f2fs/gc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index a07241f..dc63cd5 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1160,10 +1160,10 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,

stat_inc_seg_count(sbi, type, gc_type);

+next:
if (gc_type == FG_GC &&
get_valid_blocks(sbi, segno, false) == 0)
seg_freed++;
-next:
f2fs_put_page(sum_page, 0);
}

--
1.8.5.2

2018-10-15 12:36:21

by Chao Yu

Subject: Re: [PATCH] f2fs: fix count of seg_freed to make sec_freed correct

On 2018/10/10 18:52, Yunlong Song wrote:
> When sbi->segs_per_sec > 1, and if some segno has 0 valid blocks before
> gc starts, do_garbage_collect will skip counting seg_freed++, and this
> will cause seg_freed < sbi->segs_per_sec and finally skip sec_freed++.
>
> Signed-off-by: Yunlong Song <[email protected]>
> ---
> fs/f2fs/gc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
> index a07241f..dc63cd5 100644
> --- a/fs/f2fs/gc.c
> +++ b/fs/f2fs/gc.c
> @@ -1160,10 +1160,10 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
>
> stat_inc_seg_count(sbi, type, gc_type);
>
> +next:
> if (gc_type == FG_GC &&
> get_valid_blocks(sbi, segno, false) == 0)
> seg_freed++;
> -next:

How about:

if (get_valid_blocks(sbi, segno, false) == 0)
goto freed;

if (!PageUptodate(sum_page) || unlikely(f2fs_cp_error(sbi))
goto next;


freed:
if (gc_type == FG_GC &&
get_valid_blocks(sbi, segno, false) == 0)
seg_freed++;
next:

> f2fs_put_page(sum_page, 0);
> }
>
>

2018-10-24 08:09:39

by Yunlong Song

Subject: [PATCH v2] f2fs: fix count of seg_freed to make sec_freed correct

When sbi->segs_per_sec > 1, and if some segno has 0 valid blocks before
gc starts, do_garbage_collect will skip counting seg_freed++, and this
will cause seg_freed < sbi->segs_per_sec and finally skip sec_freed++.

Signed-off-by: Yunlong Song <[email protected]>
Signed-off-by: Chao Yu <[email protected]>
---
fs/f2fs/gc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index a07241f..57841e9 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1130,9 +1130,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
GET_SUM_BLOCK(sbi, segno));
f2fs_put_page(sum_page, 0);

- if (get_valid_blocks(sbi, segno, false) == 0 ||
- !PageUptodate(sum_page) ||
- unlikely(f2fs_cp_error(sbi)))
+ if (get_valid_blocks(sbi, segno, false) == 0)
+ goto freed;
+ if (!PageUptodate(sum_page) || unlikely(f2fs_cp_error(sbi)))
goto next;

sum = page_address(sum_page);
@@ -1160,6 +1160,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,

stat_inc_seg_count(sbi, type, gc_type);

+freed:
if (gc_type == FG_GC &&
get_valid_blocks(sbi, segno, false) == 0)
seg_freed++;
--
1.8.5.2

2018-10-24 09:34:26

by Chao Yu

Subject: Re: [PATCH v2] f2fs: fix count of seg_freed to make sec_freed correct

On 2018/10/24 16:08, Yunlong Song wrote:
> When sbi->segs_per_sec > 1, and if some segno has 0 valid blocks before
> gc starts, do_garbage_collect will skip counting seg_freed++, and this
> will cause seg_freed < sbi->segs_per_sec and finally skip sec_freed++.
>
> Signed-off-by: Yunlong Song <[email protected]>
> Signed-off-by: Chao Yu <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,