* [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer
@ 2024-08-08 23:32 Jaegeuk Kim
2024-08-12 18:41 ` Daeho Jeong
2024-08-14 10:07 ` Chao Yu
0 siblings, 2 replies; 5+ messages in thread
From: Jaegeuk Kim @ 2024-08-08 23:32 UTC (permalink / raw)
To: linux-f2fs-devel; +Cc: Jaegeuk Kim
It'll crach fsck.f2fs. Even, let's keep the write pointers and just finish it.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fsck/fsck.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/fsck/fsck.c b/fsck/fsck.c
index a18bee9d0c3b..5fe8ad4ef327 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -3299,8 +3299,9 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
"segment 0x%x", zone_segno);
ret = f2fs_reset_zone(wpd->dev_index, blkz);
if (ret) {
- printf("[FSCK] Write pointer reset "
- "failed: %s\n", dev->path);
+ ASSERT_MSG("Write pointer reset "
+ "failed: %s, err=%d\n",
+ dev->path, ret);
return ret;
}
fsck->chk.wp_fixed = 1;
@@ -3326,18 +3327,13 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
ret = f2fs_finish_zone(wpd->dev_index, blkz);
if (ret) {
- u64 fill_sects = blk_zone_length(blkz) -
- (blk_zone_wp_sector(blkz) - blk_zone_sector(blkz));
- printf("[FSCK] Finishing zone failed: %s\n", dev->path);
- ret = dev_fill(NULL, wp_block * F2FS_BLKSIZE,
- (fill_sects >> log_sectors_per_block) * F2FS_BLKSIZE);
- if (ret)
- printf("[FSCK] Fill up zone failed: %s\n", dev->path);
+ ASSERT_MSG("Finishing zone failed: %s, err=%d\n",
+ dev->path, ret);
+ return ret;
}
- if (!ret)
- fsck->chk.wp_fixed = 1;
- return ret;
+ fsck->chk.wp_fixed = 1;
+ return 0;
}
static void fix_wp_sit_alignment(struct f2fs_sb_info *sbi)
--
2.46.0.76.ge559c4bf1a-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] 5+ messages in thread* Re: [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer
2024-08-08 23:32 [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer Jaegeuk Kim
@ 2024-08-12 18:41 ` Daeho Jeong
2024-08-12 19:56 ` Jaegeuk Kim
2024-08-14 10:07 ` Chao Yu
1 sibling, 1 reply; 5+ messages in thread
From: Daeho Jeong @ 2024-08-12 18:41 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-f2fs-devel
On Thu, Aug 8, 2024 at 4:34 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> It'll crach fsck.f2fs. Even, let's keep the write pointers and just finish it.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fsck/fsck.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/fsck/fsck.c b/fsck/fsck.c
> index a18bee9d0c3b..5fe8ad4ef327 100644
> --- a/fsck/fsck.c
> +++ b/fsck/fsck.c
> @@ -3299,8 +3299,9 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
> "segment 0x%x", zone_segno);
> ret = f2fs_reset_zone(wpd->dev_index, blkz);
> if (ret) {
> - printf("[FSCK] Write pointer reset "
> - "failed: %s\n", dev->path);
> + ASSERT_MSG("Write pointer reset "
> + "failed: %s, err=%d\n",
> + dev->path, ret);
> return ret;
> }
> fsck->chk.wp_fixed = 1;
> @@ -3326,18 +3327,13 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
>
> ret = f2fs_finish_zone(wpd->dev_index, blkz);
> if (ret) {
> - u64 fill_sects = blk_zone_length(blkz) -
> - (blk_zone_wp_sector(blkz) - blk_zone_sector(blkz));
> - printf("[FSCK] Finishing zone failed: %s\n", dev->path);
> - ret = dev_fill(NULL, wp_block * F2FS_BLKSIZE,
> - (fill_sects >> log_sectors_per_block) * F2FS_BLKSIZE);
This was for zoned devices that don't support the FINISH command. If
NULL buf is the problem, how about using zero value filled buffer?
> - if (ret)
> - printf("[FSCK] Fill up zone failed: %s\n", dev->path);
> + ASSERT_MSG("Finishing zone failed: %s, err=%d\n",
> + dev->path, ret);
> + return ret;
> }
>
> - if (!ret)
> - fsck->chk.wp_fixed = 1;
> - return ret;
> + fsck->chk.wp_fixed = 1;
> + return 0;
> }
>
> static void fix_wp_sit_alignment(struct f2fs_sb_info *sbi)
> --
> 2.46.0.76.ge559c4bf1a-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] 5+ messages in thread* Re: [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer
2024-08-12 18:41 ` Daeho Jeong
@ 2024-08-12 19:56 ` Jaegeuk Kim
2024-08-13 17:36 ` Daeho Jeong
0 siblings, 1 reply; 5+ messages in thread
From: Jaegeuk Kim @ 2024-08-12 19:56 UTC (permalink / raw)
To: Daeho Jeong; +Cc: linux-f2fs-devel
On 08/12, Daeho Jeong wrote:
> On Thu, Aug 8, 2024 at 4:34 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
> >
> > It'll crach fsck.f2fs. Even, let's keep the write pointers and just finish it.
> >
> > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > ---
> > fsck/fsck.c | 20 ++++++++------------
> > 1 file changed, 8 insertions(+), 12 deletions(-)
> >
> > diff --git a/fsck/fsck.c b/fsck/fsck.c
> > index a18bee9d0c3b..5fe8ad4ef327 100644
> > --- a/fsck/fsck.c
> > +++ b/fsck/fsck.c
> > @@ -3299,8 +3299,9 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
> > "segment 0x%x", zone_segno);
> > ret = f2fs_reset_zone(wpd->dev_index, blkz);
> > if (ret) {
> > - printf("[FSCK] Write pointer reset "
> > - "failed: %s\n", dev->path);
> > + ASSERT_MSG("Write pointer reset "
> > + "failed: %s, err=%d\n",
> > + dev->path, ret);
> > return ret;
> > }
> > fsck->chk.wp_fixed = 1;
> > @@ -3326,18 +3327,13 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
> >
> > ret = f2fs_finish_zone(wpd->dev_index, blkz);
> > if (ret) {
> > - u64 fill_sects = blk_zone_length(blkz) -
> > - (blk_zone_wp_sector(blkz) - blk_zone_sector(blkz));
> > - printf("[FSCK] Finishing zone failed: %s\n", dev->path);
> > - ret = dev_fill(NULL, wp_block * F2FS_BLKSIZE,
> > - (fill_sects >> log_sectors_per_block) * F2FS_BLKSIZE);
>
> This was for zoned devices that don't support the FINISH command. If
> NULL buf is the problem, how about using zero value filled buffer?
Do we really need to fill them, if it'll be reset later before use?
>
> > - if (ret)
> > - printf("[FSCK] Fill up zone failed: %s\n", dev->path);
> > + ASSERT_MSG("Finishing zone failed: %s, err=%d\n",
> > + dev->path, ret);
> > + return ret;
> > }
> >
> > - if (!ret)
> > - fsck->chk.wp_fixed = 1;
> > - return ret;
> > + fsck->chk.wp_fixed = 1;
> > + return 0;
> > }
> >
> > static void fix_wp_sit_alignment(struct f2fs_sb_info *sbi)
> > --
> > 2.46.0.76.ge559c4bf1a-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] 5+ messages in thread* Re: [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer
2024-08-12 19:56 ` Jaegeuk Kim
@ 2024-08-13 17:36 ` Daeho Jeong
0 siblings, 0 replies; 5+ messages in thread
From: Daeho Jeong @ 2024-08-13 17:36 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-f2fs-devel
On Mon, Aug 12, 2024 at 12:56 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> On 08/12, Daeho Jeong wrote:
> > On Thu, Aug 8, 2024 at 4:34 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
> > >
> > > It'll crach fsck.f2fs. Even, let's keep the write pointers and just finish it.
> > >
> > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > > ---
> > > fsck/fsck.c | 20 ++++++++------------
> > > 1 file changed, 8 insertions(+), 12 deletions(-)
> > >
> > > diff --git a/fsck/fsck.c b/fsck/fsck.c
> > > index a18bee9d0c3b..5fe8ad4ef327 100644
> > > --- a/fsck/fsck.c
> > > +++ b/fsck/fsck.c
> > > @@ -3299,8 +3299,9 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
> > > "segment 0x%x", zone_segno);
> > > ret = f2fs_reset_zone(wpd->dev_index, blkz);
> > > if (ret) {
> > > - printf("[FSCK] Write pointer reset "
> > > - "failed: %s\n", dev->path);
> > > + ASSERT_MSG("Write pointer reset "
> > > + "failed: %s, err=%d\n",
> > > + dev->path, ret);
> > > return ret;
> > > }
> > > fsck->chk.wp_fixed = 1;
> > > @@ -3326,18 +3327,13 @@ static int chk_and_fix_wp_with_sit(int UNUSED(i), void *blkzone, void *opaque)
> > >
> > > ret = f2fs_finish_zone(wpd->dev_index, blkz);
> > > if (ret) {
> > > - u64 fill_sects = blk_zone_length(blkz) -
> > > - (blk_zone_wp_sector(blkz) - blk_zone_sector(blkz));
> > > - printf("[FSCK] Finishing zone failed: %s\n", dev->path);
> > > - ret = dev_fill(NULL, wp_block * F2FS_BLKSIZE,
> > > - (fill_sects >> log_sectors_per_block) * F2FS_BLKSIZE);
> >
> > This was for zoned devices that don't support the FINISH command. If
> > NULL buf is the problem, how about using zero value filled buffer?
>
> Do we really need to fill them, if it'll be reset later before use?
That's for devices not supporting the FINISH command. Let me make
another patch for it.
>
> >
> > > - if (ret)
> > > - printf("[FSCK] Fill up zone failed: %s\n", dev->path);
> > > + ASSERT_MSG("Finishing zone failed: %s, err=%d\n",
> > > + dev->path, ret);
> > > + return ret;
> > > }
> > >
> > > - if (!ret)
> > > - fsck->chk.wp_fixed = 1;
> > > - return ret;
> > > + fsck->chk.wp_fixed = 1;
> > > + return 0;
> > > }
> > >
> > > static void fix_wp_sit_alignment(struct f2fs_sb_info *sbi)
> > > --
> > > 2.46.0.76.ge559c4bf1a-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] 5+ messages in thread
* Re: [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer
2024-08-08 23:32 [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer Jaegeuk Kim
2024-08-12 18:41 ` Daeho Jeong
@ 2024-08-14 10:07 ` Chao Yu
1 sibling, 0 replies; 5+ messages in thread
From: Chao Yu @ 2024-08-14 10:07 UTC (permalink / raw)
To: Jaegeuk Kim, linux-f2fs-devel
On 2024/8/9 7:32, Jaegeuk Kim wrote:
> It'll crach fsck.f2fs. Even, let's keep the write pointers and just finish it.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Thanks,
_______________________________________________
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] 5+ messages in thread
end of thread, other threads:[~2024-08-14 10:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-08 23:32 [f2fs-dev] [PATCH] fsck.f2fs: don't call dev_fill w/ null buffer Jaegeuk Kim
2024-08-12 18:41 ` Daeho Jeong
2024-08-12 19:56 ` Jaegeuk Kim
2024-08-13 17:36 ` Daeho Jeong
2024-08-14 10:07 ` 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).