On 1.09.21 г. 20:01, Omar Sandoval wrote:
> From: Omar Sandoval <osandov@xxxxxx>
>
> Currently, an inline extent is always created after i_size is extended
> from btrfs_dirty_pages(). However, for encoded writes, we only want to
> update i_size after we successfully created the inline extent. Add an
> update_i_size parameter to cow_file_range_inline() and
> insert_inline_extent() and pass in the size of the extent rather than
> determining it from i_size. Since the start parameter is always passed
> as 0, get rid of it and simplify the logic in these two functions. While
> we're here, let's document the requirements for creating an inline
> extent.
>
> Reviewed-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
> Signed-off-by: Omar Sandoval <osandov@xxxxxx>
Overall I like where this is going, actually the diff is larger than it
should be because some refactoring is tucked in. If there would be yet
another submission with more substantial changes I'd like to see this
patch split into 2:
1. Patch does the refactoring
2. Adds the logic to update i_size alongside the addition of the
update_i_size parameter.
That will make the functional change a lot more obvious.
> ---
> fs/btrfs/inode.c | 100 +++++++++++++++++++++++------------------------
> 1 file changed, 48 insertions(+), 52 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 6aad4b641d5c..a87a34f56234 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -236,9 +236,10 @@ static int btrfs_init_inode_security(struct btrfs_trans_handle *trans,
> static int insert_inline_extent(struct btrfs_trans_handle *trans,
> struct btrfs_path *path, bool extent_inserted,
> struct btrfs_root *root, struct inode *inode,
> - u64 start, size_t size, size_t compressed_size,
> + size_t size, size_t compressed_size,
> int compress_type,
> - struct page **compressed_pages)
> + struct page **compressed_pages,
> + bool update_i_size)
This function grows to 10 parameters, I think it's high time it took an
argument struct and each member can in turn be documented in this
structure, otherwise it's very unwieldy to work with.
> {
> struct extent_buffer *leaf;
> struct page *page = NULL;
<snip>
>
> @@ -327,7 +326,13 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
> * before we unlock the pages. Otherwise we
> * could end up racing with unlink.
> */
> - BTRFS_I(inode)->disk_i_size = inode->i_size;
> + i_size = i_size_read(inode);
> + if (update_i_size && size > i_size) {
> + i_size_write(inode, size);
> + i_size = size;
> + }
> + BTRFS_I(inode)->disk_i_size = i_size;
> +
> fail:
> return ret;
> }
> @@ -338,35 +343,31 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
> * does the checks required to make sure the data is small enough
> * to fit as an inline extent.
> */
> -static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 start,
> - u64 end, size_t compressed_size,
> +static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,
> + size_t compressed_size,
> int compress_type,
> - struct page **compressed_pages)
> + struct page **compressed_pages,
> + bool update_i_size)
This function also has 6 parameters which is not on the extreme but I
have a feeling it also needs to be refactored to take an argument
structure.
> {
> struct btrfs_drop_extents_args drop_args = { 0 };
> struct btrfs_root *root = inode->root;
> struct btrfs_fs_info *fs_info = root->fs_info;
> struct btrfs_trans_handle *trans;
> - u64 isize = i_size_read(&inode->vfs_inode);
> - u64 actual_end = min(end + 1, isize);
> - u64 inline_len = actual_end - start;
> - u64 aligned_end = ALIGN(end, fs_info->sectorsize);
> - u64 data_len = inline_len;
> + u64 data_len = compressed_size ? compressed_size : size;
> int ret;
> struct btrfs_path *path;
>
> - if (compressed_size)
> - data_len = compressed_size;
> -
> - if (start > 0 ||
> - actual_end > fs_info->sectorsize ||
> + /*
> + * We can create an inline extent if it ends at or beyond the current
> + * i_size, is no larger than a sector (decompressed), and the (possibly
> + * compressed) data fits in a leaf and the configured maximum inline
> + * size.
> + */
> + if (size < i_size_read(&inode->vfs_inode) ||
> + size > fs_info->sectorsize ||
> data_len > BTRFS_MAX_INLINE_DATA_SIZE(fs_info) ||
> - (!compressed_size &&
> - (actual_end & (fs_info->sectorsize - 1)) == 0) ||
> - end + 1 < isize ||
> - data_len > fs_info->max_inline) {
> + data_len > fs_info->max_inline)
> return 1;
With this change you allow to write more than PAGE_SIZE data in case of
a compressed extents, Qu said he had some concerns regarding this. I'm
CCing him so this can be discussed on this submission.
> - }
>
> path = btrfs_alloc_path();
> if (!path)
<snip>
