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 07/54] tune2fs: Add inode checksum support
Date: Tue, 06 Mar 2012 15:58:05 -0800 [thread overview]
Message-ID: <20120306235805.11945.49889.stgit@elm3b70.beaverton.ibm.com> (raw)
In-Reply-To: <20120306235720.11945.30629.stgit@elm3b70.beaverton.ibm.com>
This patch adds to tune2fs the ability to toggle the metadata checksum rocompat
feature flag, which will rewrite the inode table with checksums. Disallow
changing the UUID while the fs is mounted, because rewriting the metadata
objects is racy.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
misc/tune2fs.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 106 insertions(+), 2 deletions(-)
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 74a0489..cb1aff3 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -91,6 +91,7 @@ static char *extended_cmd;
static unsigned long new_inode_size;
static char *ext_mount_opts;
static int usrquota, grpquota;
+static int rewrite_checksums;
int journal_size, journal_flags;
char *journal_device;
@@ -142,7 +143,8 @@ static __u32 ok_features[3] = {
EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER |
- EXT4_FEATURE_RO_COMPAT_QUOTA
+ EXT4_FEATURE_RO_COMPAT_QUOTA |
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM
};
static __u32 clear_ok_features[3] = {
@@ -160,7 +162,8 @@ static __u32 clear_ok_features[3] = {
EXT4_FEATURE_RO_COMPAT_DIR_NLINK|
EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|
EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
- EXT4_FEATURE_RO_COMPAT_QUOTA
+ EXT4_FEATURE_RO_COMPAT_QUOTA |
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM
};
/*
@@ -351,6 +354,16 @@ static int update_mntopts(ext2_filsys fs, char *mntopts)
return 0;
}
+static int check_fsck_needed(ext2_filsys fs)
+{
+ if (fs->super->s_state & EXT2_VALID_FS)
+ return 0;
+ printf("\n%s\n", _(please_fsck));
+ if (mount_flags & EXT2_MF_READONLY)
+ printf(_("(and reboot afterwards!)\n"));
+ return 1;
+}
+
static void request_fsck_afterwards(ext2_filsys fs)
{
static int requested = 0;
@@ -364,6 +377,60 @@ static void request_fsck_afterwards(ext2_filsys fs)
}
/*
+ * Forcibly set checksums in all inodes.
+ */
+static void rewrite_inodes(ext2_filsys fs)
+{
+ int length = EXT2_INODE_SIZE(fs->super);
+ struct ext2_inode *inode;
+ ext2_inode_scan scan;
+ errcode_t retval;
+ ext2_ino_t ino;
+
+ if (fs->super->s_creator_os != EXT2_OS_LINUX)
+ return;
+
+ retval = ext2fs_open_inode_scan(fs, 0, &scan);
+ if (retval) {
+ com_err("set_csum", retval, "while opening inode scan");
+ exit(1);
+ }
+
+ retval = ext2fs_get_mem(length, &inode);
+ if (retval) {
+ com_err("set_csum", retval, "while allocating memory");
+ exit(1);
+ }
+
+ do {
+ retval = ext2fs_get_next_inode_full(scan, &ino, inode, length);
+ if (retval) {
+ com_err("set_csum", retval, "while getting next inode");
+ exit(1);
+ }
+ if (!ino)
+ break;
+
+ retval = ext2fs_write_inode_full(fs, ino, inode, length);
+ if (retval) {
+ com_err("set_csum", retval, "while writing inode");
+ exit(1);
+ }
+ } while (ino);
+
+ ext2fs_free_mem(&inode);
+ ext2fs_close_inode_scan(scan);
+}
+
+static void rewrite_metadata_checksums(ext2_filsys fs)
+{
+ fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
+ ext2fs_init_csum_seed(fs);
+ rewrite_inodes(fs);
+ fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
+}
+
+/*
* Update the feature set as provided by the user.
*/
static int update_feature_set(ext2_filsys fs, char *features)
@@ -536,6 +603,20 @@ mmp_error:
}
if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+ if (check_fsck_needed(fs))
+ exit(1);
+ rewrite_checksums = 1;
+ }
+
+ if (FEATURE_OFF(E2P_FEATURE_RO_INCOMPAT,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+ if (check_fsck_needed(fs))
+ exit(1);
+ rewrite_checksums = 1;
+ }
+
+ if (FEATURE_ON(E2P_FEATURE_RO_INCOMPAT,
EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
for (i = 0; i < fs->group_desc_count; i++) {
gd = ext2fs_group_desc(fs, fs->group_desc, i);
@@ -2128,6 +2209,23 @@ retry_open:
int set_csum = 0;
dgrp_t i;
+ if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+ /*
+ * Changing the UUID requires rewriting all metadata,
+ * which can race with a mounted fs. Don't allow that.
+ */
+ if (mount_flags & EXT2_MF_MOUNTED) {
+ fputs(_("The UUID may only be "
+ "changed when the filesystem is "
+ "unmounted.\n"), stderr);
+ exit(1);
+ }
+
+ if (check_fsck_needed(fs))
+ exit(1);
+ }
+
if (sb->s_feature_ro_compat &
EXT4_FEATURE_RO_COMPAT_GDT_CSUM) {
/*
@@ -2153,13 +2251,19 @@ retry_open:
rc = 1;
goto closefs;
}
+ ext2fs_init_csum_seed(fs);
if (set_csum) {
for (i = 0; i < fs->group_desc_count; i++)
ext2fs_group_desc_csum_set(fs, i);
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
}
ext2fs_mark_super_dirty(fs);
+ if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ rewrite_checksums = 1;
}
+ if (rewrite_checksums)
+ rewrite_metadata_checksums(fs);
if (I_flag) {
if (mount_flags & EXT2_MF_MOUNTED) {
fputs(_("The inode size may only be "
next prev parent reply other threads:[~2012-03-06 23:58 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 23:57 [PATCH v3 00/54] e2fsprogs: Add metadata checksumming Darrick J. Wong
2012-03-06 23:57 ` [PATCH 01/54] libext2fs: Read and write full size inodes Darrick J. Wong
2012-03-09 23:36 ` Ted Ts'o
2012-03-12 22:23 ` Darrick J. Wong
2012-03-12 22:53 ` Ted Ts'o
2012-03-06 23:57 ` [PATCH 02/54] libext2fs: Change ext4 on-disk layout to support metadata checksumming Darrick J. Wong
2012-03-09 22:04 ` Ted Ts'o
2012-03-12 22:24 ` Darrick J. Wong
2012-03-06 23:57 ` [PATCH 03/54] debugfs: Optionally ignore bad checksums Darrick J. Wong
2012-03-06 23:57 ` [PATCH 04/54] libext2fs: Precompute FS UUID checksum seed Darrick J. Wong
2012-03-06 23:57 ` [PATCH 05/54] libext2fs: Add inode checksum support Darrick J. Wong
2012-03-06 23:57 ` [PATCH 06/54] debugfs: Dump inode checksum when appropriate Darrick J. Wong
2012-03-06 23:58 ` Darrick J. Wong [this message]
2012-03-06 23:58 ` [PATCH 08/54] e2fsck: Verify and correct inode checksums Darrick J. Wong
2012-03-10 5:09 ` Ted Ts'o
2012-03-12 22:49 ` Darrick J. Wong
2012-03-06 23:58 ` [PATCH 09/54] mke2fs: Allow metadata checksums to be turned on at mkfs time Darrick J. Wong
2012-03-06 23:58 ` [PATCH 10/54] libext2fs: Create the inode bitmap checksum Darrick J. Wong
2012-03-06 23:58 ` [PATCH 11/54] tune2fs: Rewrite inode bitmap checksums Darrick J. Wong
2012-03-06 23:58 ` [PATCH 12/54] dumpe2fs: Display inode bitmap checksum Darrick J. Wong
2012-03-06 23:58 ` [PATCH 13/54] e2fsck: Verify " Darrick J. Wong
2012-03-10 5:46 ` Ted Ts'o
2012-03-11 2:11 ` Ted Ts'o
2012-03-12 21:25 ` Darrick J. Wong
2012-03-12 22:30 ` Darrick J. Wong
2012-03-13 0:32 ` [PATCH v3.1 " Darrick J. Wong
2012-03-06 23:58 ` [PATCH 14/54] libext2fs: Create the block " Darrick J. Wong
2012-03-06 23:58 ` [PATCH 15/54] dumpe2fs: Display " Darrick J. Wong
2012-03-06 23:59 ` [PATCH 16/54] e2fsck: Verify " Darrick J. Wong
2012-03-13 0:33 ` [PATCH v3.1 " Darrick J. Wong
2012-03-06 23:59 ` [PATCH 17/54] e2fsck: Don't verify bitmap checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 18/54] tune2fs: Rewrite block " Darrick J. Wong
2012-03-06 23:59 ` [PATCH 19/54] libext2fs: Verify and calculate extent tree block checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 20/54] tune2fs: Enable extent tree checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 21/54] e2fsck: Verify extent tree blocks and clear the bad ones Darrick J. Wong
2012-03-06 23:59 ` [PATCH 22/54] debugfs: Print htree internal node checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 23/54] libext2fs: Add dx_root/dx_node checksum calculation and verification helpers Darrick J. Wong
2012-03-06 23:59 ` [PATCH 24/54] e2fsck: Verify htree root/node checksums Darrick J. Wong
2012-03-13 0:35 ` [PATCH v3.1 " Darrick J. Wong
2012-03-07 0:00 ` [PATCH 25/54] libext2fs: Introduce dir_entry_tail to provide checksums for directory leaf nodes Darrick J. Wong
2012-03-07 0:00 ` [PATCH 26/54] e2fsck: Check directory leaf block checksums Darrick J. Wong
2012-03-07 0:00 ` [PATCH 27/54] tune2fs: Rebuild and checksum directories when toggling metadata_csum or changing UUID Darrick J. Wong
2012-03-07 0:00 ` [PATCH 28/54] libext2fs: Verify and calculate extended attribute block checksums Darrick J. Wong
2012-03-07 0:00 ` [PATCH 29/54] e2fsck: Check " Darrick J. Wong
2012-03-10 5:22 ` Ted Ts'o
2012-03-12 22:43 ` Darrick J. Wong
2012-03-07 0:00 ` [PATCH 30/54] tune2fs: Rewrite " Darrick J. Wong
2012-03-07 0:00 ` [PATCH 31/54] libext2fs: Calculate and verify superblock checksums Darrick J. Wong
2012-03-07 0:00 ` [PATCH 32/54] e2fsck: Handle superblock checksum errors gracefully Darrick J. Wong
2012-03-07 0:01 ` [PATCH 33/54] libext2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2012-03-07 0:01 ` [PATCH 34/54] tune2fs: Store checksum algorithm type in superblock Darrick J. Wong
2012-03-07 0:01 ` [PATCH 35/54] mke2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2012-03-07 0:01 ` [PATCH 36/54] libext2fs: Block group checksum should use metadata_csum algorithm Darrick J. Wong
2012-03-07 0:01 ` [PATCH 37/54] e2fsck: Ensure block group checksum uses " Darrick J. Wong
2012-03-13 0:38 ` [PATCH v3.1 " Darrick J. Wong
2012-03-07 0:01 ` [PATCH 38/54] tune2fs: Rewrite block group checksums when changing checksumming feature flags Darrick J. Wong
2012-03-07 0:02 ` [PATCH 39/54] mke2fs: Write new group descriptors with the appropriate checksum Darrick J. Wong
2012-03-07 0:02 ` [PATCH 40/54] mke2fs: Warn if not enabling all the features that metadata_csum wants Darrick J. Wong
2012-03-07 0:02 ` [PATCH 41/54] libext2fs: Add checksum to MMP block Darrick J. Wong
2012-03-07 0:02 ` [PATCH 42/54] e2fsck: Verify and correct MMP checksum problems Darrick J. Wong
2012-03-07 0:02 ` [PATCH 43/54] tune2fs: Force MMP update when changing metadata_csum flag Darrick J. Wong
2012-03-07 0:02 ` [PATCH 44/54] libext2fs: Change on-disk journal layout to support metadata checksumming Darrick J. Wong
2012-03-07 0:02 ` [PATCH 45/54] libext2fs: Dump feature flags for jbd2 v2 checksums Darrick J. Wong
2012-03-07 0:02 ` [PATCH 46/54] e2fsck: Check journal superblock checksum prior to recovery Darrick J. Wong
2012-03-07 0:02 ` [PATCH 47/54] e2fsck: Check revoke block checksum during recovery Darrick J. Wong
2012-03-07 0:03 ` [PATCH 48/54] e2fsck: Check descriptor block checksum when recovering journal Darrick J. Wong
2012-03-07 0:03 ` [PATCH 49/54] e2fsck: Check commit block checksum during recovery Darrick J. Wong
2012-03-07 0:03 ` [PATCH 50/54] e2fsck: Verify data block checksums when recovering journal Darrick J. Wong
2012-03-07 0:03 ` [PATCH 51/54] libext2fs: Enable support for the metadata checksumming feature Darrick J. Wong
2012-03-07 0:03 ` [PATCH 52/54] libext2fs: Bring the CRC32c implementation up to date with the kernel implementation Darrick J. Wong
2012-03-07 0:03 ` [PATCH 53/54] e2fsck: Refactor crc32_be code Darrick J. Wong
2012-03-07 0:03 ` [PATCH 54/54] mke2fs: Enable metadata_csum on ext4dev filesystems Darrick J. Wong
2012-03-09 22:37 ` [PATCH v3 00/54] e2fsprogs: Add metadata checksumming Ted Ts'o
2012-03-13 0:41 ` Darrick J. Wong
2012-03-13 4:04 ` Andreas Dilger
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=20120306235805.11945.49889.stgit@elm3b70.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 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).