From: Dave Chinner <dgc@kernel.org>
To: linux-xfs@vger.kernel.org
Cc: cem@kernel.org
Subject: [PATCH 27/33] xfs: plumb struct xfs_trans **tpp into xfs_direct_write_cow_iomap_begin
Date: Wed, 29 Jul 2026 20:02:11 +1000 [thread overview]
Message-ID: <20260729100629.1943710-28-dgc@kernel.org> (raw)
In-Reply-To: <20260729100629.1943710-1-dgc@kernel.org>
Add a struct xfs_trans **tpp parameter to
xfs_direct_write_cow_iomap_begin(). When tpp is provided and
xfs_reflink_allocate_cow() returns -EAGAIN (needing a transaction),
return -EAGAIN to the caller so they can allocate a transaction
and retry at a higher level. When tpp is NULL, handle the retry
internally as before using a local transaction.
The caller currently passes NULL, so the function continues to
manage its own transaction internally. No functional change.
This is preparation for moving the transaction allocation and
retry logic up to xfs_direct_write_iomap_begin() so that a single
unified retry loop handles both COW and non-COW allocation paths.
Assisted-by: LLM
Signed-off-by: Dave Chinner <dgc@kernel.org>
---
fs/xfs/xfs_iomap.c | 70 +++++++++++++++++++++++++++++-----------------
1 file changed, 44 insertions(+), 26 deletions(-)
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 347a451ec7cb..314a885bf9f3 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -902,6 +902,11 @@ xfs_bmap_hw_atomic_write_possible(
* Handle COW extent allocation and iomap setup for direct writes to reflinked
* files.
*
+ * Transitional tpp handling:
+ * !tpp = do everything internally using local_tp
+ * tpp & !*tpp = caller did locking, wants -EAGAIN if transaction required
+ * tpp && *tpp = caller did locking and transaction allocation
+ *
* The caller passes in an imap and nimaps that the COW allocation will fill
* with the data fork extent mapping. On return, *nimaps indicates whether the
* caller needs to continue with the normal IO path:
@@ -913,6 +918,7 @@ xfs_bmap_hw_atomic_write_possible(
*/
static int
xfs_direct_write_cow_iomap_begin(
+ struct xfs_trans **tpp,
struct xfs_inode *ip,
loff_t offset,
loff_t length,
@@ -927,34 +933,37 @@ xfs_direct_write_cow_iomap_begin(
struct xfs_mount *mp = ip->i_mount;
struct xfs_bmbt_irec cmap;
struct xfs_trans *tp = NULL;
+ struct xfs_trans *local_tp = NULL;
xfs_fileoff_t offset_fsb = XFS_B_TO_FSBT(mp, offset);
xfs_fileoff_t end_fsb = xfs_iomap_end_fsb(mp, offset, length);
bool shared = false;
int error;
u64 seq;
- *lockmode = XFS_ILOCK_EXCL;
+ if (!tpp) {
+ *lockmode = XFS_ILOCK_EXCL;
- error = xfs_ilock_for_iomap(ip, flags, lockmode);
- if (error)
- return error;
+ error = xfs_ilock_for_iomap(ip, flags, lockmode);
+ if (error)
+ return error;
retry:
- *nimaps = 1;
- error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, imap,
- nimaps, 0);
- if (error)
- goto out_unlock;
+ *nimaps = 1;
+ error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, imap,
+ nimaps, 0);
+ if (error)
+ goto out_unlock;
+ } else if (*tpp) {
+ tp = *tpp;
+ }
if (!imap_needs_cow(ip, flags, imap, *nimaps)) {
/*
* Extent is not shared - return the imap and ILOCK to the
* caller for normal IO path processing.
*/
- if (tp) {
- xfs_trans_cancel(tp);
- tp = NULL;
- }
+ if (local_tp)
+ xfs_trans_cancel(local_tp);
return 0;
}
@@ -962,13 +971,21 @@ xfs_direct_write_cow_iomap_begin(
if (flags & IOMAP_NOWAIT)
goto out_unlock;
- /* may drop and re-acquire the ilock */
error = xfs_reflink_allocate_cow(&tp, ip, imap, &cmap, &shared,
lockmode,
(flags & IOMAP_DIRECT) || IS_DAX(VFS_I(ip)));
if (error == -EAGAIN) {
+ ASSERT(!tp);
+
/*
- * COW allocation needs a transaction. Drop the ILOCK and
+ * If the caller can handle the retry, return -EAGAIN so
+ * they can allocate a transaction and call again.
+ */
+ if (tpp)
+ goto out_unlock;
+
+ /*
+ * Otherwise handle the retry internally. Drop the ILOCK and
* allocate a zero-block reservation transaction, which will
* re-acquire the ILOCK. We cannot determine what extent type
* will be found once we've regained the ILOCK, so the callees
@@ -980,22 +997,21 @@ xfs_direct_write_cow_iomap_begin(
* Retry the imap lookup since the extent tree may have changed
* while the ILOCK was not held.
*/
- ASSERT(!tp);
-
xfs_iunlock(ip, *lockmode);
error = xfs_trans_alloc_inode(ip, &M_RES(mp)->tr_write,
0, 0, false, &tp);
if (error)
return error;
+ local_tp = tp;
goto retry;
}
if (error)
goto out_unlock;
- if (tp) {
- error = xfs_trans_commit(tp);
+ if (local_tp) {
+ error = xfs_trans_commit(local_tp);
tp = NULL;
if (error)
goto out_unlock;
@@ -1026,14 +1042,16 @@ xfs_direct_write_cow_iomap_begin(
goto out_unlock;
}
seq = xfs_iomap_inode_sequence(ip, IOMAP_F_SHARED);
- xfs_iunlock(ip, *lockmode);
+ if (!tpp)
+ xfs_iunlock(ip, *lockmode);
return xfs_bmbt_to_iomap(ip, iomap, &cmap, flags, IOMAP_F_SHARED, seq);
out_unlock:
- if (tp)
- xfs_trans_cancel(tp);
- if (*lockmode)
+ if (local_tp) {
+ if (tp)
+ xfs_trans_cancel(local_tp);
xfs_iunlock(ip, *lockmode);
+ }
return error;
}
@@ -1076,9 +1094,9 @@ xfs_direct_write_iomap_begin(
iomap_flags |= IOMAP_F_ATOMIC_BIO;
if (xfs_is_cow_inode(ip)) {
- error = xfs_direct_write_cow_iomap_begin(ip, offset, length,
- flags, iomap, srcmap, &imap, &nimaps,
- &lockmode, iomap_flags);
+ error = xfs_direct_write_cow_iomap_begin(NULL, ip, offset,
+ length, flags, iomap, srcmap, &imap,
+ &nimaps, &lockmode, iomap_flags);
if (error)
return error;
if (!nimaps)
--
2.55.0
next prev parent reply other threads:[~2026-07-29 10:07 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-29 10:01 [RFC PATCH 00/33] XFS: Atomic multi-extent operations via rolling transactions Dave Chinner
2026-07-29 10:01 ` [PATCH 01/33] xfs: fix dirty transaction cancellation in xfs_bmapi_convert_one_delalloc Dave Chinner
2026-07-29 10:01 ` [PATCH 02/33] xfs: fix isize update in xfs_iomap_write_unwritten to track conversion progress Dave Chinner
2026-07-29 10:01 ` [PATCH 03/33] xfs: fix block reservation for zoned RT extent remapping Dave Chinner
2026-07-29 10:01 ` [PATCH 04/33] xfs: factor out COW iomap handling from xfs_direct_write_iomap_begin() Dave Chinner
2026-07-29 10:01 ` [PATCH 05/33] xfs: plumb xfs_trans through xfs_reflink_allocate_cow and fill_cow_hole Dave Chinner
2026-07-29 10:01 ` [PATCH 06/33] xfs: teach xfs_reflink_fill_cow_hole() to use a caller-supplied transaction Dave Chinner
2026-07-29 10:01 ` [PATCH 07/33] xfs: add transaction retry infrastructure to xfs_direct_write_cow_iomap_begin Dave Chinner
2026-07-29 10:01 ` [PATCH 08/33] xfs: return -EAGAIN from xfs_reflink_allocate_cow for COW hole without transaction Dave Chinner
2026-07-29 10:01 ` [PATCH 09/33] xfs: remove internal transaction allocation from xfs_reflink_fill_cow_hole Dave Chinner
2026-07-29 10:01 ` [PATCH 10/33] xfs: use zero-block transaction with xfs_trans_reserve_more_inode for COW holes Dave Chinner
2026-07-29 10:01 ` [PATCH 11/33] xfs: change *tp to **tpp in COW allocation call chain Dave Chinner
2026-07-29 10:01 ` [PATCH 12/33] xfs: convert xfs_reflink_fill_delalloc to use rolling transactions Dave Chinner
2026-07-29 10:01 ` [PATCH 13/33] xfs: return -EAGAIN from xfs_reflink_allocate_cow for all allocation cases Dave Chinner
2026-07-29 10:01 ` [PATCH 14/33] xfs: remove dead internal transaction allocation from xfs_reflink_fill_delalloc Dave Chinner
2026-07-29 10:01 ` [PATCH 15/33] xfs: plumb struct xfs_trans *tp into xfs_bmapi_convert_one_delalloc Dave Chinner
2026-07-29 10:02 ` [PATCH 16/33] xfs: use rolling transaction in xfs_bmapi_convert_delalloc Dave Chinner
2026-07-29 10:02 ` [PATCH 17/33] xfs: remove dead internal transaction path from xfs_bmapi_convert_one_delalloc Dave Chinner
2026-07-29 10:02 ` [PATCH 18/33] xfs: add block reservation renewal to xfs_defer_finish Dave Chinner
2026-07-29 10:02 ` [PATCH 19/33] xfs: factor out xfs_iomap_write_unwritten_one helper Dave Chinner
2026-07-29 10:02 ` [PATCH 20/33] xfs: convert xfs_iomap_write_unwritten to rolling transactions Dave Chinner
2026-07-29 10:02 ` [PATCH 21/33] xfs: plumb struct xfs_trans *tp into xfs_reflink_end_cow_extent Dave Chinner
2026-07-29 10:02 ` [PATCH 22/33] xfs: convert xfs_reflink_end_cow to rolling transactions Dave Chinner
2026-07-29 10:02 ` [PATCH 23/33] xfs: remove xfs_reflink_end_cow_extent wrapper and rename locked variant Dave Chinner
2026-07-29 10:02 ` [PATCH 24/33] xfs: convert xfs_zoned_end_io to rolling transactions Dave Chinner
2026-07-29 10:02 ` [PATCH 25/33] xfs: plumb struct xfs_trans *tp into xfs_iomap_write_direct Dave Chinner
2026-07-29 10:02 ` [PATCH 26/33] xfs: make xfs_iomap_write_direct fill in the iomap directly Dave Chinner
2026-07-29 10:02 ` Dave Chinner [this message]
2026-07-29 10:02 ` [PATCH 28/33] xfs: introduce struct xfs_direct_write_args for direct write call chain Dave Chinner
2026-07-29 10:02 ` [PATCH 29/33] xfs: convert xfs_direct_write_iomap_begin to use dwa struct throughout Dave Chinner
2026-07-29 10:02 ` [PATCH 30/33] xfs: restructure xfs_direct_write_iomap_begin with unified retry loop Dave Chinner
2026-07-29 10:02 ` [PATCH 31/33] xfs: clean up xfs_direct_write_cow_iomap_begin after restructure Dave Chinner
2026-07-29 10:02 ` [PATCH 32/33] xfs: make pNFS block allocation atomic with inode update Dave Chinner
2026-07-29 10:02 ` [PATCH 33/33] xfs: remove dead internal transaction path from xfs_iomap_write_direct 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=20260729100629.1943710-28-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.