linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: Chandan Babu R <chandanrlinux@gmail.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/2] xfs: Fix dax inode extent calculation when direct write is performed on an unwritten extent
Date: Thu, 25 Mar 2021 11:53:02 -0700	[thread overview]
Message-ID: <20210325185302.GL4090233@magnolia> (raw)
In-Reply-To: <20210325140339.6603-2-chandanrlinux@gmail.com>

On Thu, Mar 25, 2021 at 07:33:39PM +0530, Chandan Babu R wrote:
> With dax enabled filesystems, a direct write operation into an existing
> unwritten extent results in xfs_iomap_write_direct() zero-ing and converting
> the extent into a normal extent before the actual data is copied from the
> userspace buffer.
> 
> The inode extent count can increase by 2 if the extent range being written to
> maps to the middle of the existing unwritten extent range. Hence this commit
> uses XFS_IEXT_WRITE_UNWRITTEN_CNT as the extent count delta when such a write
> operation is being performed.
> 
> Fixes: 727e1acd297c ("xfs: Check for extent overflow when trivally adding a new extent")
> Reported-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>

Pretty much what I was expecting,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
>  fs/xfs/xfs_iomap.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index e17ab7f42928..8b27c10a3d08 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -198,6 +198,7 @@ xfs_iomap_write_direct(
>  	bool			force = false;
>  	int			error;
>  	int			bmapi_flags = XFS_BMAPI_PREALLOC;
> +	int			nr_exts = XFS_IEXT_ADD_NOSPLIT_CNT;
>  
>  	ASSERT(count_fsb > 0);
>  
> @@ -232,6 +233,7 @@ xfs_iomap_write_direct(
>  		bmapi_flags = XFS_BMAPI_CONVERT | XFS_BMAPI_ZERO;
>  		if (imap->br_state == XFS_EXT_UNWRITTEN) {
>  			force = true;
> +			nr_exts = XFS_IEXT_WRITE_UNWRITTEN_CNT;
>  			dblocks = XFS_DIOSTRAT_SPACE_RES(mp, 0) << 1;
>  		}
>  	}
> @@ -241,8 +243,7 @@ xfs_iomap_write_direct(
>  	if (error)
>  		return error;
>  
> -	error = xfs_iext_count_may_overflow(ip, XFS_DATA_FORK,
> -			XFS_IEXT_ADD_NOSPLIT_CNT);
> +	error = xfs_iext_count_may_overflow(ip, XFS_DATA_FORK, nr_exts);
>  	if (error)
>  		goto out_trans_cancel;
>  
> -- 
> 2.29.2
> 

  reply	other threads:[~2021-03-25 18:54 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-25 14:03 [PATCH 1/2] xfs: Initialize xfs_alloc_arg->total correctly when allocating minlen extents Chandan Babu R
2021-03-25 14:03 ` [PATCH 2/2] xfs: Fix dax inode extent calculation when direct write is performed on an unwritten extent Chandan Babu R
2021-03-25 18:53   ` Darrick J. Wong [this message]
2021-04-02  6:45   ` Christoph Hellwig
2021-03-25 18:54 ` [PATCH 1/2] xfs: Initialize xfs_alloc_arg->total correctly when allocating minlen extents Darrick J. Wong
2021-04-02  6:44 ` Christoph Hellwig

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=20210325185302.GL4090233@magnolia \
    --to=djwong@kernel.org \
    --cc=chandanrlinux@gmail.com \
    --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 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).