linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] f2fs: relax sanity check if checkpoint is corrupted
@ 2023-04-07 18:15 Jaegeuk Kim
  2023-04-12 16:17 ` [PATCH v2] " Jaegeuk Kim
  0 siblings, 1 reply; 7+ messages in thread
From: Jaegeuk Kim @ 2023-04-07 18:15 UTC (permalink / raw)
  To: linux-kernel, linux-f2fs-devel; +Cc: Jaegeuk Kim

1. extent_cache
 - let's drop the largest extent_cache
2. invalidate_block
 - don't show the warnings

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fs/f2fs/checkpoint.c   |  5 +++++
 fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 5774076d7ca3..73ae4e85e70d 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
 	se = get_seg_entry(sbi, segno);
 
 	exist = f2fs_test_bit(offset, se->cur_valid_map);
+
+	/* skip, if we already have an error in checkpoint. */
+	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG))
+		return exist;
+
 	if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
 		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
 			 blkaddr, exist);
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 9a8153895d20..bea6ab9d846a 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
 {
 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	struct f2fs_inode_info *fi = F2FS_I(inode);
+	struct extent_tree *et = fi->extent_tree[EX_READ];
 	struct extent_info *ei;
 
-	if (!fi->extent_tree[EX_READ])
+	if (!et)
+		return true;
+
+	ei = &et->largest;
+	if (!ei->len)
 		return true;
 
-	ei = &fi->extent_tree[EX_READ]->largest;
+	/* Let's drop, if checkpoint got corrupted. */
+	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
+		ei->len = 0;
+		et->largest_updated = true;
+		return true;
+	}
 
-	if (ei->len &&
-		(!f2fs_is_valid_blkaddr(sbi, ei->blk,
-					DATA_GENERIC_ENHANCE) ||
-		!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
-					DATA_GENERIC_ENHANCE))) {
+	if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
+	    !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
+					DATA_GENERIC_ENHANCE)) {
 		set_sbi_flag(sbi, SBI_NEED_FSCK);
 		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
 			  __func__, inode->i_ino,
-- 
2.40.0.577.gac1e443424-goog


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH v2] f2fs: relax sanity check if checkpoint is corrupted
  2023-04-07 18:15 [PATCH] f2fs: relax sanity check if checkpoint is corrupted Jaegeuk Kim
@ 2023-04-12 16:17 ` Jaegeuk Kim
  2023-04-13 15:28   ` [f2fs-dev] " Chao Yu
  2023-04-13 22:57   ` [f2fs-dev] [PATCH v3] " Jaegeuk Kim
  0 siblings, 2 replies; 7+ messages in thread
From: Jaegeuk Kim @ 2023-04-12 16:17 UTC (permalink / raw)
  To: linux-kernel, linux-f2fs-devel

1. extent_cache
 - let's drop the largest extent_cache
2. invalidate_block
 - don't show the warnings

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

 Change log from v1:
  - add one more case to skip the error message

 fs/f2fs/checkpoint.c   | 10 ++++++++++
 fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 448ecf5000b8..64b3860f50ee 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
 	se = get_seg_entry(sbi, segno);
 
 	exist = f2fs_test_bit(offset, se->cur_valid_map);
+
+	/* skip data, if we already have an error in checkpoint. */
+	if (unlikely(f2fs_cp_error(sbi)))
+		return exist;
+
 	if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
 		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
 			 blkaddr, exist);
