From: John Garry <john.g.garry@oracle.com>
To: axboe@kernel.dk, brauner@kernel.org, djwong@kernel.org,
viro@zeniv.linux.org.uk, jack@suse.cz, chandan.babu@oracle.com,
dchinner@redhat.com, hch@lst.de
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
hare@suse.de, martin.petersen@oracle.com,
catherine.hoang@oracle.com, kbusch@kernel.org,
John Garry <john.g.garry@oracle.com>
Subject: [PATCH v5 6/7] xfs: Validate atomic writes
Date: Sat, 17 Aug 2024 09:47:59 +0000 [thread overview]
Message-ID: <20240817094800.776408-7-john.g.garry@oracle.com> (raw)
In-Reply-To: <20240817094800.776408-1-john.g.garry@oracle.com>
Validate that an atomic write adheres to length/offset rules. Since we
require extent alignment for atomic writes, this effectively also enforces
that the BIO which iomap produces is aligned.
For an IOCB with IOCB_ATOMIC set to get as far as xfs_file_dio_write(),
FMODE_CAN_ATOMIC_WRITE will need to be set for the file; for this,
FORCEALIGN and also ATOMICWRITES flags would also need to be set for the
inode.
Signed-off-by: John Garry <john.g.garry@oracle.com>
---
fs/xfs/xfs_file.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 4cdc54dc9686..9b6530a4eb4a 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -684,9 +684,20 @@ xfs_file_dio_write(
struct kiocb *iocb,
struct iov_iter *from)
{
- struct xfs_inode *ip = XFS_I(file_inode(iocb->ki_filp));
+ struct inode *inode = file_inode(iocb->ki_filp);
+ struct xfs_inode *ip = XFS_I(inode);
struct xfs_buftarg *target = xfs_inode_buftarg(ip);
size_t count = iov_iter_count(from);
+ struct xfs_mount *mp = ip->i_mount;
+
+ if (iocb->ki_flags & IOCB_ATOMIC) {
+ if (count < i_blocksize(inode))
+ return -EINVAL;
+ if (count > XFS_FSB_TO_B(mp, ip->i_extsize))
+ return -EINVAL;
+ if (!generic_atomic_write_valid(iocb, from))
+ return -EINVAL;
+ }
/* direct I/O must be aligned to device logical sector size */
if ((iocb->ki_pos | count) & target->bt_logical_sectormask)
--
2.31.1
next prev parent reply other threads:[~2024-08-17 9:48 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-17 9:47 [PATCH v5 0/7] block atomic writes for xfs John Garry
2024-08-17 9:47 ` [PATCH v5 1/7] block/fs: Pass an iocb to generic_atomic_write_valid() John Garry
2024-08-20 17:28 ` Darrick J. Wong
2024-08-17 9:47 ` [PATCH v5 2/7] fs: Export generic_atomic_write_valid() John Garry
2024-08-20 17:28 ` Darrick J. Wong
2024-08-17 9:47 ` [PATCH v5 3/7] fs: iomap: Atomic write support John Garry
2024-08-21 16:58 ` Darrick J. Wong
2024-08-22 15:29 ` John Garry
2024-08-22 20:30 ` Darrick J. Wong
2024-08-30 15:48 ` John Garry
2024-08-30 23:56 ` Darrick J. Wong
2024-09-03 12:43 ` John Garry
2024-08-17 9:47 ` [PATCH v5 4/7] xfs: Support FS_XFLAG_ATOMICWRITES for forcealign John Garry
2024-08-21 17:07 ` Darrick J. Wong
2024-08-22 17:45 ` John Garry
2024-08-22 20:38 ` Darrick J. Wong
2024-08-23 8:39 ` John Garry
2024-08-23 16:03 ` Darrick J. Wong
2024-08-17 9:47 ` [PATCH v5 5/7] xfs: Support atomic write for statx John Garry
2024-08-21 17:09 ` Darrick J. Wong
2024-08-17 9:47 ` John Garry [this message]
2024-08-21 17:10 ` [PATCH v5 6/7] xfs: Validate atomic writes Darrick J. Wong
2024-08-17 9:48 ` [PATCH v5 7/7] xfs: Support setting FMODE_CAN_ATOMIC_WRITE John Garry
2024-08-21 17:11 ` Darrick J. Wong
2024-08-22 18:04 ` John Garry
2024-08-22 20:44 ` Darrick J. Wong
2024-08-23 10:41 ` John Garry
2024-08-23 15:52 ` Darrick J. Wong
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=20240817094800.776408-7-john.g.garry@oracle.com \
--to=john.g.garry@oracle.com \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=catherine.hoang@oracle.com \
--cc=chandan.babu@oracle.com \
--cc=dchinner@redhat.com \
--cc=djwong@kernel.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=kbusch@kernel.org \
--cc=linux-block@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=viro@zeniv.linux.org.uk \
/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.