From: "Darrick J. Wong" Subject: [PATCH 17/37] e2fsck: Verify block bitmap checksum Date: Wed, 31 Aug 2011 17:37:00 -0700 Message-ID: <20110901003700.1176.54308.stgit@elm3c44.beaverton.ibm.com> References: <20110901003509.1176.51159.stgit@elm3c44.beaverton.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Sunil Mushran , Amir Goldstein , Andi Kleen , Mingming Cao , Joel Becker , linux-ext4@vger.kernel.org, Coly Li To: Andreas Dilger , Theodore Tso , "Darrick J. Wong" Return-path: Received: from e6.ny.us.ibm.com ([32.97.182.146]:48039 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757010Ab1IAAhF (ORCPT ); Wed, 31 Aug 2011 20:37:05 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p810Csxa026853 for ; Wed, 31 Aug 2011 20:12:54 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p810b4QO182696 for ; Wed, 31 Aug 2011 20:37:04 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p810b1N3015333 for ; Wed, 31 Aug 2011 20:37:03 -0400 In-Reply-To: <20110901003509.1176.51159.stgit@elm3c44.beaverton.ibm.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: Check block bitmap checksum and write a new checksum if the verification fails. This is ok because e2fsck has already computed the correct block bitmap. Signed-off-by: Darrick J. Wong --- e2fsck/pass5.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ e2fsck/problem.c | 5 +++++ e2fsck/problem.h | 3 +++ 3 files changed, 68 insertions(+), 0 deletions(-) diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c index a0cc564..63b7e99 100644 --- a/e2fsck/pass5.c +++ b/e2fsck/pass5.c @@ -27,6 +27,7 @@ static void check_inode_bitmaps(e2fsck_t ctx); static void check_inode_end(e2fsck_t ctx); static void check_block_end(e2fsck_t ctx); static void check_inode_bitmap_checksum(e2fsck_t ctx); +static void check_block_bitmap_checksum(e2fsck_t ctx); void e2fsck_pass5(e2fsck_t ctx) { @@ -67,6 +68,7 @@ void e2fsck_pass5(e2fsck_t ctx) return; check_inode_bitmap_checksum(ctx); + check_block_bitmap_checksum(ctx); ext2fs_free_inode_bitmap(ctx->inode_used_map); ctx->inode_used_map = 0; @@ -134,6 +136,64 @@ static void check_inode_bitmap_checksum(e2fsck_t ctx) ext2fs_free_mem(&buf); } +static void check_block_bitmap_checksum(e2fsck_t ctx) +{ + struct problem_context pctx; + struct ext4_group_desc *gdp; + char *buf; + dgrp_t i; + int nbytes; + blk64_t blk_itr; + errcode_t retval; + int csum_flag = 0; + + /* If bitmap is dirty from being fixed, checksum will be corrected */ + if (ext2fs_test_bb_dirty(ctx->fs)) + return; + + nbytes = (size_t)((EXT2_BLOCKS_PER_GROUP(ctx->fs->super) + 7) / 8); + retval = ext2fs_get_memalign(ctx->fs->blocksize, ctx->fs->blocksize, + &buf); + if (retval) + return; + + if (EXT2_HAS_RO_COMPAT_FEATURE(ctx->fs->super, + EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) + csum_flag = 1; + + clear_problem_context(&pctx); + for (i = 0; i < ctx->fs->group_desc_count; i++) { + if (csum_flag && ext2fs_bg_flags_test(ctx->fs, i, + EXT2_BG_BLOCK_UNINIT)) + continue; + + blk_itr = EXT2FS_B2C(ctx->fs, + ctx->fs->super->s_first_data_block) + + (i * (nbytes << 3)); + gdp = (struct ext4_group_desc *)ext2fs_group_desc(ctx->fs, + ctx->fs->group_desc, i); + retval = ext2fs_get_block_bitmap_range2(ctx->fs->block_map, + blk_itr, nbytes << 3, + buf); + if (retval) + break; + + if (ext2fs_bitmap_csum_verify(ctx->fs, i, + gdp->bg_block_bitmap_csum, buf, + nbytes)) + continue; + pctx.group = i; + if (!fix_problem(ctx, PR_5_BLOCK_BITMAP_CSUM_INVALID, &pctx)) + continue; + + /* Fixing one checksum will rewrite all of them */ + ext2fs_mark_bb_dirty(ctx->fs); + break; + } + + ext2fs_free_mem(&buf); +} + static void e2fsck_discard_blocks(e2fsck_t ctx, io_manager manager, blk64_t start, blk64_t count) { diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 35a8055..9629b9e 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -1664,6 +1664,11 @@ static struct e2fsck_problem problem_table[] = { N_("@g %g @i bitmap does not match checksum\n"), PROMPT_FIX, PR_LATCH_IBITMAP | PR_PREEN_OK }, + /* Group N block bitmap does not match checksum */ + { PR_5_BLOCK_BITMAP_CSUM_INVALID, + N_("@g %g @b bitmap does not match checksum\n"), + PROMPT_FIX, PR_LATCH_BBITMAP | PR_PREEN_OK }, + /* Post-Pass 5 errors */ /* Recreate journal if E2F_FLAG_JOURNAL_INODE flag is set */ diff --git a/e2fsck/problem.h b/e2fsck/problem.h index 9766113..8cc461b 100644 --- a/e2fsck/problem.h +++ b/e2fsck/problem.h @@ -1004,6 +1004,9 @@ struct problem_context { /* Inode bitmap checksum does not match */ #define PR_5_INODE_BITMAP_CSUM_INVALID 0x05001A +/* Block bitmap checksum does not match */ +#define PR_5_BLOCK_BITMAP_CSUM_INVALID 0x05001B + /* * Post-Pass 5 errors */