Skip to contentSkip to conversation

xfsprogs: reduce bb_numrecs in bno/cnt btrees when log consumes all agf space

PATCH In review Brian Foster 3 participants 3 messages Mar 19, 2013 – Mar 22, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xfsprogs: reduce bb_numrecs in bno/cnt btrees when log consumes all agf space

The mkfs code currently creates a single free space extent record for each of the bno and cnt btrees in each AG. The start block of the record is pushed forward on the AG that hosts an internal log. If the log happens to consume all available space in the AG, the start block becomes equal to sb->sb_agblocks and thus invalid. This causes xfs_repair to complain.

For example, the following sequence:

	mkfs.xfs -d file,name=./fs.img,size=50g,agsize=16m
	xfs_repair ./fs.img

... produces the following xfs_repair output:

Phase 1 - find and verify superblock...
Phase 2 - using internal log
- scan filesystem freespace and inode maps...
invalid start block 4096 in record 0 of bno btree block 1600/1 invalid start block 4096 in record 0 of cnt btree block 1600/2
- found root inode chunk
...

xfs_repair appears to correct the numrecs value such that subsequent checks are successful. The sequence above is pulled from xfstests test #250, which fails due to this behavior.

Modify mkfs.xfs such that we check the block count value of the free space record for the log AG after the log is accounted for. If no space is left for the record, reset the record count to 0.

---

v2:
- Drop the byte swap.
- Add a comment.
- Fix up the commit log description.

 mkfs/xfs_mkfs.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
mkfs/xfs_mkfs.c +18 -0
index c84448e..c57a855 100644
@@ -2592,8 +2592,17 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
 			 */
 			be32_add_cpu(&arec->ar_startblock, logblocks);
 		}
+		/*
+		 * Calculate the record block count and check for the case where
+		 * the log might have consumed all available space in the AG. If
+		 * so, reset the record count to 0 to avoid exposure of an invalid
+		 * record start block.
+		 */
 		arec->ar_blockcount = cpu_to_be32(agsize - 
 					be32_to_cpu(arec->ar_startblock));
+		if (!arec->ar_blockcount)
+			block->bb_numrecs = 0;
+
 		libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
 
 		/*
@@ -2625,8 +2634,17 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
 			}
 			be32_add_cpu(&arec->ar_startblock, logblocks);
 		}
+		/*
+		 * Calculate the record block count and check for the case where
+		 * the log might have consumed all available space in the AG. If
+		 * so, reset the record count to 0 to avoid exposure of an invalid
+		 * record start block.
+		 */
 		arec->ar_blockcount = cpu_to_be32(agsize - 
 					be32_to_cpu(arec->ar_startblock));
+		if (!arec->ar_blockcount)
+			block->bb_numrecs = 0;
+
 		libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
 
 		/*
Signature · 6 lines
1.7.7.6

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v2 1/1
#1 lore raw
Quoted 30 lines · Brian Foster

The mkfs code currently creates a single free space extent record for each of the bno and cnt btrees in each AG. The start block of the record is pushed forward on the AG that hosts an internal log. If the log happens to consume all available space in the AG, the start block becomes equal to sb->sb_agblocks and thus invalid. This causes xfs_repair to complain.

For example, the following sequence:

	mkfs.xfs -d file,name=./fs.img,size=50g,agsize=16m
	xfs_repair ./fs.img

... produces the following xfs_repair output:

Phase 1 - find and verify superblock...
Phase 2 - using internal log
- scan filesystem freespace and inode maps...
invalid start block 4096 in record 0 of bno btree block 1600/1 invalid start block 4096 in record 0 of cnt btree block 1600/2
- found root inode chunk
...

xfs_repair appears to correct the numrecs value such that subsequent checks are successful. The sequence above is pulled from xfstests test #250, which fails due to this behavior.

Modify mkfs.xfs such that we check the block count value of the free space record for the log AG after the log is accounted for. If no space is left for the record, reset the record count to 0.

Quoted 7 lines

---

v2:
- Drop the byte swap.
- Add a comment.
- Fix up the commit log description.

Looks good.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by Dave Chinner on v2 1/1
#2 lore raw
In reply to Brian Foster

Thanks for submitting this patch Brian, it has been committed.

Thanks
--Rich

commit 64ae7fcf6d1284e6905879697b55c4146fa881cf

Author: Brian Foster <[email protected]>
Date:   Tue Mar 19 13:23:35 2013 +0000

xfsprogs: reduce bb_numrecs in bno/cnt btrees when log consumes all
agf space

The mkfs code currently creates a single free space extent record for each of the bno and cnt btrees in each AG. The start block of the record is pushed forward on the AG that hosts an internal log. If the log happens to consume all available space in the AG, the start block becomes equal to sb->sb_agblocks and thus invalid. This causes xfs_repair to complain.

For example, the following sequence:

mkfs.xfs -d file,name=./fs.img,size=50g,agsize=16m xfs_repair ./fs.img

... produces the following xfs_repair output:

Phase 1 - find and verify superblock...
Phase 2 - using internal log
- scan filesystem freespace and inode maps...
invalid start block 4096 in record 0 of bno btree block 1600/1 invalid start block 4096 in record 0 of cnt btree block 1600/2
- found root inode chunk
...

xfs_repair appears to correct the numrecs value such that subsequent checks are successful. The sequence above is pulled from xfstests test #250, which fails due to this behavior.

Modify mkfs.xfs such that we check the block count value of the free space record for the log AG after the log is accounted for. If no space is left for the record, reset the record count to 0.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs