[PATCH 0/3] repair btree validation improvements

[PATCH 0/3] repair btree validation improvements

[Christoph Hellwig]

This patchset contains some improvements to the allocation btree checking
in xfs_repair.  Patches 2 / 3 are straight ports of code used for xfs_check
in xfs_db and bring the level of btree-related checks up to the standard
of xfs_check, making xfs_repair -n a fully suitable replacement for xfs_check.

Patch 1 is a bug fixes found while validating the other patches.

With this code we could in theory start chaning xfs_check to use xfs_repair
as backend instead of xfs_db, but there are two issues still preventing this
for now:

 - xfs_check is supposed to not give any output when a filesystem is clean
   while xfs_repair is quite noisy
 - xfs_check has a -s option to only complain about serious structural
   issues while xfs_repair lacks the infrastructure for it.
 - xfs_check has -i and -b options to only examine specific blocks or inodes
   in details, while xfs_repair lacks the infrastructure for this.

While we could add support for this in xfs_repair I wonder if we should
just leave xfs_check as-is and instead tie up xfs_repair -n to fsck.xfs
if used with the -f option or the /forcefsck file.  Most fsck programs
are a least a bit noisy to we would fit right in and there's not need
to implement the additional check options.

We can't really get rid of the check code in xfs_db anyway as it's also
used for xfs_ncheck and useful db commands like blockuse.  A second codebase
also provides a useful validation for xfs_repair.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 1/3] repair: fix freespace btree record validation

[Christoph Hellwig]

[-- Attachment #1: repair-extlen --]
[-- Type: text/plain, Size: 1404 bytes --]

MAXEXTLEN is a limit for the bmap btree extent length, not for the freespace
btrees which can fill out the whole u32.  Remove the check which makes
repair skip too large freespace extents.  Also add warnings for freespace
btree records that fail the remaining validations.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfsprogs-dev/repair/scan.c
===================================================================
--- xfsprogs-dev.orig/repair/scan.c	2009-12-01 13:02:49.000000000 +0000
+++ xfsprogs-dev/repair/scan.c	2009-12-01 14:45:14.000000000 +0000
@@ -520,12 +520,18 @@ _("%s freespace btree block claimed (sta
 			len = be32_to_cpu(rp[i].ar_blockcount);
 			end = b + len;
 
-			if (b == 0 || !verify_agbno(mp, agno, b))
-				continue;
-			if (len == 0 || len > MAXEXTLEN)
+			if (b == 0 || !verify_agbno(mp, agno, b)) {
+				do_warn(
+	_("invalid start block %u in record %u of %d btree block %u/%u"),
+					b, i, name, agno, bno);
 				continue;
-			if (!verify_agbno(mp, agno, end - 1))
+			}
+			if (len == 0 || !verify_agbno(mp, agno, end - 1)) {
+				do_warn(
+	_("invalid length %u in record %u of %d btree block %u/%u"),
+					len, i, name, agno, bno);
 				continue;
+			}
 
 			for ( ; b < end; b += blen)  {
 				state = get_bmap_ext(agno, b, end, &blen);

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 2/3] repair: add more fresspace btree checks

[Christoph Hellwig]

[-- Attachment #1: repair-freespace-warn --]
[-- Type: text/plain, Size: 2352 bytes --]

Port over additional checks for the freespace btrees from xfs_db, to get
the same btree checking coverage as in xfs_check.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfsprogs-dev/repair/scan.c
===================================================================
--- xfsprogs-dev.orig/repair/scan.c	2009-12-01 13:07:55.000000000 +0000
+++ xfsprogs-dev/repair/scan.c	2009-12-01 13:09:03.000000000 +0000
@@ -462,6 +462,8 @@ scanfunc_allocbt(
 	int			hdr_errors = 0;
 	int			numrecs;
 	int			state;
+	xfs_extlen_t		lastcount = 0;
+	xfs_agblock_t		lastblock = 0;
 
 	assert(magic == XFS_ABTB_MAGIC || magic == XFS_ABTC_MAGIC);
 
@@ -508,8 +510,14 @@ _("%s freespace btree block claimed (sta
 			hdr_errors++;
 		}
 
-		if (hdr_errors)
+		if (hdr_errors) {
+			do_warn(
+	_("bad btree nrecs (%u, min=%u, max=%u) in bt%s block %u/%u\n"),
+				be16_to_cpu(block->bb_numrecs),
+				mp->m_alloc_mnr[0], mp->m_alloc_mxr[0],
+				name, agno, bno);
 			suspect++;
+		}
 
 		rp = XFS_ALLOC_REC_ADDR(mp, block, 1);
 		for (i = 0; i < numrecs; i++) {
@@ -533,6 +541,24 @@ _("%s freespace btree block claimed (sta
 				continue;
 			}
 
+			if (magic == XFS_ABTB_MAGIC) {
+				if (b <= lastblock) {
+					do_warn(_(
+	"out-of-order bno btree record %d (%u %u) block %u/%u\n"),
+						i, b, len, agno, bno);
+				} else {
+					lastblock = b;
+				}
+			} else {
+				if (len < lastcount) {
+					do_warn(_(
+	"out-of-order cnt btree record %d (%u %u) block %u/%u\n"),
+						i, b, len, agno, bno);
+				} else {
+					lastcount = len;
+				}
+			}
+
 			for ( ; b < end; b += blen)  {
 				state = get_bmap_ext(agno, b, end, &blen);
 				switch (state) {
@@ -579,14 +605,17 @@ _("%s freespace btree block claimed (sta
 	 * don't pass bogus tree flag down further if this block
 	 * looked ok.  bail out if two levels in a row look bad.
 	 */
-
-	if (suspect && !hdr_errors)
-		suspect = 0;
-
 	if (hdr_errors)  {
+		do_warn(
+	_("bad btree nrecs (%u, min=%u, max=%u) in bt%s block %u/%u\n"),
+			be16_to_cpu(block->bb_numrecs),
+			mp->m_alloc_mnr[1], mp->m_alloc_mxr[1],
+			name, agno, bno);
 		if (suspect)
 			return;
-		else suspect++;
+		suspect++;
+	} else if (suspect) {
+		suspect = 0;
 	}
 
 	for (i = 0; i < numrecs; i++)  {

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 3/3] repair: compare superblock / AG headers fields against manual counts

[Christoph Hellwig]

[-- Attachment #1: repair-freespace-warn-2 --]
[-- Type: text/plain, Size: 8990 bytes --]

Compare the free block / inode counters in the superblock and AG headers
against the values we get from a manual btree traversal.  Ported over from
xfs_db to get the same amount of superblock / AG header checking as in
xfs_check.


Note: this causes additional output in the xfstests 030 and 178 which will need
some adjustments in the testcases.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfsprogs-dev/repair/scan.c
===================================================================
--- xfsprogs-dev.orig/repair/scan.c	2009-12-01 14:56:22.000000000 +0000
+++ xfsprogs-dev/repair/scan.c	2009-12-01 15:01:43.000000000 +0000
@@ -34,6 +34,29 @@ extern int verify_set_agheader(xfs_mount
 
 static xfs_mount_t	*mp = NULL;
 
+/*
+ * Global variables to validate superblock values against the manual count
+ * from the btree traversal.
+ *
+ * No locking for now as phase2 is not threaded.
+ */
+static __uint64_t	fdblocks;
+static __uint64_t	icount;
+static __uint64_t	ifreecount;
+
+/*
+ * Global variables to validate AG header values against the manual count
+ * from the btree traversal.
+ *
+ * Note: these values must be reset when processing a new AG, and for now
+ * forces the AG scanning in phase2 to not be threaded.
+ */
+static xfs_extlen_t	agffreeblks;
+static xfs_extlen_t	agflongest;
+static __uint64_t	agfbtreeblks;
+static __uint32_t	agicount;
+static __uint32_t	agifreecount;
+
 void
 set_mp(xfs_mount_t *mpp)
 {
@@ -476,6 +499,17 @@ scanfunc_allocbt(
 		if (suspect)
 			return;
 	}
+
+	/*
+	 * All freespace btree blocks except the roots are freed for a
+	 * fully used filesystem, thus they are counted towards the
+	 * free data block counter.
+	 */
+	if (!isroot) {
+		agfbtreeblks++;
+		fdblocks++;
+	}
+
 	if (be16_to_cpu(block->bb_level) != level) {
 		do_warn(_("expected level %d got %d in bt%s block %d/%d\n"),
 			level, be16_to_cpu(block->bb_level), name, agno, bno);
@@ -500,7 +534,6 @@ _("%s freespace btree block claimed (sta
 	numrecs = be16_to_cpu(block->bb_numrecs);
 
 	if (level == 0) {
-
 		if (numrecs > mp->m_alloc_mxr[0])  {
 			numrecs = mp->m_alloc_mxr[0];
 			hdr_errors++;
@@ -550,6 +583,10 @@ _("%s freespace btree block claimed (sta
 					lastblock = b;
 				}
 			} else {
+				fdblocks += len;
+				agffreeblks += len;
+				if (len > agflongest)
+					agflongest = len;
 				if (len < lastcount) {
 					do_warn(_(
 	"out-of-order cnt btree record %d (%u %u) block %u/%u\n"),
@@ -930,8 +967,14 @@ _("inode btree block claimed (state %d),
 		 * of INODES_PER_CHUNK (64) inodes.  off is the offset into
 		 * the block.  skip processing of bogus records.
 		 */
-		for (i = 0; i < numrecs; i++)
+		for (i = 0; i < numrecs; i++) {
+			agicount += XFS_INODES_PER_CHUNK;
+			icount += XFS_INODES_PER_CHUNK;
+			agifreecount += be32_to_cpu(rp[i].ir_freecount);
+			ifreecount += be32_to_cpu(rp[i].ir_freecount);
+
 			suspect = scan_single_ino_chunk(agno, &rp[i], suspect);
+		}
 
 		if (suspect)
 			bad_ino_btree = 1;
@@ -1024,25 +1067,150 @@ scan_freelist(
 		do_warn(_("freeblk count %d != flcount %d in ag %d\n"), count,
 			be32_to_cpu(agf->agf_flcount), agno);
 	}
+
+	fdblocks += count;
+
 	libxfs_putbuf(agflbuf);
 }
 
+static void
+validate_agf(
+	struct xfs_agf		*agf,
+	xfs_agnumber_t		agno)
+{
+	xfs_agblock_t		bno;
+
+	bno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]);
+	if (bno != 0 && verify_agbno(mp, agno, bno)) {
+		scan_sbtree(bno, be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]),
+			    agno, 0, scanfunc_bno, 1);
+	} else {
+		do_warn(_("bad agbno %u for btbno root, agno %d\n"),
+			bno, agno);
+	}
+
+	bno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]);
+	if (bno != 0 && verify_agbno(mp, agno, bno)) {
+		scan_sbtree(bno, be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]),
+			    agno, 0, scanfunc_cnt, 1);
+	} else  {
+		do_warn(_("bad agbno %u for btbcnt root, agno %d\n"),
+			bno, agno);
+	}
+
+	if (be32_to_cpu(agf->agf_freeblks) != agffreeblks) {
+		do_warn(_("agf_freeblks %u, counted %u in ag %u\n"),
+			be32_to_cpu(agf->agf_freeblks), agffreeblks, agno);
+	}
+
+	if (be32_to_cpu(agf->agf_longest) != agflongest) {
+		do_warn(_("agf_longest %u, counted %u in ag %u\n"),
+			be32_to_cpu(agf->agf_longest), agflongest, agno);
+	}
+
+	if (xfs_sb_version_haslazysbcount(&mp->m_sb) &&
+	    be32_to_cpu(agf->agf_btreeblks) != agfbtreeblks) {
+		do_warn(_("agf_btreeblks %u, counted %u in ag %u\n"),
+			be32_to_cpu(agf->agf_btreeblks), agfbtreeblks, agno);
+	}
+}
+
+static void
+validate_agi(
+	struct xfs_agi		*agi,
+	xfs_agnumber_t		agno)
+{
+	xfs_agblock_t		bno;
+	int			i;
+
+	bno = be32_to_cpu(agi->agi_root);
+	if (bno != 0 && verify_agbno(mp, agno, bno)) {
+		scan_sbtree(bno, be32_to_cpu(agi->agi_level),
+			    agno, 0, scanfunc_ino, 1);
+	} else {
+		do_warn(_("bad agbno %u for inobt root, agno %d\n"),
+			be32_to_cpu(agi->agi_root), agno);
+	}
+
+	if (be32_to_cpu(agi->agi_count) != agicount) {
+		do_warn(_("agi_count %u, counted %u in ag %u\n"),
+			 be32_to_cpu(agi->agi_count), agicount, agno);
+	}
+
+	if (be32_to_cpu(agi->agi_freecount) != agifreecount) {
+		do_warn(_("agi_freecount %u, counted %u in ag %u\n"),
+			be32_to_cpu(agi->agi_freecount), agifreecount, agno);
+	}
+
+	for (i = 0; i < XFS_AGI_UNLINKED_BUCKETS; i++) {
+		xfs_agino_t	agino = be32_to_cpu(agi->agi_unlinked[i]);
+
+		if (agino != NULLAGINO) {
+			do_warn(
+	_("agi unlinked bucket %d is %u in ag %u (inode=%lld)\n"),
+				i, agino, agno,
+				XFS_AGINO_TO_INO(mp, agno, agino));
+		}
+	}
+}
+
+/*
+ * Validate block/inode counts in the superblock.
+ *
+ * Note: needs to be called after scan_ag() has been called for all
+ * allocation groups.
+ */
+void
+validate_sb(
+	struct xfs_sb		*sb)
+{
+	if (sb->sb_icount != icount) {
+		do_warn(_("sb_icount %lld, counted %lld\n"),
+			sb->sb_icount, icount);
+	}
+
+	if (sb->sb_ifree != ifreecount) {
+		do_warn(_("sb_ifree %lld, counted %lld\n"),
+			sb->sb_ifree, ifreecount);
+	}
+
+	if (sb->sb_fdblocks != fdblocks) {
+		do_warn(_("sb_fdblocks %lld, counted %lld\n"),
+			sb->sb_fdblocks, fdblocks);
+	}
+
+	/* XXX: check sb_frextents */
+}
+
+/*
+ * Scan an AG for obvious corruption.
+ *
+ * Note: This code is not reentrant due to the use of global variables.
+ */
 void
 scan_ag(
 	xfs_agnumber_t	agno)
 {
 	xfs_agf_t	*agf;
 	xfs_buf_t	*agfbuf;
-	int		agf_dirty;
+	int		agf_dirty = 0;
 	xfs_agi_t	*agi;
 	xfs_buf_t	*agibuf;
-	int		agi_dirty;
+	int		agi_dirty = 0;
 	xfs_sb_t	*sb;
 	xfs_buf_t	*sbbuf;
-	int		sb_dirty;
+	int		sb_dirty = 0;
 	int		status;
 
-	agi_dirty = agf_dirty = sb_dirty = 0;
+	/*
+	 * Reset the global variables to track the AG header validity.
+	 *
+	 * Because we use global variable but can get called multiple times
+	 * we have to make sure to always reset these variables.
+	 */
+	agicount = agifreecount = 0;
+	agffreeblks = agfbtreeblks = 0;
+	agflongest = 0;
 
 	sbbuf = libxfs_readbuf(mp->m_dev, XFS_AG_DADDR(mp, agno, XFS_SB_DADDR),
 				XFS_FSS_TO_BB(mp, 1), 0);
@@ -1135,33 +1303,8 @@ scan_ag(
 
 	scan_freelist(agf);
 
-	if (be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]) != 0 && verify_agbno(mp,
-			agno, be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO])))
-		scan_sbtree(be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]),
-				be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]),
-				agno, 0, scanfunc_bno, 1);
-	else
-		do_warn(_("bad agbno %u for btbno root, agno %d\n"),
-			be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]),
-			agno);
-
-	if (be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]) != 0 && verify_agbno(mp,
-			agno, be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT])))
-		scan_sbtree(be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]),
-				be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]),
-				agno, 0, scanfunc_cnt, 1);
-	else
-		do_warn(_("bad agbno %u for btbcnt root, agno %d\n"),
-			be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]),
-			agno);
-
-	if (be32_to_cpu(agi->agi_root) != 0 && verify_agbno(mp, agno,
-						be32_to_cpu(agi->agi_root)))
-		scan_sbtree(be32_to_cpu(agi->agi_root),
-			be32_to_cpu(agi->agi_level), agno, 0, scanfunc_ino, 1);
-	else
-		do_warn(_("bad agbno %u for inobt root, agno %d\n"),
-			be32_to_cpu(agi->agi_root), agno);
+	validate_agf(agf, agno);
+	validate_agi(agi, agno);
 
 	ASSERT(agi_dirty == 0 || (agi_dirty && !no_modify));
 
