* [f2fs-dev] [PATCH 2/4] f2fs: fix write pointers on zoned device after roll forward
2023-12-04 18:04 [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new Jaegeuk Kim
@ 2023-12-04 18:04 ` Jaegeuk Kim
2023-12-04 19:02 ` Daeho Jeong
2023-12-04 18:04 ` [f2fs-dev] [PATCH 3/4] f2fs: check write pointers when checkpoint=disable Jaegeuk Kim
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Jaegeuk Kim @ 2023-12-04 18:04 UTC (permalink / raw)
To: linux-kernel, linux-f2fs-devel; +Cc: Jaegeuk Kim
1. do roll forward recovery
2. update current segments pointers
3. fix the entire zones' write pointers
4. do checkpoint
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/recovery.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 16415c770b45..d0f24ccbd1ac 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -917,6 +917,8 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
if (!err && fix_curseg_write_pointer && !f2fs_readonly(sbi->sb) &&
f2fs_sb_has_blkzoned(sbi)) {
err = f2fs_fix_curseg_write_pointer(sbi);
+ if (!err)
+ err = f2fs_check_write_pointer(sbi);
ret = err;
}
--
2.43.0.rc2.451.g8631bc7472-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [f2fs-dev] [PATCH 3/4] f2fs: check write pointers when checkpoint=disable
2023-12-04 18:04 [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new Jaegeuk Kim
2023-12-04 18:04 ` [f2fs-dev] [PATCH 2/4] f2fs: fix write pointers on zoned device after roll forward Jaegeuk Kim
@ 2023-12-04 18:04 ` Jaegeuk Kim
2023-12-04 19:03 ` Daeho Jeong
2023-12-04 18:04 ` [f2fs-dev] [PATCH 4/4] f2fs: let's finish or reset zones all the time Jaegeuk Kim
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Jaegeuk Kim @ 2023-12-04 18:04 UTC (permalink / raw)
To: linux-kernel, linux-f2fs-devel; +Cc: Jaegeuk Kim
Even if f2fs was rebooted as staying checkpoint=disable, let's match the write
pointers all the time.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/super.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 617340e9ea7f..9a874b4d1501 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4741,7 +4741,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
#ifdef CONFIG_QUOTA
f2fs_recover_quota_end(sbi, quota_enabled);
#endif
-
+reset_checkpoint:
/*
* If the f2fs is not readonly and fsync data recovery succeeds,
* check zoned block devices' write pointer consistency.
@@ -4752,7 +4752,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
goto free_meta;
}
-reset_checkpoint:
f2fs_init_inmem_curseg(sbi);
/* f2fs_recover_fsync_data() cleared this already */
--
2.43.0.rc2.451.g8631bc7472-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [f2fs-dev] [PATCH 3/4] f2fs: check write pointers when checkpoint=disable
2023-12-04 18:04 ` [f2fs-dev] [PATCH 3/4] f2fs: check write pointers when checkpoint=disable Jaegeuk Kim
@ 2023-12-04 19:03 ` Daeho Jeong
0 siblings, 0 replies; 10+ messages in thread
From: Daeho Jeong @ 2023-12-04 19:03 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel
LGTM
On Mon, Dec 4, 2023 at 10:06 AM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> Even if f2fs was rebooted as staying checkpoint=disable, let's match the write
> pointers all the time.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/super.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 617340e9ea7f..9a874b4d1501 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -4741,7 +4741,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
> #ifdef CONFIG_QUOTA
> f2fs_recover_quota_end(sbi, quota_enabled);
> #endif
> -
> +reset_checkpoint:
> /*
> * If the f2fs is not readonly and fsync data recovery succeeds,
> * check zoned block devices' write pointer consistency.
> @@ -4752,7 +4752,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
> goto free_meta;
> }
>
> -reset_checkpoint:
> f2fs_init_inmem_curseg(sbi);
>
> /* f2fs_recover_fsync_data() cleared this already */
> --
> 2.43.0.rc2.451.g8631bc7472-goog
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [f2fs-dev] [PATCH 4/4] f2fs: let's finish or reset zones all the time
2023-12-04 18:04 [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new Jaegeuk Kim
2023-12-04 18:04 ` [f2fs-dev] [PATCH 2/4] f2fs: fix write pointers on zoned device after roll forward Jaegeuk Kim
2023-12-04 18:04 ` [f2fs-dev] [PATCH 3/4] f2fs: check write pointers when checkpoint=disable Jaegeuk Kim
@ 2023-12-04 18:04 ` Jaegeuk Kim
2023-12-04 19:11 ` Daeho Jeong
2023-12-05 19:29 ` [f2fs-dev] [PATCH 4/4 v2] " Jaegeuk Kim
2023-12-04 18:53 ` [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new Daeho Jeong
2023-12-14 20:50 ` patchwork-bot+f2fs
4 siblings, 2 replies; 10+ messages in thread
From: Jaegeuk Kim @ 2023-12-04 18:04 UTC (permalink / raw)
To: linux-kernel, linux-f2fs-devel; +Cc: Jaegeuk Kim
In order to limit # of open zones, let's finish or reset zones given # of
valid blocks per section and its zone condition.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/segment.c | 74 +++++++++++------------------------------------
1 file changed, 17 insertions(+), 57 deletions(-)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9081c9af977a..5696a4d381ff 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -4870,82 +4870,44 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
struct f2fs_dev_info *fdev,
struct blk_zone *zone)
{
- unsigned int wp_segno, wp_blkoff, zone_secno, zone_segno, segno;
- block_t zone_block, wp_block, last_valid_block;
+ unsigned int zone_segno;
+ block_t zone_block, wp_block, valid_block_cnt;
unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;
- int i, s, b, ret;
- struct seg_entry *se;
+ int ret;
if (zone->type != BLK_ZONE_TYPE_SEQWRITE_REQ)
return 0;
wp_block = fdev->start_blk + (zone->wp >> log_sectors_per_block);
- wp_segno = GET_SEGNO(sbi, wp_block);
- wp_blkoff = wp_block - START_BLOCK(sbi, wp_segno);
zone_block = fdev->start_blk + (zone->start >> log_sectors_per_block);
zone_segno = GET_SEGNO(sbi, zone_block);
- zone_secno = GET_SEC_FROM_SEG(sbi, zone_segno);
-
- if (zone_segno >= MAIN_SEGS(sbi))
- return 0;
/*
* Skip check of zones cursegs point to, since
* fix_curseg_write_pointer() checks them.
*/
- for (i = 0; i < NO_CHECK_TYPE; i++)
- if (zone_secno == GET_SEC_FROM_SEG(sbi,
- CURSEG_I(sbi, i)->segno))
- return 0;
+ if (zone_segno >= MAIN_SEGS(sbi) ||
+ IS_CURSEC(sbi, GET_SEC_FROM_SEG(sbi, zone_segno)))
+ return 0;
/*
- * Get last valid block of the zone.
+ * Get # of valid block of the zone.
*/
- last_valid_block = zone_block - 1;
- for (s = sbi->segs_per_sec - 1; s >= 0; s--) {
- segno = zone_segno + s;
- se = get_seg_entry(sbi, segno);
- for (b = sbi->blocks_per_seg - 1; b >= 0; b--)
- if (f2fs_test_bit(b, se->cur_valid_map)) {
- last_valid_block = START_BLOCK(sbi, segno) + b;
- break;
- }
- if (last_valid_block >= zone_block)
- break;
- }
+ valid_block_cnt = get_valid_blocks(sbi, zone_segno, true);
- /*
- * When safely unmounted in the previous mount, we can trust write
- * pointers. Otherwise, finish zones.
- */
- if (is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
- /*
- * The write pointer matches with the valid blocks or
- * already points to the end of the zone.
- */
- if ((last_valid_block + 1 == wp_block) ||
- (zone->wp == zone->start + zone->len))
- return 0;
- }
+ if ((!valid_block_cnt && zone->cond == BLK_ZONE_COND_EMPTY) ||
+ (valid_block_cnt && zone->cond == BLK_ZONE_COND_FULL))
+ return 0;
- if (last_valid_block + 1 == zone_block) {
- if (is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
- /*
- * If there is no valid block in the zone and if write
- * pointer is not at zone start, reset the write
- * pointer.
- */
- f2fs_notice(sbi,
- "Zone without valid block has non-zero write "
- "pointer. Reset the write pointer: wp[0x%x,0x%x]",
- wp_segno, wp_blkoff);
- }
+ if (!valid_block_cnt) {
+ f2fs_notice(sbi, "Zone without valid block has non-zero write "
+ "pointer. Reset the write pointer: cond[0x%x]",
+ zone->cond);
ret = __f2fs_issue_discard_zone(sbi, fdev->bdev, zone_block,
zone->len >> log_sectors_per_block);
if (ret)
f2fs_err(sbi, "Discard zone failed: %s (errno=%d)",
fdev->path, ret);
-
return ret;
}
@@ -4957,10 +4919,8 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
* selected for write operation until it get discarded.
*/
f2fs_notice(sbi, "Valid blocks are not aligned with write "
- "pointer: valid block[0x%x,0x%x] wp[0x%x,0x%x]",
- GET_SEGNO(sbi, last_valid_block),
- GET_BLKOFF_FROM_SEG0(sbi, last_valid_block),
- wp_segno, wp_blkoff);
+ "pointer: valid block[0x%x,0x%x] cond[0x%x]",
+ zone_segno, valid_block_cnt, zone->cond);
ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,
zone->start, zone->len, GFP_NOFS);
--
2.43.0.rc2.451.g8631bc7472-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [f2fs-dev] [PATCH 4/4] f2fs: let's finish or reset zones all the time
2023-12-04 18:04 ` [f2fs-dev] [PATCH 4/4] f2fs: let's finish or reset zones all the time Jaegeuk Kim
@ 2023-12-04 19:11 ` Daeho Jeong
2023-12-05 19:29 ` [f2fs-dev] [PATCH 4/4 v2] " Jaegeuk Kim
1 sibling, 0 replies; 10+ messages in thread
From: Daeho Jeong @ 2023-12-04 19:11 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel
LGTM
On Mon, Dec 4, 2023 at 10:07 AM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> In order to limit # of open zones, let's finish or reset zones given # of
> valid blocks per section and its zone condition.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/segment.c | 74 +++++++++++------------------------------------
> 1 file changed, 17 insertions(+), 57 deletions(-)
>
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 9081c9af977a..5696a4d381ff 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -4870,82 +4870,44 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
> struct f2fs_dev_info *fdev,
> struct blk_zone *zone)
> {
> - unsigned int wp_segno, wp_blkoff, zone_secno, zone_segno, segno;
> - block_t zone_block, wp_block, last_valid_block;
> + unsigned int zone_segno;
> + block_t zone_block, wp_block, valid_block_cnt;
> unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;
> - int i, s, b, ret;
> - struct seg_entry *se;
> + int ret;
>
> if (zone->type != BLK_ZONE_TYPE_SEQWRITE_REQ)
> return 0;
>
> wp_block = fdev->start_blk + (zone->wp >> log_sectors_per_block);
> - wp_segno = GET_SEGNO(sbi, wp_block);
> - wp_blkoff = wp_block - START_BLOCK(sbi, wp_segno);
> zone_block = fdev->start_blk + (zone->start >> log_sectors_per_block);
> zone_segno = GET_SEGNO(sbi, zone_block);
> - zone_secno = GET_SEC_FROM_SEG(sbi, zone_segno);
> -
> - if (zone_segno >= MAIN_SEGS(sbi))
> - return 0;
>
> /*
> * Skip check of zones cursegs point to, since
> * fix_curseg_write_pointer() checks them.
> */
> - for (i = 0; i < NO_CHECK_TYPE; i++)
> - if (zone_secno == GET_SEC_FROM_SEG(sbi,
> - CURSEG_I(sbi, i)->segno))
> - return 0;
> + if (zone_segno >= MAIN_SEGS(sbi) ||
> + IS_CURSEC(sbi, GET_SEC_FROM_SEG(sbi, zone_segno)))
> + return 0;
>
> /*
> - * Get last valid block of the zone.
> + * Get # of valid block of the zone.
> */
> - last_valid_block = zone_block - 1;
> - for (s = sbi->segs_per_sec - 1; s >= 0; s--) {
> - segno = zone_segno + s;
> - se = get_seg_entry(sbi, segno);
> - for (b = sbi->blocks_per_seg - 1; b >= 0; b--)
> - if (f2fs_test_bit(b, se->cur_valid_map)) {
> - last_valid_block = START_BLOCK(sbi, segno) + b;
> - break;
> - }
> - if (last_valid_block >= zone_block)
> - break;
> - }
> + valid_block_cnt = get_valid_blocks(sbi, zone_segno, true);
>
> - /*
> - * When safely unmounted in the previous mount, we can trust write
> - * pointers. Otherwise, finish zones.
> - */
> - if (is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
> - /*
> - * The write pointer matches with the valid blocks or
> - * already points to the end of the zone.
> - */
> - if ((last_valid_block + 1 == wp_block) ||
> - (zone->wp == zone->start + zone->len))
> - return 0;
> - }
> + if ((!valid_block_cnt && zone->cond == BLK_ZONE_COND_EMPTY) ||
> + (valid_block_cnt && zone->cond == BLK_ZONE_COND_FULL))
> + return 0;
>
> - if (last_valid_block + 1 == zone_block) {
> - if (is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
> - /*
> - * If there is no valid block in the zone and if write
> - * pointer is not at zone start, reset the write
> - * pointer.
> - */
> - f2fs_notice(sbi,
> - "Zone without valid block has non-zero write "
> - "pointer. Reset the write pointer: wp[0x%x,0x%x]",
> - wp_segno, wp_blkoff);
> - }
> + if (!valid_block_cnt) {
> + f2fs_notice(sbi, "Zone without valid block has non-zero write "
> + "pointer. Reset the write pointer: cond[0x%x]",
> + zone->cond);
> ret = __f2fs_issue_discard_zone(sbi, fdev->bdev, zone_block,
> zone->len >> log_sectors_per_block);
> if (ret)
> f2fs_err(sbi, "Discard zone failed: %s (errno=%d)",
> fdev->path, ret);
> -
> return ret;
> }
>
> @@ -4957,10 +4919,8 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
> * selected for write operation until it get discarded.
> */
> f2fs_notice(sbi, "Valid blocks are not aligned with write "
> - "pointer: valid block[0x%x,0x%x] wp[0x%x,0x%x]",
> - GET_SEGNO(sbi, last_valid_block),
> - GET_BLKOFF_FROM_SEG0(sbi, last_valid_block),
> - wp_segno, wp_blkoff);
> + "pointer: valid block[0x%x,0x%x] cond[0x%x]",
> + zone_segno, valid_block_cnt, zone->cond);
>
> ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,
> zone->start, zone->len, GFP_NOFS);
> --
> 2.43.0.rc2.451.g8631bc7472-goog
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [f2fs-dev] [PATCH 4/4 v2] f2fs: let's finish or reset zones all the time
2023-12-04 18:04 ` [f2fs-dev] [PATCH 4/4] f2fs: let's finish or reset zones all the time Jaegeuk Kim
2023-12-04 19:11 ` Daeho Jeong
@ 2023-12-05 19:29 ` Jaegeuk Kim
1 sibling, 0 replies; 10+ messages in thread
From: Jaegeuk Kim @ 2023-12-05 19:29 UTC (permalink / raw)
To: linux-kernel, linux-f2fs-devel
In order to limit # of open zones, let's finish or reset zones given # of
valid blocks per section and its zone condition.
Reviewed-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
- remove unnecessary wp_block
fs/f2fs/segment.c | 75 +++++++++++------------------------------------
1 file changed, 17 insertions(+), 58 deletions(-)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9081c9af977a..007ebb107236 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -4870,82 +4870,43 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
struct f2fs_dev_info *fdev,
struct blk_zone *zone)
{
- unsigned int wp_segno, wp_blkoff, zone_secno, zone_segno, segno;
- block_t zone_block, wp_block, last_valid_block;
+ unsigned int zone_segno;
+ block_t zone_block, valid_block_cnt;
unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;
- int i, s, b, ret;
- struct seg_entry *se;
+ int ret;
if (zone->type != BLK_ZONE_TYPE_SEQWRITE_REQ)
return 0;
- wp_block = fdev->start_blk + (zone->wp >> log_sectors_per_block);
- wp_segno = GET_SEGNO(sbi, wp_block);
- wp_blkoff = wp_block - START_BLOCK(sbi, wp_segno);
zone_block = fdev->start_blk + (zone->start >> log_sectors_per_block);
zone_segno = GET_SEGNO(sbi, zone_block);
- zone_secno = GET_SEC_FROM_SEG(sbi, zone_segno);
-
- if (zone_segno >= MAIN_SEGS(sbi))
- return 0;
/*
* Skip check of zones cursegs point to, since
* fix_curseg_write_pointer() checks them.
*/
- for (i = 0; i < NO_CHECK_TYPE; i++)
- if (zone_secno == GET_SEC_FROM_SEG(sbi,
- CURSEG_I(sbi, i)->segno))
- return 0;
+ if (zone_segno >= MAIN_SEGS(sbi) ||
+ IS_CURSEC(sbi, GET_SEC_FROM_SEG(sbi, zone_segno)))
+ return 0;
/*
- * Get last valid block of the zone.
+ * Get # of valid block of the zone.
*/
- last_valid_block = zone_block - 1;
- for (s = sbi->segs_per_sec - 1; s >= 0; s--) {
- segno = zone_segno + s;
- se = get_seg_entry(sbi, segno);
- for (b = sbi->blocks_per_seg - 1; b >= 0; b--)
- if (f2fs_test_bit(b, se->cur_valid_map)) {
- last_valid_block = START_BLOCK(sbi, segno) + b;
- break;
- }
- if (last_valid_block >= zone_block)
- break;
- }
+ valid_block_cnt = get_valid_blocks(sbi, zone_segno, true);
- /*
- * When safely unmounted in the previous mount, we can trust write
- * pointers. Otherwise, finish zones.
- */
- if (is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
- /*
- * The write pointer matches with the valid blocks or
- * already points to the end of the zone.
- */
- if ((last_valid_block + 1 == wp_block) ||
- (zone->wp == zone->start + zone->len))
- return 0;
- }
+ if ((!valid_block_cnt && zone->cond == BLK_ZONE_COND_EMPTY) ||
+ (valid_block_cnt && zone->cond == BLK_ZONE_COND_FULL))
+ return 0;
- if (last_valid_block + 1 == zone_block) {
- if (is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
- /*
- * If there is no valid block in the zone and if write
- * pointer is not at zone start, reset the write
- * pointer.
- */
- f2fs_notice(sbi,
- "Zone without valid block has non-zero write "
- "pointer. Reset the write pointer: wp[0x%x,0x%x]",
- wp_segno, wp_blkoff);
- }
+ if (!valid_block_cnt) {
+ f2fs_notice(sbi, "Zone without valid block has non-zero write "
+ "pointer. Reset the write pointer: cond[0x%x]",
+ zone->cond);
ret = __f2fs_issue_discard_zone(sbi, fdev->bdev, zone_block,
zone->len >> log_sectors_per_block);
if (ret)
f2fs_err(sbi, "Discard zone failed: %s (errno=%d)",
fdev->path, ret);
-
return ret;
}
@@ -4957,10 +4918,8 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
* selected for write operation until it get discarded.
*/
f2fs_notice(sbi, "Valid blocks are not aligned with write "
- "pointer: valid block[0x%x,0x%x] wp[0x%x,0x%x]",
- GET_SEGNO(sbi, last_valid_block),
- GET_BLKOFF_FROM_SEG0(sbi, last_valid_block),
- wp_segno, wp_blkoff);
+ "pointer: valid block[0x%x,0x%x] cond[0x%x]",
+ zone_segno, valid_block_cnt, zone->cond);
ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,
zone->start, zone->len, GFP_NOFS);
--
2.43.0.rc2.451.g8631bc7472-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new
2023-12-04 18:04 [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new Jaegeuk Kim
` (2 preceding siblings ...)
2023-12-04 18:04 ` [f2fs-dev] [PATCH 4/4] f2fs: let's finish or reset zones all the time Jaegeuk Kim
@ 2023-12-04 18:53 ` Daeho Jeong
2023-12-14 20:50 ` patchwork-bot+f2fs
4 siblings, 0 replies; 10+ messages in thread
From: Daeho Jeong @ 2023-12-04 18:53 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel
LGTM
On Mon, Dec 4, 2023 at 10:06 AM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> If fsck can allocate a new zone, it'd be better to use that instead of
> allocating a new one.
>
> And, it modifies kernel messages.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/segment.c | 33 +++++++++++++++++----------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 08e2f44a1264..9081c9af977a 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -4949,20 +4949,18 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
> return ret;
> }
>
> - if (is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {
> - /*
> - * If there are valid blocks and the write pointer doesn't match
> - * with them, we need to report the inconsistency and fill
> - * the zone till the end to close the zone. This inconsistency
> - * does not cause write error because the zone will not be
> - * selected for write operation until it get discarded.
> - */
> - f2fs_notice(sbi, "Valid blocks are not aligned with write "
> + /*
> + * If there are valid blocks and the write pointer doesn't match
> + * with them, we need to report the inconsistency and fill
> + * the zone till the end to close the zone. This inconsistency
> + * does not cause write error because the zone will not be
> + * selected for write operation until it get discarded.
> + */
> + f2fs_notice(sbi, "Valid blocks are not aligned with write "
> "pointer: valid block[0x%x,0x%x] wp[0x%x,0x%x]",
> GET_SEGNO(sbi, last_valid_block),
> GET_BLKOFF_FROM_SEG0(sbi, last_valid_block),
> wp_segno, wp_blkoff);
> - }
>
> ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,
> zone->start, zone->len, GFP_NOFS);
> @@ -5053,15 +5051,18 @@ static int fix_curseg_write_pointer(struct f2fs_sb_info *sbi, int type)
> f2fs_notice(sbi, "Unaligned curseg[%d] with write pointer: "
> "curseg[0x%x,0x%x] wp[0x%x,0x%x]", type, cs->segno,
> cs->next_blkoff, wp_segno, wp_blkoff);
> - } else {
> - f2fs_notice(sbi, "Not successfully unmounted in the previous "
> - "mount");
> }
>
> - f2fs_notice(sbi, "Assign new section to curseg[%d]: "
> - "curseg[0x%x,0x%x]", type, cs->segno, cs->next_blkoff);
> + /* Allocate a new section if it's not new. */
> + if (cs->next_blkoff) {
> + unsigned int old_segno = cs->segno, old_blkoff = cs->next_blkoff;
>
> - f2fs_allocate_new_section(sbi, type, true);
> + f2fs_allocate_new_section(sbi, type, true);
> + f2fs_notice(sbi, "Assign new section to curseg[%d]: "
> + "[0x%x,0x%x] -> [0x%x,0x%x]",
> + type, old_segno, old_blkoff,
> + cs->segno, cs->next_blkoff);
> + }
>
> /* check consistency of the zone curseg pointed to */
> if (check_zone_write_pointer(sbi, zbd, &zone))
> --
> 2.43.0.rc2.451.g8631bc7472-goog
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new
2023-12-04 18:04 [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new Jaegeuk Kim
` (3 preceding siblings ...)
2023-12-04 18:53 ` [f2fs-dev] [PATCH 1/4] f2fs: allocate new section if it's not new Daeho Jeong
@ 2023-12-14 20:50 ` patchwork-bot+f2fs
4 siblings, 0 replies; 10+ messages in thread
From: patchwork-bot+f2fs @ 2023-12-14 20:50 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <jaegeuk@kernel.org>:
On Mon, 4 Dec 2023 10:04:25 -0800 you wrote:
> If fsck can allocate a new zone, it'd be better to use that instead of
> allocating a new one.
>
> And, it modifies kernel messages.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
>
> [...]
Here is the summary with links:
- [f2fs-dev,1/4] f2fs: allocate new section if it's not new
https://git.kernel.org/jaegeuk/f2fs/c/15a76c8014f9
- [f2fs-dev,2/4] f2fs: fix write pointers on zoned device after roll forward
https://git.kernel.org/jaegeuk/f2fs/c/9dad4d964291
- [f2fs-dev,3/4] f2fs: check write pointers when checkpoint=disable
https://git.kernel.org/jaegeuk/f2fs/c/aca90eea8a90
- [f2fs-dev,4/4] f2fs: let's finish or reset zones all the time
(no matching commit)
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread