From: Dave Chinner <dgc@kernel.org>
To: linux-xfs@vger.kernel.org
Cc: cem@kernel.org
Subject: [PATCH 52/59] xfs: validate logged metadata btree fork roots during recovery
Date: Tue, 17 Nov 2026 10:15:09 +1100 [thread overview]
Message-ID: <20261116231707.3625263-53-dgc@kernel.org> (raw)
In-Reply-To: <20261116231707.3625263-1-dgc@kernel.org>
A metadata btree format data fork holds an rt rmap or rt refcount btree root,
logged as the expanded in-core btree root like a bmap btree root. Recovery
copied this root into the inode without inspecting it, so a corrupt root was
replayed as it stood.
Validate the logged metadata btree root once the fork has been verified against
the core. The root is checked as a short btree root block whose record count
fills the fork region exactly, and its node pointers are checked to be in range.
The record and key contents are relative to a realtime group, which is not set up
until after log recovery, so their validation is left to the first runtime access
to the root block.
The maximum height of these btrees depends on the filesystem geometry, which
a growfs being recovered can change. The geometry the item will be replayed
against is not known when it is validated, so the root level is bounded by
the largest height any geometry allows. The runtime root loaders check it
against the real geometry once recovery has finished. An empty level zero
root is accepted, because growfs creates these inodes before it adds the
first realtime volume.
Assisted-by: LLM
Signed-off-by: Dave Chinner <dgc@kernel.org>
---
fs/xfs/xfs_inode_item_recover.c | 170 +++++++++++++++++++++++++++++++-
1 file changed, 169 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c
index d9ab9900a201..efb142efa0ef 100644
--- a/fs/xfs/xfs_inode_item_recover.c
+++ b/fs/xfs/xfs_inode_item_recover.c
@@ -529,6 +529,173 @@ xlog_dinode_verify_bmbt_root(
return NULL;
}
+/*
+ * Verify a logged rt rmap btree root, as for the bmap btree root. The node
+ * pointers are filesystem block numbers and are checked here.
+ */
+static xfs_failaddr_t
+xlog_dinode_verify_rtrmap_root(
+ struct xfs_mount *mp,
+ struct xfs_log_dinode *ldip,
+ void *src,
+ unsigned int size)
+{
+ struct xfs_btree_block *block = src;
+ xfs_failaddr_t fa;
+ unsigned int level;
+ unsigned int numrecs;
+ unsigned int i;
+
+ if (size < XFS_RTRMAP_BLOCK_LEN)
+ return __this_address;
+
+ /*
+ * The maximum rtrmap btree height depends on the filesystem geometry,
+ * which a growfs being recovered can change. The geometry this item
+ * will be replayed against is not known yet, so bound the root level by
+ * the largest height any geometry allows. The root is checked against
+ * the real geometry when the inode is loaded after recovery. Tighter
+ * validation depends on solving the recovery geometry problem described
+ * in the log recovery validation design document.
+ */
+ fa = xfs_btree_check_fsblock_root_hdr(mp, XFS_RTRMAP_CRC_MAGIC,
+ xfs_rtrmapbt_maxrecs(mp, size,
+ be16_to_cpu(block->bb_level) == 0),
+ block, 0, xfs_rtrmapbt_maxlevels_ondisk() - 1);
+ if (fa)
+ return fa;
+
+ /*
+ * rtrmap inodes can be dynamically created by growfs, resulting in a
+ * transient state on disk where they can have no contents. Only a level
+ * zero root may be empty.
+ */
+ level = be16_to_cpu(block->bb_level);
+ numrecs = be16_to_cpu(block->bb_numrecs);
+ if (level > 0 && numrecs == 0)
+ return __this_address;
+
+ if (size != xfs_rtrmap_broot_space_calc(level, numrecs))
+ return __this_address;
+
+ /*
+ * A leaf root holds records whose bounds are relative to a realtime
+ * group. The realtime groups are not set up until long after log
+ * recovery runs, so the leaf contents cannot be validated here. That is
+ * deferred to the first runtime access to the root block.
+ */
+ if (level == 0)
+ return NULL;
+
+ for (i = 1; i <= numrecs; i++) {
+ xfs_rtrmap_ptr_t *ptr = xfs_rtrmap_broot_ptr_addr(mp,
+ block, i, size);
+
+ if (!xfs_verify_fsbno(mp, be64_to_cpu(*ptr)))
+ return __this_address;
+ }
+
+ return NULL;
+}
+
+/*
+ * Verify a logged rt refcount btree root, as for the rt rmap btree root.
+ */
+static xfs_failaddr_t
+xlog_dinode_verify_rtrefcount_root(
+ struct xfs_mount *mp,
+ struct xfs_log_dinode *ldip,
+ void *src,
+ unsigned int size)
+{
+ struct xfs_btree_block *block = src;
+ xfs_failaddr_t fa;
+ unsigned int level;
+ unsigned int numrecs;
+ unsigned int i;
+
+ if (size < XFS_RTREFCOUNT_BLOCK_LEN)
+ return __this_address;
+
+ /*
+ * The maximum rtrefcount btree height depends on the filesystem
+ * geometry, which a growfs being recovered can change. The geometry
+ * this item will be replayed against is not known yet, so bound the
+ * root level by the largest height any geometry allows. The root is
+ * checked against the real geometry when the inode is loaded after
+ * recovery. Tighter validation depends on solving the recovery geometry
+ * problem described in the log recovery validation design document.
+ */
+ fa = xfs_btree_check_fsblock_root_hdr(mp, XFS_RTREFC_CRC_MAGIC,
+ xfs_rtrefcountbt_maxrecs(mp, size,
+ be16_to_cpu(block->bb_level) == 0),
+ block, 0, xfs_rtrefcountbt_maxlevels_ondisk() - 1);
+ if (fa)
+ return fa;
+
+ /*
+ * rtrefcount inodes can be dynamically created by growfs, resulting in
+ * a transient state on disk where they can have no contents. Only a
+ * level zero root may be empty.
+ */
+ level = be16_to_cpu(block->bb_level);
+ numrecs = be16_to_cpu(block->bb_numrecs);
+ if (level > 0 && numrecs == 0)
+ return __this_address;
+
+ if (size != xfs_rtrefcount_broot_space_calc(level, numrecs))
+ return __this_address;
+
+ /*
+ * A leaf root holds records whose bounds are relative to a realtime
+ * group. The realtime groups are not set up until long after log
+ * recovery runs, so the leaf contents cannot be validated here. That is
+ * deferred to the first runtime access to the root block.
+ */
+ if (level == 0)
+ return NULL;
+
+ for (i = 1; i <= numrecs; i++) {
+ xfs_rtrefcount_ptr_t *ptr = xfs_rtrefcount_broot_ptr_addr(mp,
+ block, i, size);
+
+ if (!xfs_verify_fsbno(mp, be64_to_cpu(*ptr)))
+ return __this_address;
+ }
+
+ return NULL;
+}
+
+/*
+ * Verify a logged metadata btree root. The metadata btree type is fixed by the
+ * inode, so it is chosen from the log dinode metadata type.
+ */
+static xfs_failaddr_t
+xlog_dinode_verify_metabtree_root(
+ struct xfs_mount *mp,
+ struct xfs_log_dinode *ldip,
+ void *src,
+ unsigned int size)
+{
+ /*
+ * growfs creates these inodes before it adds a realtime volume, so gate
+ * them on the btree feature rather than the realtime btree feature, as
+ * the root loaders do.
+ */
+ switch (ldip->di_metatype) {
+ case XFS_METAFILE_RTRMAP:
+ if (!xfs_has_rmapbt(mp))
+ return __this_address;
+ return xlog_dinode_verify_rtrmap_root(mp, ldip, src, size);
+ case XFS_METAFILE_RTREFCOUNT:
+ if (!xfs_has_reflink(mp))
+ return __this_address;
+ return xlog_dinode_verify_rtrefcount_root(mp, ldip, src, size);
+ default:
+ return __this_address;
+ }
+}
+
/*
* Verify a logged shortform symlink target. The logged target is the on-disk
* form, which is not null terminated, so this cannot use
@@ -635,7 +802,8 @@ xlog_dinode_verify_dfork(
case XFS_DINODE_FMT_META_BTREE:
if (field != XFS_ILOG_DBROOT)
return __this_address;
- break;
+ return xlog_dinode_verify_metabtree_root(mp, ldip,
+ item->ri_buf[2].iov_base, ilfp->ilf_dsize);
}
return NULL;
--
2.55.0
next prev parent reply other threads:[~2026-11-16 23:18 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 23:14 [V2 PATCH 00/59] Validate journal log items during log recovery Dave Chinner
2026-11-16 23:14 ` [PATCH 01/59] xfs: set the unmount record operation header length Dave Chinner
2026-11-16 23:14 ` [PATCH 02/59] xfs: fix the rt rmap btree maximum level checks Dave Chinner
2026-11-16 23:14 ` [PATCH 03/59] xfs: allow an empty rt refcount btree root before the rt volume exists Dave Chinner
2026-11-16 23:14 ` [PATCH 04/59] xfs: recompute the rt btree maxlevels when growfs changes them Dave Chinner
2026-11-16 23:14 ` [PATCH 05/59] xfs: recompute the transaction reservations after growfs Dave Chinner
2026-11-16 23:14 ` [PATCH 06/59] xfs: skip missing groups when freeing them Dave Chinner
2026-11-16 23:14 ` [PATCH 07/59] xfs: update the rt geometry when recovering a superblock change Dave Chinner
2026-11-16 23:14 ` [PATCH 08/59] xfs: reinitialise the filesystem geometry after log recovery Dave Chinner
2026-11-16 23:14 ` [PATCH 09/59] xfs: apply mount superblock updates " Dave Chinner
2026-11-16 23:14 ` [PATCH 10/59] xfs: check the atomic write reservation against the current log size Dave Chinner
2026-11-16 23:14 ` [PATCH 11/59] xfs: fix the bmap btree maximum height calculation Dave Chinner
2026-11-16 23:14 ` [PATCH 12/59] xfs: add log recovery item validation design document Dave Chinner
2026-11-16 23:14 ` [PATCH 13/59] xfs: lift transaction header parsing out of the region assembly Dave Chinner
2026-11-16 23:14 ` [PATCH 14/59] xfs: track transaction header decode state explicitly Dave Chinner
2026-11-16 23:14 ` [PATCH 15/59] xfs: track the log item being rebuilt with an explicit pointer Dave Chinner
2026-11-16 23:14 ` [PATCH 16/59] xfs: complete log items explicitly during recovery Dave Chinner
2026-11-16 23:14 ` [PATCH 17/59] xfs: add log item validation infrastructure to log recovery Dave Chinner
2026-11-16 23:14 ` [PATCH 18/59] xfs: recover the transaction header as a validated item type Dave Chinner
2026-11-16 23:14 ` [PATCH 19/59] xfs: factor out xlog_recover_validate_ophdr() Dave Chinner
2026-11-16 23:14 ` [PATCH 20/59] xfs: validate operation header length and alignment during recovery Dave Chinner
2026-11-16 23:14 ` [PATCH 21/59] xfs: validate the operation header padding " Dave Chinner
2026-11-16 23:14 ` [PATCH 22/59] xfs: validate the operation header flags " Dave Chinner
2026-11-16 23:14 ` [PATCH 23/59] xfs: enforce zero length control records " Dave Chinner
2026-11-16 23:14 ` [PATCH 24/59] xfs: validate the unmount record " Dave Chinner
2026-11-16 23:14 ` [PATCH 25/59] xfs: handle zero length continuation op headers " Dave Chinner
2026-11-16 23:14 ` [PATCH 26/59] xfs: bound the assembled region size " Dave Chinner
2026-11-16 23:14 ` [PATCH 27/59] xfs: dump the corrupt region when log item validation fails Dave Chinner
2026-11-16 23:14 ` [PATCH 28/59] xfs: validate inode create and quota off log items during recovery Dave Chinner
2026-11-16 23:14 ` [PATCH 29/59] xfs: validate extent free " Dave Chinner
2026-11-16 23:14 ` [PATCH 30/59] xfs: validate and convert extent free intents " Dave Chinner
2026-11-16 23:14 ` [PATCH 31/59] xfs: validate and convert extent free done items " Dave Chinner
2026-11-16 23:14 ` [PATCH 32/59] xfs: validate rmap update intents " Dave Chinner
2026-11-16 23:14 ` [PATCH 33/59] xfs: validate rmap update done items " Dave Chinner
2026-11-16 23:14 ` [PATCH 34/59] xfs: validate refcount update intents " Dave Chinner
2026-11-16 23:14 ` [PATCH 35/59] xfs: validate refcount update done items " Dave Chinner
2026-11-16 23:14 ` [PATCH 36/59] xfs: validate bmap update intents " Dave Chinner
2026-11-16 23:14 ` [PATCH 37/59] xfs: validate bmap update done items " Dave Chinner
2026-11-16 23:14 ` [PATCH 38/59] xfs: validate mapping exchange intents " Dave Chinner
2026-11-16 23:14 ` [PATCH 39/59] xfs: validate mapping exchange done items " Dave Chinner
2026-11-16 23:14 ` [PATCH 40/59] xfs: validate dquot " Dave Chinner
2026-11-16 23:14 ` [PATCH 41/59] xfs: validate attr done " Dave Chinner
2026-11-16 23:14 ` [PATCH 42/59] xfs: validate attr intents " Dave Chinner
2026-11-16 23:15 ` [PATCH 43/59] xfs: convert inode items to host format " Dave Chinner
2026-11-16 23:15 ` [PATCH 44/59] xfs: allow xfs_imap() to map without an inode btree lookup Dave Chinner
2026-11-16 23:15 ` [PATCH 45/59] xfs: validate the inode item format header during recovery Dave Chinner
2026-11-16 23:15 ` [PATCH 46/59] xfs: validate the logged inode core " Dave Chinner
2026-11-16 23:15 ` [PATCH 47/59] xfs: validate the logged inode forks " Dave Chinner
2026-11-16 23:15 ` [PATCH 48/59] xfs: validate logged local fork contents " Dave Chinner
2026-11-16 23:15 ` [PATCH 49/59] xfs: validate logged extent " Dave Chinner
2026-11-16 23:15 ` [PATCH 50/59] xfs: allow a long format btree root to be checked without a cursor Dave Chinner
2026-11-16 23:15 ` [PATCH 51/59] xfs: validate logged btree fork roots during recovery Dave Chinner
2026-11-16 23:15 ` Dave Chinner [this message]
2026-11-16 23:15 ` [PATCH 53/59] xfs: check logged btree fork roots fit in the inode fork " Dave Chinner
2026-11-16 23:15 ` [PATCH 54/59] xfs: validate buffer item region count " Dave Chinner
2026-11-16 23:15 ` [PATCH 55/59] xfs: validate buffer item regions " Dave Chinner
2026-11-16 23:15 ` [PATCH 56/59] xfs: validate the whole buffer item " Dave Chinner
2026-11-16 23:15 ` [PATCH 57/59] xfs: remove redundant buffer checks from recovery replay Dave Chinner
2026-11-16 23:15 ` [PATCH 58/59] xfs: fail recovery on a buffer type mismatch Dave Chinner
2026-11-16 23:15 ` [PATCH 59/59] xfs: validate logged dquot buffers during recovery Dave Chinner
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=20261116231707.3625263-53-dgc@kernel.org \
--to=dgc@kernel.org \
--cc=cem@kernel.org \
--cc=linux-xfs@vger.kernel.org \
/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