Index: xfsprogs-dev/repair/phase2.c
===================================================================
--- xfsprogs-dev.orig/repair/phase2.c	2009-12-01 14:54:18.000000000 +0000
+++ xfsprogs-dev/repair/phase2.c	2009-12-01 14:59:56.000000000 +0000
@@ -27,6 +27,7 @@
 
 void	set_mp(xfs_mount_t *mpp);
 void	scan_ag(xfs_agnumber_t agno);
+void	validate_sb(struct xfs_sb *sb);
 
 /* workaround craziness in the xlog routines */
 int xlog_recover_do_trans(xlog_t *log, xlog_recover_t *t, int p) { return 0; }
@@ -144,6 +145,11 @@ phase2(xfs_mount_t *mp)
 #endif
 	}
 
+	/*
+	 * Validate that our manual counts match the superblock.
+	 */
+	validate_sb(&mp->m_sb);
+
 	print_final_rpt();
 
 	/*

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 0/3] repair btree validation improvements

[Christoph Hellwig]

ping?

On Tue, Dec 01, 2009 at 10:05:03AM -0500, Christoph Hellwig wrote:
> This patchset contains some improvements to the allocation btree checking
> in xfs_repair.  Patches 2 / 3 are straight ports of code used for xfs_check
> in xfs_db and bring the level of btree-related checks up to the standard
> of xfs_check, making xfs_repair -n a fully suitable replacement for xfs_check.
> 
> Patch 1 is a bug fixes found while validating the other patches.
> 
> With this code we could in theory start chaning xfs_check to use xfs_repair
> as backend instead of xfs_db, but there are two issues still preventing this
> for now:
> 
>  - xfs_check is supposed to not give any output when a filesystem is clean
>    while xfs_repair is quite noisy
>  - xfs_check has a -s option to only complain about serious structural
>    issues while xfs_repair lacks the infrastructure for it.
>  - xfs_check has -i and -b options to only examine specific blocks or inodes
>    in details, while xfs_repair lacks the infrastructure for this.
> 
> While we could add support for this in xfs_repair I wonder if we should
> just leave xfs_check as-is and instead tie up xfs_repair -n to fsck.xfs
> if used with the -f option or the /forcefsck file.  Most fsck programs
> are a least a bit noisy to we would fit right in and there's not need
> to implement the additional check options.
> 
> We can't really get rid of the check code in xfs_db anyway as it's also
> used for xfs_ncheck and useful db commands like blockuse.  A second codebase
> also provides a useful validation for xfs_repair.
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
---end quoted text---

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/3] repair: fix freespace btree record validation

[Dave Chinner]

On Tue, Dec 01, 2009 at 10:05:04AM -0500, Christoph Hellwig wrote:
> MAXEXTLEN is a limit for the bmap btree extent length, not for the freespace
> btrees which can fill out the whole u32.  Remove the check which makes
> repair skip too large freespace extents.  Also add warnings for freespace
> btree records that fail the remaining validations.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks good.

Reviewed-by: Dave Chinner <david@fromorbit.com>

-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] repair: add more fresspace btree checks

[Dave Chinner]

On Tue, Dec 01, 2009 at 10:05:05AM -0500, Christoph Hellwig wrote:
> Port over additional checks for the freespace btrees from xfs_db, to get
> the same btree checking coverage as in xfs_check.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks good - the additional informational output will be useful when
problems are found.

Reviewed-by: Dave Chinner <david@fromorbit.com>

-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 3/3] repair: compare superblock / AG headers fields against manual counts

[Dave Chinner]

On Tue, Dec 01, 2009 at 10:05:06AM -0500, Christoph Hellwig wrote:
> Compare the free block / inode counters in the superblock and AG headers
> against the values we get from a manual btree traversal.  Ported over from
> xfs_db to get the same amount of superblock / AG header checking as in
> xfs_check.
> 
> 
> Note: this causes additional output in the xfstests 030 and 178 which will need
> some adjustments in the testcases.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
.....
> @@ -550,6 +583,10 @@ _("%s freespace btree block claimed (sta
>  					lastblock = b;
>  				}
>  			} else {
> +				fdblocks += len;
> +				agffreeblks += len;
> +				if (len > agflongest)
> +					agflongest = len;
>  				if (len < lastcount) {
>  					do_warn(_(
>  	"out-of-order cnt btree record %d (%u %u) block %u/%u\n"),

Might be worth a comment here saying that we are only calculating
totals from the ABTC btree scan. OTOH, is is worth checking that the
two btrees add up to the same number of free blocks, same maximum
length extent, etc?

Otherwise looks good.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 3/3] repair: compare superblock / AG headers fields against manual counts

[Christoph Hellwig]

On Thu, Dec 31, 2009 at 09:43:14AM +1100, Dave Chinner wrote:
> Might be worth a comment here saying that we are only calculating
> totals from the ABTC btree scan. OTOH, is is worth checking that the
> two btrees add up to the same number of free blocks, same maximum
> length extent, etc?

Yes, I'll look into adding that additional check.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs