xfs_mdrestore: fix restoration on filesystems with 4k sectors
PATCH 1/1 xfs_mdrestore: fix restoration on filesystems with 4k sectors
From: Darrick J. Wong <[email protected]>
Running xfs/129 on a disk with 4k LBAs produces the following failure:
--- /run/fstests/bin/tests/xfs/129.out 2025-07-15 14:41:40.210489431 -0700
+++ /run/fstests/logs/xfs/129.out.bad 2026-01-05 21:43:08.814485633 -0800
@@ -2,3 +2,8 @@ QA output created by 129
Create the original file blocks
Reflink every other block
Create metadump file, restore it and check restored fs
+xfs_mdrestore: Invalid superblock disk address/length +mount: /opt: can't read superblock on /dev/loop0.
+ dmesg(1) may have more information after failed mount system call.
+mount /dev/loop0 /opt failed
+(see /run/fstests/logs/xfs/129.full for details)
This is a failure to restore a v2 metadump to /dev/loop0. Looking at the metadump itself, the first xfs_meta_extent contains:
{
.xme_addr = 0,
.xme_len = 8,
}Hrm. This is the primary superblock on the data device, with a length of 8x512B = 4K. The original filesystem has this geometry:
# xfs_info /dev/sda4
meta-data=/dev/sda4 isize=512 agcount=4, agsize=2183680 blks
= sectsz=4096 attr=2, projid32bit=1In other words, a sector size of 4k because the device's LBA size is 4k. Regrettably, the metadump validation in mdrestore assumes that the primary superblock is only 512 bytes long, which is not correct for this scenario.
Fix this by allowing an xme_len value of up to the maximum sector size for xfs, which is 32k. Also remove a redundant and confusing mask check for the xme_addr.
Note that this error was masked (at least on little-endian platforms that most of us test on) until recent commit 98f05de13e7815 ("mdrestore:
fix restore_v2() superblock length check") which is why I didn't spot it earlier.
--- mdrestore/xfs_mdrestore.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
mdrestore/xfs_mdrestore.c +12 -4
@@ -437,13 +437,21 @@ restore_v2(if (fread (&xme,sizeof (xme),1 , md_fp) !=1 )fatal ("error reading from metadump file\n" ); -if (xme.xme_addr !=0 ||be32_to_cpu (xme.xme_len) !=1 || - (be64_to_cpu (xme.xme_addr) &XME_ADDR_DEVICE_MASK ) != -XME_ADDR_DATA_DEVICE ) -fatal ("Invalid superblock disk address/length\n" ); +/* +* The first block must be the primary super, which is at the start of +* the data device, which is device 0. +*/ +if (xme.xme_addr !=0 ) +fatal ("Invalid superblock disk address 0x%llx\n" , +be64_to_cpu (xme.xme_addr)); len =BBTOB (be32_to_cpu (xme.xme_len)); +/* The primary superblock is always a single filesystem sector. */ +if (len <BBTOB (1 ) || len >1U <<XFS_MAX_SECTORSIZE_LOG ) +fatal ("Invalid superblock disk length 0x%x\n" , +be32_to_cpu (xme.xme_len)); +if (fread (block_buffer, len,1 , md_fp) !=1 )fatal ("error reading from metadump file\n" );
mdrestore/xfs_mdrestore.c restore_v2( · line 451
Quoted 12 lines · Darrick J. Wong
mdrestore/xfs_mdrestore.c +9
-0+/* +* The first block must be the primary super, which is at the start of +* the data device, which is device 0. +*/ +if (xme.xme_addr !=0 ) +fatal ("Invalid superblock disk address 0x%llx\n" , +be64_to_cpu (xme.xme_addr)); len =BBTOB (be32_to_cpu (xme.xme_len)); +/* The primary superblock is always a single filesystem sector. */ +if (len <BBTOB (1 ) || len >1U <<XFS_MAX_SECTORSIZE_LOG )
I'd use XFS_MAX_SECTORSIZE here instead of open coding the shift.
Otherwise looks good.
Quoted 9 lines · Christoph Hellwig
Quoted 8 lines · Darrick J. Wong
mdrestore/xfs_mdrestore.c +7
-0+/* +* The first block must be the primary super, which is at the start of +* the data device, which is device 0. +*/ +if (xme.xme_addr !=0 ) +fatal ("Invalid superblock disk address 0x%llx\n" , +be64_to_cpu (xme.xme_addr));
Quoted 8 lines
mdrestore/xfs_mdrestore.c restore_v2( · line 451
Quoted 4 lines
mdrestore/xfs_mdrestore.c +2
-0len =BBTOB (be32_to_cpu (xme.xme_len)); +/* The primary superblock is always a single filesystem sector. */ +if (len <BBTOB (1 ) || len >1U <<XFS_MAX_SECTORSIZE_LOG )I'd use
XFS_MAX_SECTORSIZEhere instead of open coding the shift.Otherwise looks good.
Fixed, thanks for reading! :)
--D