From: Dave Chinner <dgc@kernel.org>
To: linux-xfs@vger.kernel.org
Cc: cem@kernel.org
Subject: [PATCH 25/59] xfs: handle zero length continuation op headers during recovery
Date: Tue, 17 Nov 2026 10:14:42 +1100 [thread overview]
Message-ID: <20261116231707.3625263-26-dgc@kernel.org> (raw)
In-Reply-To: <20261116231707.3625263-1-dgc@kernel.org>
The log writer can start the transaction header at the start of a checkpoint
with a zero length op header, with the header data following in the
continuation. This is the only region the log writer ever opens with a zero
length op header. Recovery used to handle this as a special case in the
bespoke transaction header decode. Routing the transaction header through the
generic item assembly dropped that handling.
A zero length op header that opens the transaction header carries nothing to
decode, so the item cannot be initialised until the continuation arrives.
Leave a sentinel in r_cur_item for this case so the continuation is decoded as
the first region of the transaction header.
A zero length op header anywhere else in a checkpoint is corrupt, as is a zero
length op header that completes a region. Reject them. A continuation that
reaches the append path with no item under assembly is also treated as a
corrupt log.
Assisted-by: LLM
Signed-off-by: Dave Chinner <dgc@kernel.org>
---
fs/xfs/libxfs/xfs_log_recover.h | 9 +++++
fs/xfs/xfs_log_recover.c | 59 ++++++++++++++++++++++++++++-----
2 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
index f4dbed616ee6..d2e128fca058 100644
--- a/fs/xfs/libxfs/xfs_log_recover.h
+++ b/fs/xfs/libxfs/xfs_log_recover.h
@@ -171,6 +171,15 @@ struct xlog_recover {
struct xlog_recover_item *r_cur_item; /* item currently being rebuilt */
};
+/*
+ * The current recovery item can sometimes start with a zero length continuation
+ * op header. In this case there is nothing to decode, so the recovery item
+ * cannot be initialised yet. Leave this sentinel in r_cur_item instead so the
+ * continuation initialises the recovery item from the start of the continued
+ * region data.
+ */
+#define XLOG_RECOVER_CONT_ITEM ((struct xlog_recover_item *)1UL)
+
#define ITEM_TYPE(i) (*(unsigned short *)(i)->ri_buf[0].iov_base)
#define XLOG_RECOVER_CRCPASS 0
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 0c7788345cd3..aea6f5404cec 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2400,6 +2400,18 @@ xlog_recover_add_to_cont_trans(
char *ptr, *old_ptr;
int old_len;
+ /*
+ * A continuation must append to a region under assembly. The only valid
+ * way to reach here without one is a region opened by a zero length op
+ * header, which the dispatch in xlog_recovery_process_trans() routes to
+ * xlog_recover_add_to_trans() instead. So no current item here means the
+ * log is corrupt.
+ */
+ if (!item) {
+ xfs_warn(log->l_mp, "%s: continuation with no item", __func__);
+ return -EFSCORRUPTED;
+ }
+
old_ptr = item->ri_buf[item->ri_cnt-1].iov_base;
old_len = item->ri_buf[item->ri_cnt-1].iov_len;
@@ -2445,8 +2457,28 @@ xlog_recover_add_to_trans(
char *ptr;
int error;
- if (!len)
+ /*
+ * Only the transaction header at the start of a checkpoint can be
+ * opened by a zero length fragment, with its data following in the
+ * continuation. A zero length fragment anywhere else, or one that
+ * completes a region, is corrupt.
+ *
+ * There is nothing to decode yet, so leave a sentinel in r_cur_item so
+ * that xlog_recover_process_trans() will call here again with the
+ * continuation that carries the data we need to initialise the
+ * recovery item.
+ */
+ if (!len) {
+ if (region_complete || trans->r_cur_item ||
+ trans->r_theader.th_magic == XFS_TRANS_HEADER_MAGIC) {
+ xfs_warn(log->l_mp,
+ "%s: zero length region in transaction 0x%x",
+ __func__, trans->r_log_tid);
+ return -EFSCORRUPTED;
+ }
+ trans->r_cur_item = XLOG_RECOVER_CONT_ITEM;
return 0;
+ }
ptr = xlog_kvmalloc(len);
memcpy(ptr, dp, len);
@@ -2461,7 +2493,7 @@ xlog_recover_add_to_trans(
* fragment here.
*/
item = trans->r_cur_item;
- if (!item) {
+ if (!item || item == XLOG_RECOVER_CONT_ITEM) {
struct xfs_inode_log_format *in_f = /* any will do */
(struct xfs_inode_log_format *)ptr;
@@ -2517,9 +2549,10 @@ xlog_recover_free_trans(
/*
* An item still being rebuilt has not been added to the item queue yet,
- * so free it separately.
+ * so free it separately. The sentinel is not a real item and has nothing
+ * to free.
*/
- if (trans->r_cur_item)
+ if (trans->r_cur_item && trans->r_cur_item != XLOG_RECOVER_CONT_ITEM)
xlog_recover_free_item(trans->r_cur_item);
/* Free the transaction recover structure */
@@ -2564,15 +2597,25 @@ xlog_recovery_process_trans(
*/
switch (flags) {
/* expected flag values */
+ case XLOG_WAS_CONT_TRANS:
+ /*
+ * A continuation appends to the region under assembly, unless
+ * the region was opened by a zero length op header. In that case
+ * r_cur_item holds the sentinel and this continuation carries
+ * the first data of the region, so fall through and decode it as
+ * the first region of a new item.
+ */
+ if (trans->r_cur_item != XLOG_RECOVER_CONT_ITEM) {
+ error = xlog_recover_add_to_cont_trans(log, trans, dp,
+ len, region_complete);
+ break;
+ }
+ fallthrough;
case 0:
case XLOG_CONTINUE_TRANS:
error = xlog_recover_add_to_trans(log, trans, dp, len,
region_complete);
break;
- case XLOG_WAS_CONT_TRANS:
- error = xlog_recover_add_to_cont_trans(log, trans, dp, len,
- region_complete);
- break;
case XLOG_COMMIT_TRANS:
/*
* The commit record is written after all items in the
--
2.55.0
next prev parent reply other threads:[~2026-11-16 23:17 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 ` Dave Chinner [this message]
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 ` [PATCH 52/59] xfs: validate logged metadata " Dave Chinner
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-26-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