Skip to content

Commit d440c52

Browse files
zhengjunlingJaegeuk Kim
authored andcommitted
f2fs: support superblock checksum
Now we support crc32 checksum for superblock. Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Junling Zheng <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 274bd9b commit d440c52

File tree

4 files changed

+39
-1
lines changed

4 files changed

+39
-1
lines changed

fs/f2fs/f2fs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ struct f2fs_mount_info {
148148
#define F2FS_FEATURE_INODE_CRTIME 0x0100
149149
#define F2FS_FEATURE_LOST_FOUND 0x0200
150150
#define F2FS_FEATURE_VERITY 0x0400 /* reserved */
151+
#define F2FS_FEATURE_SB_CHKSUM 0x0800
151152

152153
#define F2FS_HAS_FEATURE(sb, mask) \
153154
((F2FS_SB(sb)->raw_super->feature & cpu_to_le32(mask)) != 0)
@@ -3431,6 +3432,7 @@ F2FS_FEATURE_FUNCS(flexible_inline_xattr, FLEXIBLE_INLINE_XATTR);
34313432
F2FS_FEATURE_FUNCS(quota_ino, QUOTA_INO);
34323433
F2FS_FEATURE_FUNCS(inode_crtime, INODE_CRTIME);
34333434
F2FS_FEATURE_FUNCS(lost_found, LOST_FOUND);
3435+
F2FS_FEATURE_FUNCS(sb_chksum, SB_CHKSUM);
34343436

34353437
#ifdef CONFIG_BLK_DEV_ZONED
34363438
static inline int get_blkz_type(struct f2fs_sb_info *sbi,

fs/f2fs/super.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,6 +2178,26 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi,
21782178
(bh->b_data + F2FS_SUPER_OFFSET);
21792179
struct super_block *sb = sbi->sb;
21802180
unsigned int blocksize;
2181+
size_t crc_offset = 0;
2182+
__u32 crc = 0;
2183+
2184+
/* Check checksum_offset and crc in superblock */
2185+
if (le32_to_cpu(raw_super->feature) & F2FS_FEATURE_SB_CHKSUM) {
2186+
crc_offset = le32_to_cpu(raw_super->checksum_offset);
2187+
if (crc_offset !=
2188+
offsetof(struct f2fs_super_block, crc)) {
2189+
f2fs_msg(sb, KERN_INFO,
2190+
"Invalid SB checksum offset: %zu",
2191+
crc_offset);
2192+
return 1;
2193+
}
2194+
crc = le32_to_cpu(raw_super->crc);
2195+
if (!f2fs_crc_valid(sbi, crc, raw_super, crc_offset)) {
2196+
f2fs_msg(sb, KERN_INFO,
2197+
"Invalid SB checksum value: %u", crc);
2198+
return 1;
2199+
}
2200+
}
21812201

21822202
if (F2FS_SUPER_MAGIC != le32_to_cpu(raw_super->magic)) {
21832203
f2fs_msg(sb, KERN_INFO,
@@ -2635,6 +2655,7 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi,
26352655
int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
26362656
{
26372657
struct buffer_head *bh;
2658+
__u32 crc = 0;
26382659
int err;
26392660

26402661
if ((recover && f2fs_readonly(sbi->sb)) ||
@@ -2643,6 +2664,13 @@ int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover)
26432664
return -EROFS;
26442665
}
26452666

2667+
/* we should update superblock crc here */
2668+
if (!recover && f2fs_sb_has_sb_chksum(sbi->sb)) {
2669+
crc = f2fs_crc32(sbi, F2FS_RAW_SUPER(sbi),
2670+
offsetof(struct f2fs_super_block, crc));
2671+
F2FS_RAW_SUPER(sbi)->crc = cpu_to_le32(crc);
2672+
}
2673+
26462674
/* write back-up superblock first */
26472675
bh = sb_bread(sbi->sb, sbi->valid_super_block ? 0 : 1);
26482676
if (!bh)

fs/f2fs/sysfs.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ static ssize_t features_show(struct f2fs_attr *a,
117117
if (f2fs_sb_has_lost_found(sb))
118118
len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",
119119
len ? ", " : "", "lost_found");
120+
if (f2fs_sb_has_sb_chksum(sb))
121+
len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",
122+
len ? ", " : "", "sb_checksum");
120123
len += snprintf(buf + len, PAGE_SIZE - len, "\n");
121124
return len;
122125
}
@@ -334,6 +337,7 @@ enum feat_id {
334337
FEAT_QUOTA_INO,
335338
FEAT_INODE_CRTIME,
336339
FEAT_LOST_FOUND,
340+
FEAT_SB_CHECKSUM,
337341
};
338342

339343
static ssize_t f2fs_feature_show(struct f2fs_attr *a,
@@ -350,6 +354,7 @@ static ssize_t f2fs_feature_show(struct f2fs_attr *a,
350354
case FEAT_QUOTA_INO:
351355
case FEAT_INODE_CRTIME:
352356
case FEAT_LOST_FOUND:
357+
case FEAT_SB_CHECKSUM:
353358
return snprintf(buf, PAGE_SIZE, "supported\n");
354359
}
355360
return 0;
@@ -434,6 +439,7 @@ F2FS_FEATURE_RO_ATTR(flexible_inline_xattr, FEAT_FLEXIBLE_INLINE_XATTR);
434439
F2FS_FEATURE_RO_ATTR(quota_ino, FEAT_QUOTA_INO);
435440
F2FS_FEATURE_RO_ATTR(inode_crtime, FEAT_INODE_CRTIME);
436441
F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LOST_FOUND);
442+
F2FS_FEATURE_RO_ATTR(sb_checksum, FEAT_SB_CHECKSUM);
437443

438444
#define ATTR_LIST(name) (&f2fs_attr_##name.attr)
439445
static struct attribute *f2fs_attrs[] = {
@@ -493,6 +499,7 @@ static struct attribute *f2fs_feat_attrs[] = {
493499
ATTR_LIST(quota_ino),
494500
ATTR_LIST(inode_crtime),
495501
ATTR_LIST(lost_found),
502+
ATTR_LIST(sb_checksum),
496503
NULL,
497504
};
498505

include/linux/f2fs_fs.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ struct f2fs_super_block {
109109
struct f2fs_device devs[MAX_DEVICES]; /* device list */
110110
__le32 qf_ino[F2FS_MAX_QUOTAS]; /* quota inode numbers */
111111
__u8 hot_ext_count; /* # of hot file extension */
112-
__u8 reserved[314]; /* valid reserved region */
112+
__u8 reserved[310]; /* valid reserved region */
113+
__le32 crc; /* checksum of superblock */
113114
} __packed;
114115

115116
/*

0 commit comments

Comments
 (0)