linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 26/51] tune2fs: Rebuild and checksum directories when toggling metadata_csum or changing UUID
Date: Tue, 13 Dec 2011 17:16:10 -0800	[thread overview]
Message-ID: <20111214011610.20947.18930.stgit@elm3c44.beaverton.ibm.com> (raw)
In-Reply-To: <20111214011316.20947.13706.stgit@elm3c44.beaverton.ibm.com>

Since all the metadata checksums depend on the fs UUID, tune2fs must be able to
rewrite the checksums of _all_ metadata.  It's not that hard to add in the bits
to resize the directory block structures at the same time.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
 misc/tune2fs.c |  193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 193 insertions(+), 0 deletions(-)


diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index c7b9fd3..236a324 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -106,6 +106,8 @@ struct blk_move {
 
 
 static const char *please_fsck = N_("Please run e2fsck on the filesystem.\n");
+static const char *please_dir_fsck =
+		N_("Please run e2fsck -D on the filesystem.\n");
 
 #ifdef CONFIG_BUILD_FINDFS
 void do_findfs(int argc, char **argv);
@@ -364,6 +366,18 @@ static int check_fsck_needed(ext2_filsys fs)
 	return 1;
 }
 
+static void request_dir_fsck_afterwards(ext2_filsys fs)
+{
+	static int requested;
+
+	if (requested++)
+		return;
+	fs->super->s_state &= ~EXT2_VALID_FS;
+	printf("\n%s\n", _(please_dir_fsck));
+	if (mount_flags & EXT2_MF_READONLY)
+		printf(_("(and reboot afterwards!)\n"));
+}
+
 static void request_fsck_afterwards(ext2_filsys fs)
 {
 	static int requested = 0;
@@ -419,6 +433,176 @@ static errcode_t rewrite_extents(ext2_filsys fs, ext2_ino_t ino,
 }
 
 /*
+ * Rewrite directory blocks with checksums
+ */
+struct rewrite_dir_context {
+	char *buf;
+	errcode_t errcode;
+	ext2_ino_t dir;
+	int is_htree;
+};
+
+static int rewrite_dir_block(ext2_filsys fs,
+			     blk64_t	*blocknr,
+			     e2_blkcnt_t blockcnt,
+			     blk64_t	ref_block EXT2FS_ATTR((unused)),
+			     int	ref_offset EXT2FS_ATTR((unused)),
+			     void	*priv_data)
+{
+	struct ext2_dx_countlimit *dcl = NULL;
+	struct rewrite_dir_context *ctx = priv_data;
+	int dcl_offset, changed = 0;
+
+	ctx->errcode = ext2fs_read_dir_block4(fs, *blocknr, ctx->buf, 0,
+					      ctx->dir);
+	if (ctx->errcode)
+		return BLOCK_ABORT;
+
+	/* if htree node... */
+	if (ctx->is_htree)
+		ext2fs_get_dx_countlimit(fs, (struct ext2_dir_entry *)ctx->buf,
+					 &dcl, &dcl_offset);
+	if (dcl) {
+		if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+				EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+			/* Ensure limit is the max size */
+			int max_entries = (fs->blocksize - dcl_offset) /
+					  sizeof(struct ext2_dx_entry);
+			if (ext2fs_le16_to_cpu(dcl->limit) != max_entries) {
+				changed = 1;
+				dcl->limit = ext2fs_cpu_to_le16(max_entries);
+			}
+		} else {
+			/* If htree block is full then rebuild the dir */
+			if (ext2fs_le16_to_cpu(dcl->count) ==
+			    ext2fs_le16_to_cpu(dcl->limit)) {
+				request_dir_fsck_afterwards(fs);
+				return 0;
+			}
+			/*
+			 * Ensure dcl->limit is small enough to leave room for
+			 * the checksum tail.
+			 */
+			int max_entries = (fs->blocksize - (dcl_offset +
+						sizeof(struct ext2_dx_tail))) /
+					  sizeof(struct ext2_dx_entry);
+			if (ext2fs_le16_to_cpu(dcl->limit) != max_entries)
+				dcl->limit = ext2fs_cpu_to_le16(max_entries);
+			/* Always rewrite checksum */
+			changed = 1;
+		}
+	} else {
+		unsigned int rec_len, name_size;
+		char *top = ctx->buf + fs->blocksize;
+		struct ext2_dir_entry *de = (struct ext2_dir_entry *)ctx->buf;
+		struct ext2_dir_entry *last_de = NULL, *penultimate_de = NULL;
+
+		/* Find last and penultimate dirent */
+		while ((char *)de < top) {
+			penultimate_de = last_de;
+			last_de = de;
+			ctx->errcode = ext2fs_get_rec_len(fs, de, &rec_len);
+			if (!ctx->errcode && !rec_len)
+				ctx->errcode = EXT2_ET_DIR_CORRUPTED;
+			if (ctx->errcode)
+				return BLOCK_ABORT;
+			de = (struct ext2_dir_entry *)(((void *)de) + rec_len);
+		}
+		ctx->errcode = ext2fs_get_rec_len(fs, last_de, &rec_len);
+		if (ctx->errcode)
+			return BLOCK_ABORT;
+		name_size = last_de->name_len & 0xFF;
+
+		if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+				EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+			if (!penultimate_de)
+				return 0;
+			if (last_de->inode ||
+			    name_size ||
+			    rec_len != sizeof(struct ext2_dir_entry_tail))
+				return 0;
+			/*
+			 * The last dirent is unused and the right length to
+			 * have stored a checksum.  Erase it.
+			 */
+			ctx->errcode = ext2fs_get_rec_len(fs, penultimate_de,
+							  &rec_len);
+			if (!rec_len)
+				ctx->errcode = EXT2_ET_DIR_CORRUPTED;
+			if (ctx->errcode)
+				return BLOCK_ABORT;
+			ext2fs_set_rec_len(fs, rec_len +
+					sizeof(struct ext2_dir_entry_tail),
+					penultimate_de);
+			changed = 1;
+		} else {
+			int csum_size = sizeof(struct ext2_dir_entry_tail);
+			struct ext2_dir_entry_tail *t;
+
+			/*
+			 * If the last dirent looks like the tail, just update
+			 * the checksum.
+			 */
+			if (!last_de->inode &&
+			    rec_len == csum_size) {
+				t = (struct ext2_dir_entry_tail *)last_de;
+				t->reserved_name_len = EXT2_DIR_NAME_LEN_CSUM;
+				changed = 1;
+				goto out;
+			}
+			if (name_size & 3)
+				name_size = (name_size & ~3) + 4;
+			/* If there's not enough space for the tail, e2fsck */
+			if (rec_len <= (8 + name_size + csum_size)) {
+				request_dir_fsck_afterwards(fs);
+				return 0;
+			}
+			/* Shorten that last de and insert the tail */
+			ext2fs_set_rec_len(fs, rec_len - csum_size, last_de);
+			t = EXT2_DIRENT_TAIL(ctx->buf, fs->blocksize);
+			ext2fs_initialize_dirent_tail(fs, t);
+
+			/* Always update checksum */
+			changed = 1;
+		}
+	}
+
+out:
+	if (!changed)
+		return 0;
+
+	ctx->errcode = ext2fs_write_dir_block4(fs, *blocknr, ctx->buf,
+					       0, ctx->dir);
+	if (ctx->errcode)
+		return BLOCK_ABORT;
+
+	return 0;
+}
+
+errcode_t rewrite_directory(ext2_filsys fs, ext2_ino_t dir,
+			    struct ext2_inode *inode)
+{
+	errcode_t	retval;
+	struct rewrite_dir_context ctx;
+
+	retval = ext2fs_get_mem(fs->blocksize, &ctx.buf);
+	if (retval)
+		return retval;
+
+	ctx.is_htree = (inode->i_flags & EXT2_INDEX_FL);
+	ctx.dir = dir;
+	retval = ext2fs_block_iterate3(fs, dir, BLOCK_FLAG_READ_ONLY |
+						BLOCK_FLAG_DATA_ONLY,
+				       0, rewrite_dir_block, &ctx);
+
+	ext2fs_free_mem(&ctx.buf);
+	if (retval)
+		return retval;
+
+	return ctx.errcode;
+}
+
+/*
  * Forcibly set checksums in all inodes.
  */
 static void rewrite_inodes(ext2_filsys fs)
