From: Dave Chinner <dgc@kernel.org>
To: linux-xfs@vger.kernel.org
Cc: cem@kernel.org
Subject: [PATCH 42/48] xfs: validate logged metadata btree fork roots during recovery
Date: Tue, 13 Oct 2026 17:01:32 +1100 [thread overview]
Message-ID: <20261013060204.3138690-43-dgc@kernel.org> (raw)
In-Reply-To: <20261013060204.3138690-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.
Assisted-by: LLM
Signed-off-by: Dave Chinner <dgc@kernel.org>
---
fs/xfs/xfs_inode_item_recover.c | 129 +++++++++++++++++++++++++++++++-
1 file changed, 128 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c
index b979e922e5e9..09107322ce18 100644
--- a/fs/xfs/xfs_inode_item_recover.c
+++ b/fs/xfs/xfs_inode_item_recover.c
@@ -524,6 +524,132 @@ 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;
+
+ 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, mp->m_rtrmap_maxlevels);
+ if (fa)
+ return fa;
+
+ level = be16_to_cpu(block->bb_level);
+ numrecs = be16_to_cpu(block->bb_numrecs);
+ if (numrecs == 0 ||
+ 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;
+
+ 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, mp->m_rtrefc_maxlevels - 1);
+ if (fa)
+ return fa;
+
+ level = be16_to_cpu(block->bb_level);
+ numrecs = be16_to_cpu(block->bb_numrecs);
+ if (numrecs == 0 ||
+ 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)
+{
+ switch (ldip->di_metatype) {
+ case XFS_METAFILE_RTRMAP:
+ return xlog_dinode_verify_rtrmap_root(mp, ldip, src, size);
+ case XFS_METAFILE_RTREFCOUNT:
+ 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
@@ -629,7 +755,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-10-13 6:03 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-13 6:00 [RFC] [PATCH 00/48] Validate journal log items during log recovery Dave Chinner
2026-10-13 6:00 ` [PATCH 01/48] xfs: set the unmount record operation header length Dave Chinner
2026-10-13 6:00 ` [PATCH 02/48] xfs: add log recovery item validation design document Dave Chinner
2026-10-13 6:00 ` [PATCH 03/48] xfs: lift transaction header parsing out of the region assembly Dave Chinner
2026-10-13 6:00 ` [PATCH 04/48] xfs: track transaction header decode state explicitly Dave Chinner
2026-10-13 6:00 ` [PATCH 05/48] xfs: track the log item being rebuilt with an explicit pointer Dave Chinner
2026-10-13 6:00 ` [PATCH 06/48] xfs: complete log items explicitly during recovery Dave Chinner
2026-10-13 6:00 ` [PATCH 07/48] xfs: add log item validation infrastructure to log recovery Dave Chinner
2026-10-13 6:00 ` [PATCH 08/48] xfs: recover the transaction header as a validated item type Dave Chinner
2026-10-13 6:00 ` [PATCH 09/48] xfs: factor out xlog_recover_validate_ophdr() Dave Chinner
2026-10-13 6:01 ` [PATCH 10/48] xfs: validate operation header length and alignment during recovery Dave Chinner
2026-10-13 6:01 ` [PATCH 11/48] xfs: validate the operation header padding " Dave Chinner
2026-10-13 6:01 ` [PATCH 12/48] xfs: validate the operation header flags " Dave Chinner
2026-10-13 6:01 ` [PATCH 13/48] xfs: enforce zero length control records " Dave Chinner
2026-10-13 6:01 ` [PATCH 14/48] xfs: validate the unmount record " Dave Chinner
2026-10-13 6:01 ` [PATCH 15/48] xfs: handle zero length continuation op headers " Dave Chinner
2026-10-13 6:01 ` [PATCH 16/48] xfs: bound the assembled region size " Dave Chinner
2026-10-13 6:01 ` [PATCH 17/48] xfs: dump the corrupt region when log item validation fails Dave Chinner
2026-10-13 6:01 ` [PATCH 18/48] xfs: validate fixed size log items during recovery Dave Chinner
2026-10-13 6:01 ` [PATCH 19/48] xfs: validate extent free " Dave Chinner
2026-10-13 6:01 ` [PATCH 20/48] xfs: validate and convert extent free intents " Dave Chinner
2026-10-13 6:01 ` [PATCH 21/48] xfs: validate and convert extent free done items " Dave Chinner
2026-10-13 6:01 ` [PATCH 22/48] xfs: validate rmap update intents " Dave Chinner
2026-10-13 6:01 ` [PATCH 23/48] xfs: validate rmap update done items " Dave Chinner
2026-10-13 6:01 ` [PATCH 24/48] xfs: validate refcount update intents " Dave Chinner
2026-10-13 6:01 ` [PATCH 25/48] xfs: validate refcount update done items " Dave Chinner
2026-10-13 6:01 ` [PATCH 26/48] xfs: validate bmap update intents " Dave Chinner
2026-10-13 6:01 ` [PATCH 27/48] xfs: validate bmap update done items " Dave Chinner
2026-10-13 6:01 ` [PATCH 28/48] xfs: validate mapping exchange intents " Dave Chinner
2026-10-13 6:01 ` [PATCH 29/48] xfs: validate mapping exchange done items " Dave Chinner
2026-10-13 6:01 ` [PATCH 30/48] xfs: validate dquot " Dave Chinner
2026-10-13 6:01 ` [PATCH 31/48] xfs: validate attr done " Dave Chinner
2026-10-13 6:01 ` [PATCH 32/48] xfs: validate attr intents " Dave Chinner
2026-10-13 6:01 ` [PATCH 33/48] xfs: convert inode items to host format " Dave Chinner
2026-10-13 6:01 ` [PATCH 34/48] xfs: allow xfs_imap() to map without an inode btree lookup Dave Chinner
2026-10-13 6:01 ` [PATCH 35/48] xfs: validate the inode item format header during recovery Dave Chinner
2026-10-13 6:01 ` [PATCH 36/48] xfs: validate the logged inode core " Dave Chinner
2026-10-13 6:01 ` [PATCH 37/48] xfs: validate the logged inode forks " Dave Chinner
2026-10-13 6:01 ` [PATCH 38/48] xfs: validate logged local fork contents " Dave Chinner
2026-10-13 6:01 ` [PATCH 39/48] xfs: validate logged extent " Dave Chinner
2026-10-13 6:01 ` [PATCH 40/48] xfs: allow a long format btree root to be checked without a cursor Dave Chinner
2026-10-13 6:01 ` [PATCH 41/48] xfs: validate logged btree fork roots during recovery Dave Chinner
2026-10-13 6:01 ` Dave Chinner [this message]
2026-10-13 6:01 ` [PATCH 43/48] xfs: validate buffer item region count " Dave Chinner
2026-10-13 6:01 ` [PATCH 44/48] xfs: validate buffer item regions " Dave Chinner
2026-10-13 6:01 ` [PATCH 45/48] xfs: validate the whole buffer item " Dave Chinner
2026-10-13 6:01 ` [PATCH 46/48] xfs: remove redundant buffer checks from recovery replay Dave Chinner
2026-10-13 6:01 ` [PATCH 47/48] xfs: fail recovery on a buffer type mismatch Dave Chinner
2026-10-13 6:01 ` [PATCH 48/48] 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=20261013060204.3138690-43-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.