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>,
Martin K Petersen <martin.petersen@oracle.com>,
Greg Freemyer <greg.freemyer@gmail.com>,
Amir Goldstein <amir73il@gmail.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
Andi Kleen <andi@firstfloor.org>, Mingming Cao <cmm@us.ibm.com>,
Joel Becker <jlbec@evilplan.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
linux-ext4@vger.kernel.org, Coly Li <colyli@gmail.com>
Subject: [PATCH 10/22] ext4: Verify and calculate checksums for extent tree blocks
Date: Mon, 28 Nov 2011 15:27:25 -0800 [thread overview]
Message-ID: <20111128232725.19194.12626.stgit@elm3c44.beaverton.ibm.com> (raw)
In-Reply-To: <20111128232615.19194.80081.stgit@elm3c44.beaverton.ibm.com>
Calculate and verify the checksum for each extent tree block. The checksum is
located in the space immediately after the last possible ext4_extent in the
block. The space is is typically the last 4-8 bytes in the block.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
fs/ext4/ext4_extents.h | 25 +++++++++++++++++++++++-
fs/ext4/extents.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 1 deletions(-)
diff --git a/fs/ext4/ext4_extents.h b/fs/ext4/ext4_extents.h
index a52db3a..56e891a 100644
--- a/fs/ext4/ext4_extents.h
+++ b/fs/ext4/ext4_extents.h
@@ -62,10 +62,22 @@
/*
* ext4_inode has i_block array (60 bytes total).
* The first 12 bytes store ext4_extent_header;
- * the remainder stores an array of ext4_extent.
+ * the remainder stores an array of ext4_extent,
+ * followed by ext4_extent_tail.
*/
/*
+ * This is the extent tail on-disk structure.
+ * All other extent structures are 12 bytes long. It turns out that
+ * block_size % 12 >= 4 for all valid block sizes (1k, 2k, 4k).
+ * Therefore, this tail structure can be crammed into the end of the block
+ * without having to rebalance the tree.
+ */
+struct ext4_extent_tail {
+ __le32 et_checksum; /* crc32c(uuid+inum+extent_block) */
+};
+
+/*
* This is the extent on-disk structure.
* It's used at the bottom of the tree.
*/
@@ -101,6 +113,17 @@ struct ext4_extent_header {
#define EXT4_EXT_MAGIC cpu_to_le16(0xf30a)
+#define EXT4_EXTENT_TAIL_OFFSET(hdr) \
+ (sizeof(struct ext4_extent_header) + \
+ (sizeof(struct ext4_extent) * le16_to_cpu((hdr)->eh_max)))
+
+static inline struct ext4_extent_tail *
+find_ext4_extent_tail(struct ext4_extent_header *eh)
+{
+ return (struct ext4_extent_tail *)(((void *)eh) +
+ EXT4_EXTENT_TAIL_OFFSET(eh));
+}
+
/*
* Array of ext4_ext_path contains path to some extent.
* Creation/lookup routines use it for traversal/splitting/etc.
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 00f97f4..5db751e 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -45,6 +45,46 @@
#include <trace/events/ext4.h>
+static __le32 ext4_extent_block_csum(struct inode *inode,
+ struct ext4_extent_header *eh)
+{
+ struct ext4_inode_info *ei = EXT4_I(inode);
+ struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
+ __u32 csum;
+
+ csum = ext4_chksum(sbi, ei->i_uuid_inum_csum, (__u8 *)eh,
+ EXT4_EXTENT_TAIL_OFFSET(eh));
+ return cpu_to_le32(csum);
+}
+
+static int ext4_extent_block_csum_verify(struct inode *inode,
+ struct ext4_extent_header *eh)
+{
+ struct ext4_extent_tail *et;
+
+ if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return 1;
+
+ et = find_ext4_extent_tail(eh);
+ if (et->et_checksum != ext4_extent_block_csum(inode, eh))
+ return 0;
+ return 1;
+}
+
+static void ext4_extent_block_csum_set(struct inode *inode,
+ struct ext4_extent_header *eh)
+{
+ struct ext4_extent_tail *et;
+
+ if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return;
+
+ et = find_ext4_extent_tail(eh);
+ et->et_checksum = ext4_extent_block_csum(inode, eh);
+}
+
static int ext4_split_extent(handle_t *handle,
struct inode *inode,
struct ext4_ext_path *path,
@@ -103,6 +143,7 @@ static int __ext4_ext_dirty(const char *where, unsigned int line,
{
int err;
if (path->p_bh) {
+ ext4_extent_block_csum_set(inode, ext_block_hdr(path->p_bh));
/* path points to block */
err = __ext4_handle_dirty_metadata(where, line, handle,
inode, path->p_bh);
@@ -375,6 +416,12 @@ static int __ext4_ext_check(const char *function, unsigned int line,
error_msg = "invalid extent entries";
goto corrupted;
}
+ /* Verify checksum on non-root extent tree nodes */
+ if (ext_depth(inode) != depth &&
+ !ext4_extent_block_csum_verify(inode, eh)) {
+ error_msg = "extent tree corrupted";
+ goto corrupted;
+ }
return 0;
corrupted:
@@ -914,6 +961,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
le16_add_cpu(&neh->eh_entries, m);
}
+ ext4_extent_block_csum_set(inode, neh);
set_buffer_uptodate(bh);
unlock_buffer(bh);
@@ -992,6 +1040,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
sizeof(struct ext4_extent_idx) * m);
le16_add_cpu(&neh->eh_entries, m);
}
+ ext4_extent_block_csum_set(inode, neh);
set_buffer_uptodate(bh);
unlock_buffer(bh);
@@ -1089,6 +1138,7 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,
else
neh->eh_max = cpu_to_le16(ext4_ext_space_block(inode, 0));
neh->eh_magic = EXT4_EXT_MAGIC;
+ ext4_extent_block_csum_set(inode, neh);
set_buffer_uptodate(bh);
unlock_buffer(bh);
next prev parent reply other threads:[~2011-11-28 23:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-28 23:26 [PATCH v2.1 00/22] ext4: Add metadata checksumming Darrick J. Wong
2011-11-28 23:26 ` [PATCH 01/22] ext4: Create a new BH_Verified flag to avoid unnecessary metadata validation Darrick J. Wong
2011-11-28 23:26 ` [PATCH 02/22] ext4: Create a rocompat flag for extended metadata checksumming Darrick J. Wong
2011-12-05 15:41 ` Ted Ts'o
2011-12-05 19:24 ` Darrick J. Wong
2011-11-28 23:26 ` [PATCH 03/22] ext4: Record the checksum algorithm in use in the superblock Darrick J. Wong
2011-12-05 15:46 ` Ted Ts'o
2011-12-05 19:32 ` Darrick J. Wong
[not found] ` <E0964BB6-793D-49AF-A2B0-20748C6DAE2B@dilger.ca>
2011-12-07 7:42 ` Darrick J. Wong
2011-12-07 8:40 ` Andreas Dilger
2011-11-28 23:26 ` [PATCH 04/22] ext4: Only call out to crc32c if necessary Darrick J. Wong
2011-12-05 15:52 ` Ted Ts'o
2011-12-05 19:38 ` Darrick J. Wong
2011-11-28 23:26 ` [PATCH 05/22] ext4: Calculate and verify superblock checksum Darrick J. Wong
2011-11-28 23:26 ` [PATCH 06/22] ext4: Calculate and verify inode checksums Darrick J. Wong
2011-12-05 16:24 ` Ted Ts'o
2011-12-05 19:45 ` Darrick J. Wong
2011-11-28 23:27 ` [PATCH 07/22] ext4: Create bitmap checksum helper functions Darrick J. Wong
2011-12-05 16:33 ` Ted Ts'o
2011-12-05 20:31 ` Darrick J. Wong
2011-12-05 23:54 ` Darrick J. Wong
2011-12-06 17:19 ` Andreas Dilger
2011-12-06 20:59 ` Darrick J. Wong
2011-11-28 23:27 ` [PATCH 08/22] ext4: Calculate and verify checksums for inode bitmaps Darrick J. Wong
2011-11-28 23:27 ` [PATCH 09/22] ext4: Calculate and verify block bitmap checksum Darrick J. Wong
2011-11-28 23:27 ` Darrick J. Wong [this message]
2011-12-05 16:40 ` [PATCH 10/22] ext4: Verify and calculate checksums for extent tree blocks Ted Ts'o
2011-12-05 19:50 ` Darrick J. Wong
2011-11-28 23:27 ` [PATCH 11/22] ext4: Calculate and verify checksums for htree nodes Darrick J. Wong
2011-11-28 23:27 ` [PATCH 12/22] ext4: Calculate and verify checksums of directory leaf blocks Darrick J. Wong
2011-11-28 23:27 ` [PATCH 13/22] ext4: Calculate and verify checksums of extended attribute blocks Darrick J. Wong
2011-11-28 23:27 ` [PATCH 14/22] ext4: Add new feature to make block group checksums use metadata_csum algorithm Darrick J. Wong
2011-11-28 23:28 ` [PATCH 15/22] ext4: Add checksums to the MMP block Darrick J. Wong
2011-11-28 23:28 ` [PATCH 16/22] jbd2: Update structure definitions and flags to support extended checksumming Darrick J. Wong
2011-11-28 23:28 ` [PATCH 17/22] jbd2: Grab a reference to the crc32c driver only when necessary Darrick J. Wong
2011-11-28 23:28 ` [PATCH 18/22] jbd2: Update structure definitions and flags to support extended checksumming Darrick J. Wong
2011-11-28 23:28 ` [PATCH 19/22] jbd2: Checksum revocation blocks Darrick J. Wong
2011-12-12 15:39 ` Ted Ts'o
2011-11-28 23:28 ` [PATCH 20/22] jbd2: Checksum descriptor blocks Darrick J. Wong
2011-11-28 23:28 ` [PATCH 21/22] jbd2: Checksum commit blocks Darrick J. Wong
2011-11-28 23:28 ` [PATCH 22/22] jbd2: Checksum data blocks that are stored in the journal 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=20111128232725.19194.12626.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=greg.freemyer@gmail.com \
--cc=jlbec@evilplan.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).