|
Jiri Slaby |
c5b460 |
From: Jaegeuk Kim <jaegeuk@kernel.org>
|
|
Jiri Slaby |
c5b460 |
Date: Thu, 6 Apr 2023 16:56:20 -0700
|
|
Jiri Slaby |
c5b460 |
Subject: [PATCH] f2fs: relax sanity check if checkpoint is corrupted
|
|
Jiri Slaby |
c5b460 |
References: bsc#1012628
|
|
Jiri Slaby |
c5b460 |
Patch-mainline: 6.3.4
|
|
Jiri Slaby |
c5b460 |
Git-commit: bd90c5cd339a9d7cdc609d2d6310b80dc697070d
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
[ Upstream commit bd90c5cd339a9d7cdc609d2d6310b80dc697070d ]
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
1. extent_cache
|
|
Jiri Slaby |
c5b460 |
- let's drop the largest extent_cache
|
|
Jiri Slaby |
c5b460 |
2. invalidate_block
|
|
Jiri Slaby |
c5b460 |
- don't show the warnings
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
Reviewed-by: Chao Yu <chao@kernel.org>
|
|
Jiri Slaby |
c5b460 |
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
|
|
Jiri Slaby |
c5b460 |
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
|
Jiri Slaby |
c5b460 |
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
|
Jiri Slaby |
c5b460 |
---
|
|
Jiri Slaby |
c5b460 |
fs/f2fs/checkpoint.c | 10 ++++++++++
|
|
Jiri Slaby |
c5b460 |
fs/f2fs/data.c | 4 ++++
|
|
Jiri Slaby |
c5b460 |
fs/f2fs/extent_cache.c | 22 +++++++++++++++-------
|
|
Jiri Slaby |
c5b460 |
3 files changed, 29 insertions(+), 7 deletions(-)
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
|
|
Jiri Slaby |
c5b460 |
index 96af24c3..d4c862cc 100644
|
|
Jiri Slaby |
c5b460 |
--- a/fs/f2fs/checkpoint.c
|
|
Jiri Slaby |
c5b460 |
+++ b/fs/f2fs/checkpoint.c
|
|
Jiri Slaby |
c5b460 |
@@ -152,6 +152,11 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
|
|
Jiri Slaby |
c5b460 |
se = get_seg_entry(sbi, segno);
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
exist = f2fs_test_bit(offset, se->cur_valid_map);
|
|
Jiri Slaby |
c5b460 |
+
|
|
Jiri Slaby |
c5b460 |
+ /* skip data, if we already have an error in checkpoint. */
|
|
Jiri Slaby |
c5b460 |
+ if (unlikely(f2fs_cp_error(sbi)))
|
|
Jiri Slaby |
c5b460 |
+ return exist;
|
|
Jiri Slaby |
c5b460 |
+
|
|
Jiri Slaby |
c5b460 |
if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) {
|
|
Jiri Slaby |
c5b460 |
f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
|
|
Jiri Slaby |
c5b460 |
blkaddr, exist);
|
|
Jiri Slaby |
c5b460 |
@@ -202,6 +207,11 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
|
|
Jiri Slaby |
c5b460 |
case DATA_GENERIC_ENHANCE_UPDATE:
|
|
Jiri Slaby |
c5b460 |
if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
|
|
Jiri Slaby |
c5b460 |
blkaddr < MAIN_BLKADDR(sbi))) {
|
|
Jiri Slaby |
c5b460 |
+
|
|
Jiri Slaby |
c5b460 |
+ /* Skip to emit an error message. */
|
|
Jiri Slaby |
c5b460 |
+ if (unlikely(f2fs_cp_error(sbi)))
|
|
Jiri Slaby |
c5b460 |
+ return false;
|
|
Jiri Slaby |
c5b460 |
+
|
|
Jiri Slaby |
c5b460 |
f2fs_warn(sbi, "access invalid blkaddr:%u",
|
|
Jiri Slaby |
c5b460 |
blkaddr);
|
|
Jiri Slaby |
c5b460 |
set_sbi_flag(sbi, SBI_NEED_FSCK);
|
|
Jiri Slaby |
c5b460 |
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
|
|
Jiri Slaby |
c5b460 |
index 68feb015..92bcdbd8 100644
|
|
Jiri Slaby |
c5b460 |
--- a/fs/f2fs/data.c
|
|
Jiri Slaby |
c5b460 |
+++ b/fs/f2fs/data.c
|
|
Jiri Slaby |
c5b460 |
@@ -2237,6 +2237,10 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,
|
|
Jiri Slaby |
c5b460 |
if (ret)
|
|
Jiri Slaby |
c5b460 |
goto out;
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
+ if (unlikely(f2fs_cp_error(sbi))) {
|
|
Jiri Slaby |
c5b460 |
+ ret = -EIO;
|
|
Jiri Slaby |
c5b460 |
+ goto out_put_dnode;
|
|
Jiri Slaby |
c5b460 |
+ }
|
|
Jiri Slaby |
c5b460 |
f2fs_bug_on(sbi, dn.data_blkaddr != COMPRESS_ADDR);
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
skip_reading_dnode:
|
|
Jiri Slaby |
c5b460 |
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
|
|
Jiri Slaby |
c5b460 |
index 9a815389..bea6ab9d 100644
|
|
Jiri Slaby |
c5b460 |
--- a/fs/f2fs/extent_cache.c
|
|
Jiri Slaby |
c5b460 |
+++ b/fs/f2fs/extent_cache.c
|
|
Jiri Slaby |
c5b460 |
@@ -23,18 +23,26 @@ bool sanity_check_extent_cache(struct inode *inode)
|
|
Jiri Slaby |
c5b460 |
{
|
|
Jiri Slaby |
c5b460 |
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
|
|
Jiri Slaby |
c5b460 |
struct f2fs_inode_info *fi = F2FS_I(inode);
|
|
Jiri Slaby |
c5b460 |
+ struct extent_tree *et = fi->extent_tree[EX_READ];
|
|
Jiri Slaby |
c5b460 |
struct extent_info *ei;
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
- if (!fi->extent_tree[EX_READ])
|
|
Jiri Slaby |
c5b460 |
+ if (!et)
|
|
Jiri Slaby |
c5b460 |
+ return true;
|
|
Jiri Slaby |
c5b460 |
+
|
|
Jiri Slaby |
c5b460 |
+ ei = &et->largest;
|
|
Jiri Slaby |
c5b460 |
+ if (!ei->len)
|
|
Jiri Slaby |
c5b460 |
return true;
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
- ei = &fi->extent_tree[EX_READ]->largest;
|
|
Jiri Slaby |
c5b460 |
+ /* Let's drop, if checkpoint got corrupted. */
|
|
Jiri Slaby |
c5b460 |
+ if (is_set_ckpt_flags(sbi, CP_ERROR_FLAG)) {
|
|
Jiri Slaby |
c5b460 |
+ ei->len = 0;
|
|
Jiri Slaby |
c5b460 |
+ et->largest_updated = true;
|
|
Jiri Slaby |
c5b460 |
+ return true;
|
|
Jiri Slaby |
c5b460 |
+ }
|
|
Jiri Slaby |
c5b460 |
|
|
Jiri Slaby |
c5b460 |
- if (ei->len &&
|
|
Jiri Slaby |
c5b460 |
- (!f2fs_is_valid_blkaddr(sbi, ei->blk,
|
|
Jiri Slaby |
c5b460 |
- DATA_GENERIC_ENHANCE) ||
|
|
Jiri Slaby |
c5b460 |
- !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
|
|
Jiri Slaby |
c5b460 |
- DATA_GENERIC_ENHANCE))) {
|
|
Jiri Slaby |
c5b460 |
+ if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) ||
|
|
Jiri Slaby |
c5b460 |
+ !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
|
|
Jiri Slaby |
c5b460 |
+ DATA_GENERIC_ENHANCE)) {
|
|
Jiri Slaby |
c5b460 |
set_sbi_flag(sbi, SBI_NEED_FSCK);
|
|
Jiri Slaby |
c5b460 |
f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
|
|
Jiri Slaby |
c5b460 |
__func__, inode->i_ino,
|
|
Jiri Slaby |
c5b460 |
--
|
|
Jiri Slaby |
c5b460 |
2.35.3
|
|
Jiri Slaby |
c5b460 |
|