From: Dave Chinner <david@fromorbit.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Christian Brauner <brauner@kernel.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Chandan Babu R <chandan.babu@oracle.com>,
Brian Foster <bfoster@redhat.com>, Jens Axboe <axboe@kernel.dk>,
Jan Kara <jack@suse.cz>, "Darrick J. Wong" <djwong@kernel.org>,
Theodore Ts'o <tytso@mit.edu>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org
Subject: Re: [PATCH 6/6] xfs: refactor xfs_file_fallocate
Date: Thu, 29 Aug 2024 13:11:11 +1000 [thread overview]
Message-ID: <Zs/mz4Gve+znep2M@dread.disaster.area> (raw)
In-Reply-To: <20240827065123.1762168-7-hch@lst.de>
On Tue, Aug 27, 2024 at 08:50:50AM +0200, Christoph Hellwig wrote:
> Refactor xfs_file_fallocate into separate helpers for each mode,
> two factors for i_size handling and a single switch statement over the
> supported modes.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/xfs_file.c | 330 +++++++++++++++++++++++++++++-----------------
> 1 file changed, 208 insertions(+), 122 deletions(-)
Much nicer. :)
And it made an existing issue in the code quite obvious, too:
> +/*
> + * Punch a hole and prealloc the range. We use a hole punch rather than
> + * unwritten extent conversion for two reasons:
> + *
> + * 1.) Hole punch handles partial block zeroing for us.
> + * 2.) If prealloc returns ENOSPC, the file range is still zero-valued by
> + * virtue of the hole punch.
> + */
> +static int
> +xfs_falloc_zero_range(
> + struct file *file,
> + int mode,
> + loff_t offset,
> + loff_t len)
> +{
> + struct inode *inode = file_inode(file);
> + unsigned int blksize = i_blocksize(inode);
> + loff_t new_size = 0;
> + int error;
> +
> + trace_xfs_zero_file_space(XFS_I(inode));
> +
> + error = xfs_falloc_newsize(file, mode, offset, len, &new_size);
> + if (error)
> + return error;
> +
> + error = xfs_free_file_space(XFS_I(inode), offset, len);
> + if (error)
> + return error;
> +
> + len = round_up(offset + len, blksize) - round_down(offset, blksize);
> + offset = round_down(offset, blksize);
> + error = xfs_alloc_file_space(XFS_I(inode), offset, len);
> + if (error)
> + return error;
> + return xfs_falloc_setsize(file, new_size);
> +}
Our zeroing operation always does preallocation, but....
> +static int
> +xfs_falloc_allocate_range(
> + struct file *file,
> + int mode,
> + loff_t offset,
> + loff_t len)
> +{
> + struct inode *inode = file_inode(file);
> + loff_t new_size = 0;
> + int error;
> +
> + /*
> + * If always_cow mode we can't use preallocations and thus should not
> + * create them.
> + */
> + if (xfs_is_always_cow_inode(XFS_I(inode)))
> + return -EOPNOTSUPP;
... our preallocation operation always returns -EOPNOTSUPP for
COW mode.
Should the zeroing code also have this COW mode check in it after
the hole punch has run so we don't do unnecessary prealloc there?
-Dave.
--
Dave Chinner
david@fromorbit.com
next prev parent reply other threads:[~2024-08-29 3:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 6:50 sort out the fallocate mode mess v2 Christoph Hellwig
2024-08-27 6:50 ` [PATCH 1/6] block: remove checks for FALLOC_FL_NO_HIDE_STALE Christoph Hellwig
2024-08-27 14:55 ` Darrick J. Wong
2024-08-28 14:58 ` Christian Brauner
2024-08-28 15:31 ` Jan Kara
2024-08-27 6:50 ` [PATCH 2/6] ext4: remove tracing " Christoph Hellwig
2024-08-27 14:56 ` Darrick J. Wong
2024-08-28 4:04 ` Christoph Hellwig
2024-08-28 15:31 ` Jan Kara
2024-08-27 6:50 ` [PATCH 3/6] fs: sort out the fallocate mode vs flag mess Christoph Hellwig
2024-08-27 14:55 ` Darrick J. Wong
2024-08-28 4:05 ` Christoph Hellwig
2024-08-28 15:34 ` Jan Kara
2024-08-27 6:50 ` [PATCH 4/6] xfs: call xfs_flush_unmap_range from xfs_free_file_space Christoph Hellwig
2024-08-27 16:03 ` Darrick J. Wong
2024-08-28 4:06 ` Christoph Hellwig
2024-08-29 3:03 ` Dave Chinner
2024-08-29 3:54 ` Christoph Hellwig
2024-08-27 6:50 ` [PATCH 5/6] xfs: move the xfs_is_always_cow_inode check into xfs_alloc_file_space Christoph Hellwig
2024-08-27 16:03 ` Darrick J. Wong
2024-08-27 6:50 ` [PATCH 6/6] xfs: refactor xfs_file_fallocate Christoph Hellwig
2024-08-27 16:07 ` Darrick J. Wong
2024-08-28 4:07 ` Christoph Hellwig
2024-08-29 3:11 ` Dave Chinner [this message]
2024-08-29 3:56 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2024-08-21 6:30 sort out the fallocate mode mess Christoph Hellwig
2024-08-21 6:30 ` [PATCH 6/6] xfs: refactor xfs_file_fallocate Christoph Hellwig
2024-08-21 12:44 ` Brian Foster
2024-08-21 12:57 ` Christoph Hellwig
2024-08-21 13:09 ` Brian Foster
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=Zs/mz4Gve+znep2M@dread.disaster.area \
--to=david@fromorbit.com \
--cc=axboe@kernel.dk \
--cc=bfoster@redhat.com \
--cc=brauner@kernel.org \
--cc=chandan.babu@oracle.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).