@@ -202,6 +207,11 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
 	case DATA_GENERIC_ENHANCE_UPDATE:
 		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
 				blkaddr < MAIN_BLKADDR(sbi))) {
+
+			/* Skip to emit an error message. */
+			if (unlikely(f2fs_cp_error(sbi)))
+				return false;
+
 			f2fs_warn(sbi, "access invalid blkaddr:%u",
 				  blkaddr);
 			set_sbi_flag(sbi, SBI_NEED_FSCK);
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 9a8153895d20..bea6ab9d846a 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
 {
 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	struct f2fs_inode_info *fi = F2FS_I(inode);
+	struct extent_tree *et = fi->extent_tree[EX_READ];
 	struct extent_info *ei;
 
-	if (!fi->extent_tree[EX_READ])
+	if (!et)
+		return true;
+
+	ei = &et->largest;
+	if (!ei->len)
 		return true;
 
-	ei = &fi->extent_tree[EX_READ]->largest;
+	/* Let's drop, if checkpoint got corrupted. */
+	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
+		ei->len = 0;
+		et->largest_updated = true;
+		return true;
+	}
 
-	if (ei->len &&
-		(!f2fs_is_valid_blkaddr(sbi, ei->blk,
-					DATA_GENERIC_ENHANCE) ||
-		!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
-					DATA_GENERIC_ENHANCE))) {
+	if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
+	    !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
+					DATA_GENERIC_ENHANCE)) {
 		set_sbi_flag(sbi, SBI_NEED_FSCK);
 		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
 			  __func__, inode->i_ino,
-- 
2.40.0.577.gac1e443424-goog


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [f2fs-dev] [PATCH v2] f2fs: relax sanity check if checkpoint is corrupted
  2023-04-12 16:17 ` [PATCH v2] " Jaegeuk Kim
@ 2023-04-13 15:28   ` Chao Yu
  2023-04-13 15:52     ` Jaegeuk Kim
  2023-04-13 22:57   ` [f2fs-dev] [PATCH v3] " Jaegeuk Kim
  1 sibling, 1 reply; 7+ messages in thread
From: Chao Yu @ 2023-04-13 15:28 UTC (permalink / raw)
  To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel

On 2023/4/13 0:17, Jaegeuk Kim wrote:
> 1. extent_cache
>   - let's drop the largest extent_cache
> 2. invalidate_block
>   - don't show the warnings
> 
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> 
>   Change log from v1:
>    - add one more case to skip the error message
> 
>   fs/f2fs/checkpoint.c   | 10 ++++++++++
>   fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
>   2 files changed, 25 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
> index 448ecf5000b8..64b3860f50ee 100644
> --- a/fs/f2fs/checkpoint.c
> +++ b/fs/f2fs/checkpoint.c
> @@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
>   	se = get_seg_entry(sbi, segno);
>   
>   	exist = f2fs_test_bit(offset, se->cur_valid_map);
> +
> +	/* skip data, if we already have an error in checkpoint. */
> +	if (unlikely(f2fs_cp_error(sbi)))
> +		return exist;
> +
>   	if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
>   		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
>   			 blkaddr, exist);
> @@ -202,6 +207,11 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
>   	case DATA_GENERIC_ENHANCE_UPDATE:
>   		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
>   				blkaddr < MAIN_BLKADDR(sbi))) {
> +
> +			/* Skip to emit an error message. */
> +			if (unlikely(f2fs_cp_error(sbi)))
> +				return false;
> +
>   			f2fs_warn(sbi, "access invalid blkaddr:%u",
>   				  blkaddr);
>   			set_sbi_flag(sbi, SBI_NEED_FSCK);
> diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
> index 9a8153895d20..bea6ab9d846a 100644
> --- a/fs/f2fs/extent_cache.c
> +++ b/fs/f2fs/extent_cache.c
> @@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
>   {
>   	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
>   	struct f2fs_inode_info *fi = F2FS_I(inode);
> +	struct extent_tree *et = fi->extent_tree[EX_READ];
>   	struct extent_info *ei;
>   
> -	if (!fi->extent_tree[EX_READ])
> +	if (!et)
> +		return true;
> +
> +	ei = &et->largest;
> +	if (!ei->len)
>   		return true;
>   
> -	ei = &fi->extent_tree[EX_READ]->largest;
> +	/* Let's drop, if checkpoint got corrupted. */
> +	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
> +		ei->len = 0;
> +		et->largest_updated = true;

Thsi field indicates whether it is needed to update largest extent into
inode page, since cp_error is unrecoverable, it seems we don't needed to
update it.

Thanks,

> +		return true;
> +	}
>   
> -	if (ei->len &&
> -		(!f2fs_is_valid_blkaddr(sbi, ei->blk,
> -					DATA_GENERIC_ENHANCE) ||
> -		!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
> -					DATA_GENERIC_ENHANCE))) {
> +	if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
> +	    !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
> +					DATA_GENERIC_ENHANCE)) {
>   		set_sbi_flag(sbi, SBI_NEED_FSCK);
>   		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
>   			  __func__, inode->i_ino,

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [f2fs-dev] [PATCH v2] f2fs: relax sanity check if checkpoint is corrupted
  2023-04-13 15:28   ` [f2fs-dev] " Chao Yu
@ 2023-04-13 15:52     ` Jaegeuk Kim
  2023-04-14  1:18       ` Chao Yu
  0 siblings, 1 reply; 7+ messages in thread
From: Jaegeuk Kim @ 2023-04-13 15:52 UTC (permalink / raw)
  To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel

On 04/13, Chao Yu wrote:
> On 2023/4/13 0:17, Jaegeuk Kim wrote:
> > 1. extent_cache
> >   - let's drop the largest extent_cache
> > 2. invalidate_block
> >   - don't show the warnings
> > 
> > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > ---
> > 
> >   Change log from v1:
> >    - add one more case to skip the error message
> > 
> >   fs/f2fs/checkpoint.c   | 10 ++++++++++
> >   fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
> >   2 files changed, 25 insertions(+), 7 deletions(-)
> > 
> > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
> > index 448ecf5000b8..64b3860f50ee 100644
> > --- a/fs/f2fs/checkpoint.c
> > +++ b/fs/f2fs/checkpoint.c
> > @@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
> >   	se = get_seg_entry(sbi, segno);
> >   	exist = f2fs_test_bit(offset, se->cur_valid_map);
> > +
> > +	/* skip data, if we already have an error in checkpoint. */
> > +	if (unlikely(f2fs_cp_error(sbi)))
> > +		return exist;
> > +
> >   	if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
> >   		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
> >   			 blkaddr, exist);
> > @@ -202,6 +207,11 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
> >   	case DATA_GENERIC_ENHANCE_UPDATE:
> >   		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
> >   				blkaddr < MAIN_BLKADDR(sbi))) {
> > +
> > +			/* Skip to emit an error message. */
> > +			if (unlikely(f2fs_cp_error(sbi)))
> > +				return false;
> > +
> >   			f2fs_warn(sbi, "access invalid blkaddr:%u",
> >   				  blkaddr);
> >   			set_sbi_flag(sbi, SBI_NEED_FSCK);
> > diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
> > index 9a8153895d20..bea6ab9d846a 100644
> > --- a/fs/f2fs/extent_cache.c
> > +++ b/fs/f2fs/extent_cache.c
> > @@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
> >   {
> >   	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
> >   	struct f2fs_inode_info *fi = F2FS_I(inode);
> > +	struct extent_tree *et = fi->extent_tree[EX_READ];
> >   	struct extent_info *ei;
> > -	if (!fi->extent_tree[EX_READ])
> > +	if (!et)
> > +		return true;
> > +
> > +	ei = &et->largest;
> > +	if (!ei->len)
> >   		return true;
> > -	ei = &fi->extent_tree[EX_READ]->largest;
> > +	/* Let's drop, if checkpoint got corrupted. */
> > +	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
> > +		ei->len = 0;
> > +		et->largest_updated = true;
> 
> Thsi field indicates whether it is needed to update largest extent into
> inode page, since cp_error is unrecoverable, it seems we don't needed to
> update it.

Intention is to avoid any assumption like that, but sync the same logic when
updating this.

> 
> Thanks,
> 
> > +		return true;
> > +	}
> > -	if (ei->len &&
> > -		(!f2fs_is_valid_blkaddr(sbi, ei->blk,
> > -					DATA_GENERIC_ENHANCE) ||
> > -		!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
> > -					DATA_GENERIC_ENHANCE))) {
> > +	if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
> > +	    !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
> > +					DATA_GENERIC_ENHANCE)) {
> >   		set_sbi_flag(sbi, SBI_NEED_FSCK);
> >   		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
> >   			  __func__, inode->i_ino,

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [f2fs-dev] [PATCH v3] f2fs: relax sanity check if checkpoint is corrupted
  2023-04-12 16:17 ` [PATCH v2] " Jaegeuk Kim
  2023-04-13 15:28   ` [f2fs-dev] " Chao Yu
@ 2023-04-13 22:57   ` Jaegeuk Kim
  2023-04-14  1:23     ` Chao Yu
  1 sibling, 1 reply; 7+ messages in thread
From: Jaegeuk Kim @ 2023-04-13 22:57 UTC (permalink / raw)
  To: linux-kernel, linux-f2fs-devel

1. extent_cache
 - let's drop the largest extent_cache
2. invalidate_block
 - don't show the warnings

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

 change log from v1:
  - cover f2fs_read_multi_pages

 fs/f2fs/checkpoint.c   | 10 ++++++++++
 fs/f2fs/data.c         |  4 ++++
 fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 448ecf5000b8..64b3860f50ee 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
 	se = get_seg_entry(sbi, segno);
 
 	exist = f2fs_test_bit(offset, se->cur_valid_map);
+
+	/* skip data, if we already have an error in checkpoint. */
+	if (unlikely(f2fs_cp_error(sbi)))
+		return exist;
+
 	if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
 		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
 			 blkaddr, exist);
@@ -202,6 +207,11 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
 	case DATA_GENERIC_ENHANCE_UPDATE:
 		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
 				blkaddr < MAIN_BLKADDR(sbi))) {
+
+			/* Skip to emit an error message. */
+			if (unlikely(f2fs_cp_error(sbi)))
+				return false;
+
 			f2fs_warn(sbi, "access invalid blkaddr:%u",
 				  blkaddr);
 			set_sbi_flag(sbi, SBI_NEED_FSCK);
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f21e3aaa2474..8df225014304 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2237,6 +2237,10 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,
 	if (ret)
 		goto out;
 
+	if (unlikely(f2fs_cp_error(sbi))) {
+		ret = -EIO;
+		goto out_put_dnode;
+	}
 	f2fs_bug_on(sbi, dn.data_blkaddr != COMPRESS_ADDR);
 
 skip_reading_dnode:
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 9a8153895d20..bea6ab9d846a 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
 {
 	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	struct f2fs_inode_info *fi = F2FS_I(inode);
+	struct extent_tree *et = fi->extent_tree[EX_READ];
 	struct extent_info *ei;
 
-	if (!fi->extent_tree[EX_READ])
+	if (!et)
+		return true;
+
+	ei = &et->largest;
+	if (!ei->len)
 		return true;
 
-	ei = &fi->extent_tree[EX_READ]->largest;
+	/* Let's drop, if checkpoint got corrupted. */
+	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
+		ei->len = 0;
+		et->largest_updated = true;
+		return true;
+	}
 
-	if (ei->len &&
-		(!f2fs_is_valid_blkaddr(sbi, ei->blk,
-					DATA_GENERIC_ENHANCE) ||
-		!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
-					DATA_GENERIC_ENHANCE))) {
+	if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
+	    !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
+					DATA_GENERIC_ENHANCE)) {
 		set_sbi_flag(sbi, SBI_NEED_FSCK);
 		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
 			  __func__, inode->i_ino,
-- 
2.40.0.634.g4ca3ef3211-goog


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [f2fs-dev] [PATCH v2] f2fs: relax sanity check if checkpoint is corrupted
  2023-04-13 15:52     ` Jaegeuk Kim
@ 2023-04-14  1:18       ` Chao Yu
  0 siblings, 0 replies; 7+ messages in thread
From: Chao Yu @ 2023-04-14  1:18 UTC (permalink / raw)
  To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel

On 2023/4/13 23:52, Jaegeuk Kim wrote:
> On 04/13, Chao Yu wrote:
>> On 2023/4/13 0:17, Jaegeuk Kim wrote:
>>> 1. extent_cache
>>>    - let's drop the largest extent_cache
>>> 2. invalidate_block
>>>    - don't show the warnings
>>>
>>> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
>>> ---
>>>
>>>    Change log from v1:
>>>     - add one more case to skip the error message
>>>
>>>    fs/f2fs/checkpoint.c   | 10 ++++++++++
>>>    fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
>>>    2 files changed, 25 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
>>> index 448ecf5000b8..64b3860f50ee 100644
>>> --- a/fs/f2fs/checkpoint.c
>>> +++ b/fs/f2fs/checkpoint.c
>>> @@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
>>>    	se = get_seg_entry(sbi, segno);
>>>    	exist = f2fs_test_bit(offset, se->cur_valid_map);
>>> +
>>> +	/* skip data, if we already have an error in checkpoint. */
>>> +	if (unlikely(f2fs_cp_error(sbi)))
>>> +		return exist;
>>> +
>>>    	if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
>>>    		f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
>>>    			 blkaddr, exist);
>>> @@ -202,6 +207,11 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
>>>    	case DATA_GENERIC_ENHANCE_UPDATE:
>>>    		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
>>>    				blkaddr < MAIN_BLKADDR(sbi))) {
>>> +
>>> +			/* Skip to emit an error message. */
>>> +			if (unlikely(f2fs_cp_error(sbi)))
>>> +				return false;
>>> +
>>>    			f2fs_warn(sbi, "access invalid blkaddr:%u",
>>>    				  blkaddr);
>>>    			set_sbi_flag(sbi, SBI_NEED_FSCK);
>>> diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
>>> index 9a8153895d20..bea6ab9d846a 100644
>>> --- a/fs/f2fs/extent_cache.c
>>> +++ b/fs/f2fs/extent_cache.c
>>> @@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
>>>    {
>>>    	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
>>>    	struct f2fs_inode_info *fi = F2FS_I(inode);
>>> +	struct extent_tree *et = fi->extent_tree[EX_READ];
>>>    	struct extent_info *ei;
>>> -	if (!fi->extent_tree[EX_READ])
>>> +	if (!et)
>>> +		return true;
>>> +
>>> +	ei = &et->largest;
>>> +	if (!ei->len)
>>>    		return true;
>>> -	ei = &fi->extent_tree[EX_READ]->largest;
>>> +	/* Let's drop, if checkpoint got corrupted. */
>>> +	if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
>>> +		ei->len = 0;
>>> +		et->largest_updated = true;
>>
>> Thsi field indicates whether it is needed to update largest extent into
>> inode page, since cp_error is unrecoverable, it seems we don't needed to
>> update it.
> 
> Intention is to avoid any assumption like that, but sync the same logic when
> updating this.

Sure, fine to me.

Reviewed-by: Chao Yu <chao@kernel.org>

Thanks,

> 
>>
>> Thanks,
>>
>>> +		return true;
>>> +	}
>>> -	if (ei->len &&
>>> -		(!f2fs_is_valid_blkaddr(sbi, ei->blk,
>>> -					DATA_GENERIC_ENHANCE) ||
>>> -		!f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
>>> -					DATA_GENERIC_ENHANCE))) {
>>> +	if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
>>> +	    !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
>>> +					DATA_GENERIC_ENHANCE)) {
>>>    		set_sbi_flag(sbi, SBI_NEED_FSCK);
>>>    		f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
>>>    			  __func__, inode->i_ino,

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [f2fs-dev] [PATCH v3] f2fs: relax sanity check if checkpoint is corrupted
  2023-04-13 22:57   ` [f2fs-dev] [PATCH v3] " Jaegeuk Kim
@ 2023-04-14  1:23     ` Chao Yu
  0 siblings, 0 replies; 7+ messages in thread
From: Chao Yu @ 2023-04-14  1:23 UTC (permalink / raw)
  To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel

On 2023/4/14 6:57, Jaegeuk Kim wrote:
> 1. extent_cache
>   - let's drop the largest extent_cache
> 2. invalidate_block
>   - don't show the warnings
> 
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

Oh, just notice v3.

Reviewed-by: Chao Yu <chao@kernel.org>

Thanks,

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-04-14  1:23 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-07 18:15 [PATCH] f2fs: relax sanity check if checkpoint is corrupted Jaegeuk Kim
2023-04-12 16:17 ` [PATCH v2] " Jaegeuk Kim
2023-04-13 15:28   ` [f2fs-dev] " Chao Yu
2023-04-13 15:52     ` Jaegeuk Kim
2023-04-14  1:18       ` Chao Yu
2023-04-13 22:57   ` [f2fs-dev] [PATCH v3] " Jaegeuk Kim
2023-04-14  1:23     ` 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).