From: John Garry <john.g.garry@oracle.com>
To: brauner@kernel.org, djwong@kernel.org, cem@kernel.org
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com,
ritesh.list@gmail.com, martin.petersen@oracle.com, tytso@mit.edu,
linux-ext4@vger.kernel.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH v3 09/12] xfs: Add xfs_file_dio_write_atomic()
Date: Thu, 27 Feb 2025 18:08:10 +0000 [thread overview]
Message-ID: <20250227180813.1553404-10-john.g.garry@oracle.com> (raw)
In-Reply-To: <20250227180813.1553404-1-john.g.garry@oracle.com>
Add xfs_file_dio_write_atomic() for dedicated handling of atomic writes.
In case of -EAGAIN being returned from iomap_dio_rw(), reissue the write
in CoW-based atomic write mode.
For CoW-based mode, ensure that we have no outstanding IOs which we
may trample on.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: John Garry <john.g.garry@oracle.com>
---
fs/xfs/xfs_file.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 258c82cbce12..76ea59c638c3 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -619,6 +619,46 @@ xfs_file_dio_write_aligned(
return ret;
}
+static noinline ssize_t
+xfs_file_dio_write_atomic(
+ struct xfs_inode *ip,
+ struct kiocb *iocb,
+ struct iov_iter *from)
+{
+ unsigned int iolock = XFS_IOLOCK_SHARED;
+ unsigned int dio_flags = 0;
+ ssize_t ret;
+
+retry:
+ ret = xfs_ilock_iocb_for_write(iocb, &iolock);
+ if (ret)
+ return ret;
+
+ ret = xfs_file_write_checks(iocb, from, &iolock);
+ if (ret)
+ goto out_unlock;
+
+ if (dio_flags & IOMAP_DIO_FORCE_WAIT)
+ inode_dio_wait(VFS_I(ip));
+
+ trace_xfs_file_direct_write(iocb, from);
+ ret = iomap_dio_rw(iocb, from, &xfs_atomic_write_iomap_ops,
+ &xfs_dio_write_ops, dio_flags, NULL, 0);
+
+ if (ret == -EAGAIN && !(iocb->ki_flags & IOCB_NOWAIT) &&
+ !(dio_flags & IOMAP_DIO_ATOMIC_SW)) {
+ xfs_iunlock(ip, iolock);
+ dio_flags = IOMAP_DIO_ATOMIC_SW | IOMAP_DIO_FORCE_WAIT;
+ iolock = XFS_IOLOCK_EXCL;
+ goto retry;
+ }
+
+out_unlock:
+ if (iolock)
+ xfs_iunlock(ip, iolock);
+ return ret;
+}
+
/*
* Handle block unaligned direct I/O writes
*
@@ -723,6 +763,8 @@ xfs_file_dio_write(
return -EINVAL;
if ((iocb->ki_pos | count) & ip->i_mount->m_blockmask)
return xfs_file_dio_write_unaligned(ip, iocb, from);
+ if (iocb->ki_flags & IOCB_ATOMIC)
+ return xfs_file_dio_write_atomic(ip, iocb, from);
return xfs_file_dio_write_aligned(ip, iocb, from);
}
--
2.31.1
next prev parent reply other threads:[~2025-02-27 18:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-27 18:08 [PATCH v3 00/12] large atomic writes for xfs with CoW John Garry
2025-02-27 18:08 ` [PATCH v3 01/12] xfs: Pass flags to xfs_reflink_allocate_cow() John Garry
2025-02-28 1:19 ` Darrick J. Wong
2025-02-27 18:08 ` [PATCH v3 02/12] iomap: Rename IOMAP_ATOMIC -> IOMAP_ATOMIC_HW John Garry
2025-02-27 18:08 ` [PATCH v3 03/12] xfs: Switch atomic write size check in xfs_file_write_iter() John Garry
2025-02-27 18:08 ` [PATCH v3 04/12] xfs: Refactor xfs_reflink_end_cow_extent() John Garry
2025-02-27 18:08 ` [PATCH v3 05/12] iomap: Support SW-based atomic writes John Garry
2025-02-28 1:08 ` Darrick J. Wong
2025-02-27 18:08 ` [PATCH v3 06/12] iomap: Lift blocksize restriction on " John Garry
2025-02-27 18:08 ` [PATCH v3 07/12] xfs: Reflink CoW-based atomic write support John Garry
2025-02-27 18:08 ` [PATCH v3 08/12] xfs: Iomap SW-based " John Garry
2025-02-28 1:19 ` Darrick J. Wong
2025-03-01 19:44 ` kernel test robot
2025-02-27 18:08 ` John Garry [this message]
2025-02-28 1:19 ` [PATCH v3 09/12] xfs: Add xfs_file_dio_write_atomic() Darrick J. Wong
2025-02-28 7:45 ` John Garry
2025-02-28 15:39 ` Darrick J. Wong
2025-03-03 13:45 ` John Garry
2025-02-27 18:08 ` [PATCH v3 10/12] xfs: Commit CoW-based atomic writes atomically John Garry
2025-02-28 1:13 ` Darrick J. Wong
2025-02-27 18:08 ` [PATCH v3 11/12] xfs: Update atomic write max size John Garry
2025-02-27 18:08 ` [PATCH v3 12/12] xfs: Allow block allocator to take an alignment hint John Garry
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=20250227180813.1553404-10-john.g.garry@oracle.com \
--to=john.g.garry@oracle.com \
--cc=brauner@kernel.org \
--cc=cem@kernel.org \
--cc=djwong@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ojaswin@linux.ibm.com \
--cc=ritesh.list@gmail.com \
--cc=tytso@mit.edu \
/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