linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] f2fs: fix count of seg_freed to make sec_freed correct
@ 2018-10-10 10:52 Yunlong Song
  2018-10-15 12:35 ` Chao Yu
  2018-10-24  8:08 ` [PATCH v2] " Yunlong Song
  0 siblings, 2 replies; 4+ messages in thread
From: Yunlong Song @ 2018-10-10 10:52 UTC (permalink / raw)
  To: jaegeuk, chao, yuchao0, yunlong.song, yunlong.song
  Cc: miaoxie, bintian.wang, shengyong1, heyunlei, linux-f2fs-devel,
	linux-kernel

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 <yunlong.song@huawei.com>
---
 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] f2fs: fix count of seg_freed to make sec_freed correct
  2018-10-10 10:52 [PATCH] f2fs: fix count of seg_freed to make sec_freed correct Yunlong Song
@ 2018-10-15 12:35 ` Chao Yu
  2018-10-24  8:08 ` [PATCH v2] " Yunlong Song
  1 sibling, 0 replies; 4+ messages in thread
From: Chao Yu @ 2018-10-15 12:35 UTC (permalink / raw)
  To: Yunlong Song, jaegeuk, chao, yunlong.song
  Cc: miaoxie, bintian.wang, shengyong1, heyunlei, linux-f2fs-devel,
	linux-kernel

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 <yunlong.song@huawei.com>
> ---
>  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);
>  	}
>  
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v2] f2fs: fix count of seg_freed to make sec_freed correct
  2018-10-10 10:52 [PATCH] f2fs: fix count of seg_freed to make sec_freed correct Yunlong Song
  2018-10-15 12:35 ` Chao Yu
@ 2018-10-24  8:08 ` Yunlong Song
  2018-10-24  9:31   ` Chao Yu
  1 sibling, 1 reply; 4+ messages in thread
From: Yunlong Song @ 2018-10-24  8:08 UTC (permalink / raw)
  To: jaegeuk, chao, yuchao0, yunlong.song, yunlong.song
  Cc: miaoxie, bintian.wang, shengyong1, heyunlei, linux-f2fs-devel,
	linux-kernel

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 <yunlong.song@huawei.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] f2fs: fix count of seg_freed to make sec_freed correct
  2018-10-24  8:08 ` [PATCH v2] " Yunlong Song
@ 2018-10-24  9:31   ` Chao Yu
  0 siblings, 0 replies; 4+ messages in thread
From: Chao Yu @ 2018-10-24  9:31 UTC (permalink / raw)
  To: Yunlong Song, jaegeuk, chao, yunlong.song
  Cc: miaoxie, bintian.wang, shengyong1, heyunlei, linux-f2fs-devel,
	linux-kernel

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 <yunlong.song@huawei.com>
> Signed-off-by: Chao Yu <yuchao0@huawei.com>

Reviewed-by: Chao Yu <yuchao0@huawei.com>

Thanks,


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-10-24  9:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-10 10:52 [PATCH] f2fs: fix count of seg_freed to make sec_freed correct Yunlong Song
2018-10-15 12:35 ` Chao Yu
2018-10-24  8:08 ` [PATCH v2] " Yunlong Song
2018-10-24  9:31   ` Chao Yu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).