Skip to contentSkip to conversation

f2fs: relax sanity check if checkpoint is corrupted

PATCH In review Jaegeuk Kim 2 participants 7 messages Apr 7, 2023 – Apr 14, 2023 F2FS file system

lore
Share & tools
lore

Jaegeuk Kim

author maintainer
#0 lore raw

PATCH 1/1 f2fs: relax sanity check if checkpoint is corrupted

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

---
 fs/f2fs/checkpoint.c   |  5 +++++
 fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)
fs/f2fs/checkpoint.c +5 -0
index 5774076d7ca3..73ae4e85e70d 100644
@@ -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);
fs/f2fs/extent_cache.c +15 -7
index 9a8153895d20..bea6ab9d846a 100644
@@ -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,
Signature · 1 line
2.40.0.577.gac1e443424-goog
author maintainer
#1 lore raw

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

---

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(-)
fs/f2fs/checkpoint.c +10 -0
index 448ecf5000b8..64b3860f50ee 100644
@@ -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);
fs/f2fs/extent_cache.c +15 -7
index 9a8153895d20..bea6ab9d846a 100644
@@ -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,
Signature · 8 lines
2.40.0.577.gac1e443424-goog



_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
maintainer
#2 lore raw
Quoted 57 lines · Jaegeuk Kim

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

---

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(-)
fs/f2fs/checkpoint.c +10 -0
index 448ecf5000b8..64b3860f50ee 100644
@@ -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);
fs/f2fs/extent_cache.c +3 -1
index 9a8153895d20..bea6ab9d846a 100644
@@ -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;

fs/f2fs/extent_cache.c bool sanity_check_extent_cache(struct inode *inode) · line 39

Quoted 10 lines
fs/f2fs/extent_cache.c +7 -1
+
+	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,

Quoted 14 lines
fs/f2fs/extent_cache.c +5 -5
+		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,
author maintainer
#3 lore raw
Quoted 61 lines · Chao Yu
Quoted 60 lines · Jaegeuk Kim

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

---

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(-)
fs/f2fs/checkpoint.c +10 -0
index 448ecf5000b8..64b3860f50ee 100644
@@ -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);
fs/f2fs/extent_cache.c +6 -2
index 9a8153895d20..bea6ab9d846a 100644
@@ -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;
Quoted 8 lines

fs/f2fs/extent_cache.c bool sanity_check_extent_cache(struct inode *inode) · line 39

Quoted 4 lines
fs/f2fs/extent_cache.c +4 -0
+	/* 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.

Quoted 16 lines

Thanks,

fs/f2fs/extent_cache.c bool sanity_check_extent_cache(struct inode *inode) · line 48

Quoted 13 lines
fs/f2fs/extent_cache.c +5 -5
+		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,

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer Reviewed-by
#4 lore raw
Quoted 71 lines · Jaegeuk Kim
Quoted 61 lines · Chao Yu
Quoted 60 lines · Jaegeuk Kim

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

---

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(-)
fs/f2fs/checkpoint.c +10 -0
index 448ecf5000b8..64b3860f50ee 100644
@@ -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);
fs/f2fs/extent_cache.c +6 -2
index 9a8153895d20..bea6ab9d846a 100644
@@ -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;
Quoted 8 lines

fs/f2fs/extent_cache.c bool sanity_check_extent_cache(struct inode *inode) · line 39

Quoted 4 lines
fs/f2fs/extent_cache.c +4 -0
+	/* 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.

Quoted 2 lines

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

Sure, fine to me.

Thanks,

Quoted 17 lines
Quoted 17 lines

Thanks,

Quoted 13 lines
fs/f2fs/extent_cache.c +5 -5
+		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,
author maintainer
#5 lore raw
In reply to Jaegeuk Kim

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

---

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(-)
fs/f2fs/checkpoint.c +10 -0
index 448ecf5000b8..64b3860f50ee 100644
@@ -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);
fs/f2fs/data.c +4 -0
index f21e3aaa2474..8df225014304 100644
@@ -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:
fs/f2fs/extent_cache.c +15 -7
index 9a8153895d20..bea6ab9d846a 100644
@@ -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,
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog