From: "Darrick J. Wong" <djwong@us.ibm.com>
To: Andreas Dilger <adilger.kernel@dilger.ca>,
Theodore Tso <tytso@mit.edu>,
"Darrick J. Wong" <djwong@us.ibm.com>
Cc: Sunil Mushran <sunil.mushran@oracle.com>,
Amir Goldstein <amir73il@gmail.com>,
Andi Kleen <andi@firstfloor.org>, Mingming Cao <cmm@us.ibm.com>,
Joel Becker <jlbec@evilplan.org>,
linux-ext4@vger.kernel.org, Coly Li <colyli@gmail.com>
Subject: [PATCH 11/37] libext2fs: Create the inode bitmap checksum
Date: Wed, 31 Aug 2011 17:36:22 -0700 [thread overview]
Message-ID: <20110901003622.1176.1504.stgit@elm3c44.beaverton.ibm.com> (raw)
In-Reply-To: <20110901003509.1176.51159.stgit@elm3c44.beaverton.ibm.com>
Provide a field in the block group descriptor to store inode bitmap checksum,
and some helper functions to calculate and verify it.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
lib/ext2fs/blknum.c | 11 +++++++++++
lib/ext2fs/closefs.c | 29 +++++++++++++++++------------
lib/ext2fs/csum.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
lib/ext2fs/ext2_fs.h | 3 ++-
lib/ext2fs/ext2fs.h | 7 +++++++
lib/ext2fs/rw_bitmaps.c | 15 +++++++++++++++
lib/ext2fs/swapfs.c | 1 +
7 files changed, 98 insertions(+), 13 deletions(-)
diff --git a/lib/ext2fs/blknum.c b/lib/ext2fs/blknum.c
index 7e7fcd8..47d3fda 100644
--- a/lib/ext2fs/blknum.c
+++ b/lib/ext2fs/blknum.c
@@ -210,6 +210,17 @@ void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
}
/*
+ * Return the inode bitmap checksum of a group
+ */
+blk64_t ext2fs_inode_bitmap_checksum(ext2_filsys fs, dgrp_t group)
+{
+ struct ext4_group_desc *gdp;
+
+ gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+ return gdp->bg_inode_bitmap_csum;
+}
+
+/*
* Return the inode bitmap block of a group
*/
blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group)
diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index 952f496..73dc136 100644
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -289,6 +289,23 @@ errcode_t ext2fs_flush(ext2_filsys fs)
fs->super->s_wtime = fs->now ? fs->now : time(NULL);
fs->super->s_block_group_nr = 0;
+
+ /*
+ * If the write_bitmaps() function is present, call it to
+ * flush the bitmaps. This is done this way so that a simple
+ * program that doesn't mess with the bitmaps doesn't need to
+ * drag in the bitmaps.c code.
+ *
+ * Bitmap checksums live in the group descriptor, so the
+ * bitmaps need to be written before the descriptors.
+ */
+ if (fs->write_bitmaps) {
+ retval = fs->write_bitmaps(fs);
+ if (retval)
+ goto errout;
+ }
+
+ /* Prepare the group descriptors for writing */
#ifdef WORDS_BIGENDIAN
retval = EXT2_ET_NO_MEMORY;
retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &super_shadow);
@@ -379,18 +396,6 @@ errcode_t ext2fs_flush(ext2_filsys fs)
ext2fs_numeric_progress_close(fs, &progress, NULL);
- /*
- * If the write_bitmaps() function is present, call it to
- * flush the bitmaps. This is done this way so that a simple
- * program that doesn't mess with the bitmaps doesn't need to
- * drag in the bitmaps.c code.
- */
- if (fs->write_bitmaps) {
- retval = fs->write_bitmaps(fs);
- if (retval)
- goto errout;
- }
-
write_primary_superblock_only:
/*
* Write out master superblock. This has to be done
diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c
index 57adc4c..56b75da 100644
--- a/lib/ext2fs/csum.c
+++ b/lib/ext2fs/csum.c
@@ -29,6 +29,51 @@
#define STATIC static
#endif
+__u32 ext2fs_bitmap_csum(ext2_filsys fs, dgrp_t group, char *bitmap, int size)
+{
+ __u32 crc = 0;
+
+ if (fs->super->s_desc_size < EXT2_MIN_DESC_SIZE_64BIT)
+ return 0;
+
+ if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return 0;
+
+ group = ext2fs_cpu_to_le32(group);
+ crc = crc32c_le(~0, fs->super->s_uuid, sizeof(fs->super->s_uuid));
+ crc = crc32c_le(crc, (char *)&group, sizeof(group));
+ crc = crc32c_le(crc, (char *)bitmap, size);
+
+ return crc;
+}
+
+int ext2fs_bitmap_csum_verify(ext2_filsys fs, dgrp_t group, __u32 provided,
+ char *bitmap, int size)
+{
+ if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT &&
+ EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&
+ (provided != ext2fs_bitmap_csum(fs, group, bitmap, size)))
+ return 0;
+ return 1;
+}
+
+void ext2fs_inode_bitmap_csum_set(ext2_filsys fs, dgrp_t group, char *bitmap,
+ int size)
+{
+ struct ext4_group_desc *gdp = (struct ext4_group_desc *)
+ ext2fs_group_desc(fs, fs->group_desc, group);
+
+ if (fs->super->s_desc_size < EXT2_MIN_DESC_SIZE_64BIT)
+ return;
+ if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return;
+
+ gdp->bg_inode_bitmap_csum = ext2fs_bitmap_csum(fs, group, bitmap, size);
+}
+
__u32 ext2fs_inode_csum(ext2_filsys fs, ext2_ino_t inum,
struct ext2_inode_large *inode)
{
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 1f08673..367bfdf 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -169,7 +169,8 @@ struct ext4_group_desc
__u16 bg_free_inodes_count_hi;/* Free inodes count MSB */
__u16 bg_used_dirs_count_hi; /* Directories count MSB */
__u16 bg_itable_unused_hi; /* Unused inodes count MSB */
- __u32 bg_reserved2[3];
+ __u32 bg_inode_bitmap_csum; /* crc32c(uuid+group+ibitmap) */
+ __u32 bg_reserved2[2];
};
#define EXT2_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not initialized */
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index db8b28b..0899e34 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -785,6 +785,7 @@ extern struct ext2_group_desc *ext2fs_group_desc(ext2_filsys fs,
extern blk64_t ext2fs_block_bitmap_loc(ext2_filsys fs, dgrp_t group);
extern void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group,
blk64_t blk);
+extern blk64_t ext2fs_inode_bitmap_csum(ext2_filsys fs, dgrp_t group);
extern blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group);
extern void ext2fs_inode_bitmap_loc_set(ext2_filsys fs, dgrp_t group,
blk64_t blk);
@@ -892,6 +893,12 @@ extern __u32 crc32c_be(__u32 crc, unsigned char const *p, size_t len);
extern __u32 crc32c_le(__u32 crc, unsigned char const *p, size_t len);
/* csum.c */
+extern __u32 ext2fs_bitmap_csum(ext2_filsys fs, dgrp_t group, char *bitmap,
+ int size);
+extern int ext2fs_bitmap_csum_verify(ext2_filsys fs, dgrp_t group,
+ __u32 provided, char *bitmap, int size);
+extern void ext2fs_inode_bitmap_csum_set(ext2_filsys fs, dgrp_t group,
+ char *bitmap, int size);
extern __u32 ext2fs_inode_csum(ext2_filsys fs, ext2_ino_t inum,
struct ext2_inode_large *inode);
extern void ext2fs_inode_csum_set(ext2_filsys fs, ext2_ino_t inum,
diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index f8c8a9f..57aba59 100644
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -114,6 +114,9 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
if (retval)
return retval;
+ ext2fs_inode_bitmap_csum_set(fs, i, inode_buf, inode_nbytes);
+ ext2fs_group_desc_csum_set(fs, i);
+
blk = ext2fs_inode_bitmap_loc(fs, i);
if (blk) {
retval = io_channel_write_blk64(fs->io, blk, 1,
@@ -152,6 +155,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
blk64_t blk_cnt;
ext2_ino_t ino_itr = 1;
ext2_ino_t ino_cnt;
+ struct ext4_group_desc *gdp;
EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
@@ -277,6 +281,17 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
retval = EXT2_ET_INODE_BITMAP_READ;
goto cleanup;
}
+
+ /* verify inode bitmap checksum */
+ gdp = (struct ext4_group_desc *)
+ ext2fs_group_desc(fs, fs->group_desc,
+ i);
+ if (!(fs->flags &
+ EXT2_FLAG_IGNORE_CSUM_ERRORS) &&
+ !ext2fs_bitmap_csum_verify(fs, i,
+ gdp->bg_inode_bitmap_csum,
+ inode_bitmap, inode_nbytes))
+ return EXT2_ET_INODE_BITMAP_READ;
} else
memset(inode_bitmap, 0, inode_nbytes);
cnt = inode_nbytes << 3;
diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
index df604ba..747e130 100644
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -125,6 +125,7 @@ void ext2fs_swap_group_desc2(ext2_filsys fs, struct ext2_group_desc *gdp)
gdp4->bg_used_dirs_count_hi =
ext2fs_swab16(gdp4->bg_used_dirs_count_hi);
gdp4->bg_itable_unused_hi = ext2fs_swab16(gdp4->bg_itable_unused_hi);
+ gdp4->bg_inode_bitmap_csum = ext2fs_swab32(gdp4->bg_inode_bitmap_csum);
}
void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
next prev parent reply other threads:[~2011-09-01 0:36 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-01 0:35 [PATCH v1 00/37] e2fsprogs: Add metadata checksumming Darrick J. Wong
2011-09-01 0:35 ` [PATCH 01/37] e2fsprogs: Read and write full-sized inodes Darrick J. Wong
2011-09-03 18:05 ` Andreas Dilger
2011-09-04 14:04 ` Ted Ts'o
2011-09-04 17:40 ` Andreas Dilger
2011-09-14 16:39 ` Ted Ts'o
2011-09-15 20:25 ` Darrick J. Wong
2011-09-15 21:35 ` Andreas Dilger
2011-09-16 1:04 ` Darrick J. Wong
2011-09-18 1:52 ` Ted Ts'o
2011-09-01 0:35 ` [PATCH 02/37] libext2fs: Add metadata checksum flag Darrick J. Wong
2011-09-04 1:47 ` Andreas Dilger
2011-09-01 0:35 ` [PATCH 03/37] debugfs: Optionally ignore bad checksums Darrick J. Wong
2011-09-01 0:35 ` [PATCH 04/37] libext2fs: Add crc32c implementation for metadata checksumming Darrick J. Wong
2011-09-16 3:32 ` Ted Ts'o
2011-09-01 0:35 ` [PATCH 05/37] libext2fs: Implement a crc32c self-test Darrick J. Wong
2011-09-01 0:35 ` [PATCH 06/37] libext2fs: Add inode checksum support Darrick J. Wong
2011-09-04 17:59 ` Andreas Dilger
2011-09-05 18:59 ` Darrick J. Wong
2011-09-01 0:35 ` [PATCH 07/37] debugfs: Dump inode checksum when appropriate Darrick J. Wong
2011-09-01 0:36 ` [PATCH 08/37] tune2fs: Add inode checksum support Darrick J. Wong
2011-09-01 0:36 ` [PATCH 09/37] e2fsck: Verify and correct inode checksums Darrick J. Wong
2011-09-04 18:17 ` Andreas Dilger
2011-09-05 19:05 ` Darrick J. Wong
2011-09-01 0:36 ` [PATCH 10/37] mke2fs: Allow metadata checksums to be turned on at mkfs time Darrick J. Wong
2011-09-04 18:28 ` Andreas Dilger
2011-09-05 19:20 ` Darrick J. Wong
2011-09-06 1:54 ` Andreas Dilger
2011-09-06 17:13 ` Darrick J. Wong
2011-09-01 0:36 ` Darrick J. Wong [this message]
2011-09-14 17:02 ` [PATCH 11/37] libext2fs: Create the inode bitmap checksum Ted Ts'o
2011-09-14 19:31 ` Darrick J. Wong
2011-09-14 20:00 ` Andreas Dilger
2011-09-14 19:59 ` Andreas Dilger
2011-09-14 22:14 ` Ted Ts'o
2011-09-01 0:36 ` [PATCH 12/37] tune2fs: Rewrite inode bitmap checksums Darrick J. Wong
2011-09-01 0:36 ` [PATCH 13/37] dumpe2fs: Display inode bitmap checksum Darrick J. Wong
2011-09-04 18:30 ` Andreas Dilger
2011-09-05 19:20 ` Darrick J. Wong
2011-09-01 0:36 ` [PATCH 14/37] e2fsck: Verify " Darrick J. Wong
2011-09-01 0:36 ` [PATCH 15/37] libext2fs: Create the block " Darrick J. Wong
2011-09-01 0:36 ` [PATCH 16/37] dumpe2fs: Display " Darrick J. Wong
2011-09-01 0:37 ` [PATCH 17/37] e2fsck: Verify " Darrick J. Wong
2011-09-01 0:37 ` [PATCH 18/37] e2fsck: Don't verify bitmap checksums Darrick J. Wong
2011-09-01 0:37 ` [PATCH 19/37] tune2fs: Rewrite block " Darrick J. Wong
2011-09-01 0:37 ` [PATCH 20/37] libext2fs: Verify and calculate extent tree block checksums Darrick J. Wong
2011-09-01 0:37 ` [PATCH 21/37] tune2fs: Enable extent tree checksums Darrick J. Wong
2011-09-01 0:37 ` [PATCH 22/37] libext2fs: Introduce dx_tail and dir_entry_tail Darrick J. Wong
2011-09-01 0:37 ` [PATCH 23/37] debugfs: Print htree internal node checksums Darrick J. Wong
2011-09-01 0:37 ` [PATCH 24/37] libext2fs: Add dx_root/dx_node checksum calculation and verification helpers Darrick J. Wong
2011-09-01 0:37 ` [PATCH 25/37] e2fsck: Verify htree root/node checksums Darrick J. Wong
2011-09-01 0:37 ` [PATCH 26/37] libext2fs: Introduce dir_entry_tail to provide checksums for directory leaf nodes Darrick J. Wong
2011-09-01 0:38 ` [PATCH 27/37] e2fsck: Check directory leaf block checksums Darrick J. Wong
2011-09-01 0:38 ` [PATCH 28/37] tune2fs: Rebuild and checksum directories when toggling metadata_csum or changing UUID Darrick J. Wong
2011-09-01 0:38 ` [PATCH 29/37] libext2fs: Verify and calculate extended attribute block checksums Darrick J. Wong
2011-09-01 0:38 ` [PATCH 30/37] e2fsck: Check " Darrick J. Wong
2011-09-01 0:38 ` [PATCH 32/37] libext2fs: Extend inode checksum to cover the EA block Darrick J. Wong
2011-09-14 16:48 ` Ted Ts'o
2011-09-01 0:38 ` [PATCH 33/37] tune2fs: Rewrite extended attribute block checksums Darrick J. Wong
2011-09-01 0:38 ` [PATCH 34/37] libext2fs: Calculate and verify superblock checksums Darrick J. Wong
2011-09-01 0:38 ` [PATCH 35/37] e2fsck: Handle superblock checksum errors gracefully Darrick J. Wong
2011-09-01 0:39 ` [PATCH 36/37] e2p: Print superblock checksum in list_super Darrick J. Wong
2011-09-01 0:39 ` [PATCH 37/37] e2fsck: Support CRC32c checksum in journal commit blocks Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110901003622.1176.1504.stgit@elm3c44.beaverton.ibm.com \
--to=djwong@us.ibm.com \
--cc=adilger.kernel@dilger.ca \
--cc=amir73il@gmail.com \
--cc=andi@firstfloor.org \
--cc=cmm@us.ibm.com \
--cc=colyli@gmail.com \
--cc=jlbec@evilplan.org \
--cc=linux-ext4@vger.kernel.org \
--cc=sunil.mushran@oracle.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.