From b98aab471ab54d8516ede21de7b3f81b7e983766 Mon Sep 17 00:00:00 2001 From: Chao Yu Date: Thu, 6 Oct 2022 23:17:27 +0800 Subject: [PATCH] fsck.f2fs: trigger repairing if filesystem has inconsistent errors In auto/preen mode, let's trigger repairing if filesystem has inconsistent errors. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim --- fsck/fsck.c | 8 ++++++-- fsck/fsck.h | 1 + fsck/mount.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++- include/f2fs_fs.h | 26 +++++++++++++++++++++++- 4 files changed, 83 insertions(+), 4 deletions(-) diff --git a/fsck/fsck.c b/fsck/fsck.c index db14859..036a834 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -3368,10 +3368,14 @@ int fsck_verify(struct f2fs_sb_info *sbi) write_checkpoints(sbi); } - if (c.abnormal_stop) { + if (c.abnormal_stop) memset(sb->s_stop_reason, 0, MAX_STOP_REASON); + + if (c.fs_errors) + memset(sb->s_errors, 0, MAX_F2FS_ERRORS); + + if (c.abnormal_stop || c.fs_errors) update_superblock(sb, SB_MASK_ALL); - } /* to return FSCK_ERROR_CORRECTED */ ret = 0; diff --git a/fsck/fsck.h b/fsck/fsck.h index 6f0b019..939450f 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -238,6 +238,7 @@ extern void update_nat_blkaddr(struct f2fs_sb_info *, nid_t, nid_t, block_t); extern void print_raw_sb_info(struct f2fs_super_block *); extern bool is_checkpoint_stop(struct f2fs_super_block *, bool); +extern bool is_inconsistent_error(struct f2fs_super_block *); extern pgoff_t current_nat_addr(struct f2fs_sb_info *, nid_t, int *); extern u32 get_free_segments(struct f2fs_sb_info *); diff --git a/fsck/mount.c b/fsck/mount.c index 913d736..c3b2806 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -612,6 +612,42 @@ void print_sb_stop_reason(struct f2fs_super_block *sb) MSG(0, "\n"); } +static char *errors_str[] = { + [ERROR_CORRUPTED_CLUSTER] = "corrupted_cluster", + [ERROR_FAIL_DECOMPRESSION] = "fail_decompression", + [ERROR_INVALID_BLKADDR] = "invalid_blkaddr", + [ERROR_CORRUPTED_DIRENT] = "corrupted_dirent", + [ERROR_CORRUPTED_INODE] = "corrupted_inode", + [ERROR_INCONSISTENT_SUMMARY] = "inconsistent_summary", + [ERROR_INCONSISTENT_FOOTER] = "inconsistent_footer", + [ERROR_INCONSISTENT_SUM_TYPE] = "inconsistent_sum_type", + [ERROR_CORRUPTED_JOURNAL] = "corrupted_journal", + [ERROR_INCONSISTENT_NODE_COUNT] = "inconsistent_node_count", + [ERROR_INCONSISTENT_BLOCK_COUNT] = "inconsistent_block_count", + [ERROR_INVALID_CURSEG] = "invalid_curseg", + [ERROR_INCONSISTENT_SIT] = "inconsistent_sit", + [ERROR_CORRUPTED_VERITY_XATTR] = "corrupted_verity_xattr", + [ERROR_CORRUPTED_XATTR] = "corrupted_xattr", +}; + +void print_sb_errors(struct f2fs_super_block *sb) +{ + u8 *errors = sb->s_errors; + int i; + + if (!c.fs_errors) + return; + + MSG(0, "Info: fs errors: "); + + for (i = 0; i < ERROR_MAX; i++) { + if (test_bit_le(i, errors)) + MSG(0, "%s ", errors_str[i]); + } + + MSG(0, "\n"); +} + bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type) { @@ -1036,12 +1072,14 @@ int validate_super_block(struct f2fs_sb_info *sbi, enum SB_ADDR sb_addr) c.force_stop = is_checkpoint_stop(sbi->raw_super, false); c.abnormal_stop = is_checkpoint_stop(sbi->raw_super, true); + c.fs_errors = is_inconsistent_error(sbi->raw_super); MSG(0, "Info: MKFS version\n \"%s\"\n", c.init_version); MSG(0, "Info: FSCK version\n from \"%s\"\n to \"%s\"\n", c.sb_version, c.version); print_sb_state(sbi->raw_super); print_sb_stop_reason(sbi->raw_super); + print_sb_errors(sbi->raw_super); return 0; } @@ -1287,6 +1325,18 @@ bool is_checkpoint_stop(struct f2fs_super_block *sb, bool abnormal) return false; } +bool is_inconsistent_error(struct f2fs_super_block *sb) +{ + int i; + + for (i = 0; i < MAX_F2FS_ERRORS; i++) { + if (sb->s_errors[i]) + return true; + } + + return false; +} + /* * For a return value of 1, caller should further check for c.fix_on state * and take appropriate action. @@ -1296,7 +1346,7 @@ static int f2fs_should_proceed(struct f2fs_super_block *sb, u32 flag) if (!c.fix_on && (c.auto_fix || c.preen_mode)) { if (flag & CP_FSCK_FLAG || flag & CP_QUOTA_NEED_FSCK_FLAG || - c.abnormal_stop || + c.abnormal_stop || c.fs_errors || (exist_qf_ino(sb) && (flag & CP_ERROR_FLAG))) { c.fix_on = 1; } else if (!c.preen_mode) { diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 424eaad..5fa9931 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -510,6 +510,7 @@ struct f2fs_configuration { int bug_on; int force_stop; int abnormal_stop; + int fs_errors; int bug_nat_bits; bool quota_fixed; int alloc_failed; @@ -773,6 +774,28 @@ enum stop_cp_reason { #define MAX_STOP_REASON 32 +/* detail reason for EFSCORRUPTED */ +enum f2fs_error { + ERROR_CORRUPTED_CLUSTER, + ERROR_FAIL_DECOMPRESSION, + ERROR_INVALID_BLKADDR, + ERROR_CORRUPTED_DIRENT, + ERROR_CORRUPTED_INODE, + ERROR_INCONSISTENT_SUMMARY, + ERROR_INCONSISTENT_FOOTER, + ERROR_INCONSISTENT_SUM_TYPE, + ERROR_CORRUPTED_JOURNAL, + ERROR_INCONSISTENT_NODE_COUNT, + ERROR_INCONSISTENT_BLOCK_COUNT, + ERROR_INVALID_CURSEG, + ERROR_INCONSISTENT_SIT, + ERROR_CORRUPTED_VERITY_XATTR, + ERROR_CORRUPTED_XATTR, + ERROR_MAX, +}; + +#define MAX_F2FS_ERRORS 16 + struct f2fs_super_block { __le32 magic; /* Magic Number */ __le16 major_ver; /* Major Version */ @@ -818,7 +841,8 @@ struct f2fs_super_block { __le16 s_encoding; /* Filename charset encoding */ __le16 s_encoding_flags; /* Filename charset encoding flags */ __u8 s_stop_reason[MAX_STOP_REASON]; /* stop checkpoint reason */ - __u8 reserved[274]; /* valid reserved region */ + __u8 s_errors[MAX_F2FS_ERRORS]; /* reason of image corrupts */ + __u8 reserved[258]; /* valid reserved region */ __le32 crc; /* checksum of superblock */ };