@@ -465,6 +649,15 @@ static void rewrite_inodes(ext2_filsys fs)
 				"while rewriting extents");
 			exit(1);
 		}
+
+		if (LINUX_S_ISDIR(inode->i_mode)) {
+			retval = rewrite_directory(fs, ino, inode);
+			if (retval) {
+				com_err("rewrite_directory", retval,
+					"while rewriting directories");
+				exit(1);
+			}
+		}
 	} while (ino);
 
 	ext2fs_free_mem(&inode);


  parent reply	other threads:[~2011-12-14  1:16 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-14  1:13 [PATCH v2.2 00/51] e2fsprogs: Add metadata checksumming Darrick J. Wong
2011-12-14  1:13 ` [PATCH 01/51] libext2fs: Read and write full size inodes Darrick J. Wong
     [not found]   ` <15FBE485-FC42-46A4-A2BE-9931A3B933A5@dilger.ca>
2011-12-19 17:46     ` Darrick J. Wong
2011-12-14  1:13 ` [PATCH 02/51] libext2fs: Change ext4 on-disk layout to support metadata checksumming Darrick J. Wong
     [not found]   ` <BBB7550D-77E9-441D-8ECF-C5A5A3B839C8@dilger.ca>
2011-12-19 20:13     ` Darrick J. Wong
2011-12-14  1:13 ` [PATCH 03/51] debugfs: Optionally ignore bad checksums Darrick J. Wong
2011-12-14  1:13 ` [PATCH 04/51] libext2fs: Add inode checksum support Darrick J. Wong
     [not found]   ` <4CD3617E-A647-4CAF-9C35-DF24656CB440@dilger.ca>
2011-12-19 20:05     ` Darrick J. Wong
2011-12-14  1:13 ` [PATCH 05/51] debugfs: Dump inode checksum when appropriate Darrick J. Wong
2011-12-14  1:13 ` [PATCH 06/51] tune2fs: Add inode checksum support Darrick J. Wong
2011-12-14  1:14 ` [PATCH 07/51] e2fsck: Verify and correct inode checksums Darrick J. Wong
     [not found]   ` <701CAD1A-51A8-4F0F-8323-4B2091BF8F78@dilger.ca>
2011-12-19 20:12     ` Darrick J. Wong
2011-12-14  1:14 ` [PATCH 08/51] mke2fs: Allow metadata checksums to be turned on at mkfs time Darrick J. Wong
     [not found]   ` <76441870-91E6-402F-B1F7-F67C97D0B02B@dilger.ca>
2011-12-19 16:59     ` Darrick J. Wong
2011-12-14  1:14 ` [PATCH 09/51] libext2fs: Create the inode bitmap checksum Darrick J. Wong
     [not found]   ` <8D63B0B0-ED5C-426E-82FE-5122A84DFFEC@gmail.com>
2011-12-19 20:03     ` Darrick J. Wong
2011-12-14  1:14 ` [PATCH 10/51] tune2fs: Rewrite inode bitmap checksums Darrick J. Wong
2011-12-14  1:14 ` [PATCH 11/51] dumpe2fs: Display inode bitmap checksum Darrick J. Wong
2011-12-18 18:09   ` Andreas Dilger
2011-12-14  1:14 ` [PATCH 12/51] e2fsck: Verify " Darrick J. Wong
2011-12-14  1:14 ` [PATCH 13/51] libext2fs: Create the block " Darrick J. Wong
2011-12-14  1:14 ` [PATCH 14/51] dumpe2fs: Display " Darrick J. Wong
     [not found]   ` <32C86905-38C6-4897-8A98-26431DB73118@dilger.ca>
2011-12-19 19:50     ` Darrick J. Wong
2011-12-14  1:14 ` [PATCH 15/51] e2fsck: Verify " Darrick J. Wong
2011-12-14  1:15 ` [PATCH 16/51] e2fsck: Don't verify bitmap checksums Darrick J. Wong
2011-12-14  1:15 ` [PATCH 17/51] tune2fs: Rewrite block " Darrick J. Wong
2011-12-14  1:15 ` [PATCH 18/51] libext2fs: Verify and calculate extent tree block checksums Darrick J. Wong
2011-12-14  1:15 ` [PATCH 19/51] tune2fs: Enable extent tree checksums Darrick J. Wong
2011-12-14  1:15 ` [PATCH 20/51] e2fsck: Verify extent tree blocks and clear the bad ones Darrick J. Wong
2011-12-19  6:50   ` Andreas Dilger
2011-12-19 19:47     ` Darrick J. Wong
2011-12-14  1:15 ` [PATCH 21/51] debugfs: Print htree internal node checksums Darrick J. Wong
2011-12-14  1:15 ` [PATCH 22/51] libext2fs: Add dx_root/dx_node checksum calculation and verification helpers Darrick J. Wong
2011-12-14  1:15 ` [PATCH 23/51] e2fsck: Verify htree root/node checksums Darrick J. Wong
2011-12-19  6:57   ` Andreas Dilger
2011-12-19 19:46     ` Darrick J. Wong
2011-12-14  1:15 ` [PATCH 24/51] libext2fs: Introduce dir_entry_tail to provide checksums for directory leaf nodes Darrick J. Wong
2011-12-14  1:16 ` [PATCH 25/51] e2fsck: Check directory leaf block checksums Darrick J. Wong
2011-12-14  1:16 ` Darrick J. Wong [this message]
2011-12-14  1:16 ` [PATCH 27/51] libext2fs: Verify and calculate extended attribute " Darrick J. Wong
2011-12-14  1:16 ` [PATCH 28/51] e2fsck: Check " Darrick J. Wong
2011-12-14  1:16 ` [PATCH 29/51] tune2fs: Rewrite " Darrick J. Wong
2011-12-14  1:16 ` [PATCH 30/51] libext2fs: Calculate and verify superblock checksums Darrick J. Wong
2011-12-14  1:16 ` [PATCH 31/51] e2fsck: Handle superblock checksum errors gracefully Darrick J. Wong
2011-12-14  1:16 ` [PATCH 32/51] libext2fs: Use i_generation in inode-related metadata checksums Darrick J. Wong
2011-12-14  1:16 ` [PATCH 33/51] libext2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2011-12-14  1:17 ` [PATCH 34/51] tune2fs: Store checksum algorithm type in superblock Darrick J. Wong
2011-12-14  1:17 ` [PATCH 35/51] mke2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2011-12-14  1:17 ` [PATCH 36/51] libext2fs: Block group checksum should use metadata_csum algorithm (if feature flag set) Darrick J. Wong
2011-12-14  1:17 ` [PATCH 37/51] tune2fs: Rewrite block group checksums when changing bg_use_meta_csum feature Darrick J. Wong
2011-12-14  1:17 ` [PATCH 38/51] mke2fs: Warn if not enabling all the features that metadata_csum wants Darrick J. Wong
2011-12-14  1:17 ` [PATCH 39/51] libext2fs: Add checksum to MMP block Darrick J. Wong
2011-12-14  1:17 ` [PATCH 40/51] e2fsck: Verify and correct MMP checksum problems Darrick J. Wong
2011-12-14  1:17 ` [PATCH 41/51] tune2fs: Force MMP update when changing metadata_csum flag Darrick J. Wong
2011-12-14  1:17 ` [PATCH 42/51] libext2fs: Change on-disk journal layout to support metadata checksumming Darrick J. Wong
2011-12-14  1:18 ` [PATCH 43/51] libext2fs: Dump feature flags for jbd2 v2 checksums Darrick J. Wong
2011-12-14  1:18 ` [PATCH 44/51] e2fsck: Check journal superblock checksum prior to recovery Darrick J. Wong
2011-12-14  1:18 ` [PATCH 45/51] e2fsck: Check revoke block checksum during recovery Darrick J. Wong
2011-12-14  1:18 ` [PATCH 46/51] e2fsck: Check descriptor block checksum when recovering journal Darrick J. Wong
2011-12-14  1:18 ` [PATCH 47/51] e2fsck: Check commit block checksum during recovery Darrick J. Wong
2011-12-14  1:18 ` [PATCH 48/51] e2fsck: Verify data block checksums when recovering journal Darrick J. Wong
2011-12-14  1:18 ` [PATCH 49/51] libext2fs: Enable support for the metadata checksumming feature Darrick J. Wong
2011-12-14  1:18 ` [PATCH 50/51] libext2fs: Bring the CRC32c implementation up to date with the kernel implementation Darrick J. Wong
2011-12-14  1:18 ` [PATCH 51/51] e2fsck: Refactor crc32_be code 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=20111214011610.20947.18930.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 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).