From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Goldwyn Rodrigues <rgoldwyn@suse.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 13/20] xfs: fill out the srcmap in iomap_begin
Date: Tue, 8 Oct 2019 08:26:03 -0700 [thread overview]
Message-ID: <20191008152603.GZ13108@magnolia> (raw)
In-Reply-To: <20191008071527.29304-14-hch@lst.de>
On Tue, Oct 08, 2019 at 09:15:20AM +0200, Christoph Hellwig wrote:
> Replace our local hacks to report the source block in the main iomap
> with the proper scrmap reporting.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_iomap.c | 49 +++++++++++++++++++++++-----------------------
> 1 file changed, 24 insertions(+), 25 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 3292dfc8030a..ab2482a573d8 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -527,7 +527,8 @@ xfs_file_iomap_begin_delay(
> loff_t offset,
> loff_t count,
> unsigned flags,
> - struct iomap *iomap)
> + struct iomap *iomap,
> + struct iomap *srcmap)
> {
> struct xfs_inode *ip = XFS_I(inode);
> struct xfs_mount *mp = ip->i_mount;
> @@ -721,11 +722,13 @@ xfs_file_iomap_begin_delay(
> found_cow:
> xfs_iunlock(ip, XFS_ILOCK_EXCL);
> if (imap.br_startoff <= offset_fsb) {
> - /* ensure we only report blocks we have a reservation for */
> - xfs_trim_extent(&imap, cmap.br_startoff, cmap.br_blockcount);
> - return xfs_bmbt_to_iomap(ip, iomap, &imap, IOMAP_F_SHARED);
> + error = xfs_bmbt_to_iomap(ip, srcmap, &imap, 0);
> + if (error)
> + return error;
> + } else {
> + xfs_trim_extent(&cmap, offset_fsb,
> + imap.br_startoff - offset_fsb);
> }
> - xfs_trim_extent(&cmap, offset_fsb, imap.br_startoff - offset_fsb);
> return xfs_bmbt_to_iomap(ip, iomap, &cmap, IOMAP_F_SHARED);
>
> out_unlock:
> @@ -933,7 +936,7 @@ xfs_file_iomap_begin(
> {
> struct xfs_inode *ip = XFS_I(inode);
> struct xfs_mount *mp = ip->i_mount;
> - struct xfs_bmbt_irec imap;
> + struct xfs_bmbt_irec imap, cmap;
> xfs_fileoff_t offset_fsb, end_fsb;
> int nimaps = 1, error = 0;
> bool shared = false;
> @@ -947,7 +950,7 @@ xfs_file_iomap_begin(
> !IS_DAX(inode) && !xfs_get_extsz_hint(ip)) {
> /* Reserve delalloc blocks for regular writeback. */
> return xfs_file_iomap_begin_delay(inode, offset, length, flags,
> - iomap);
> + iomap, srcmap);
> }
>
> /*
> @@ -987,9 +990,6 @@ xfs_file_iomap_begin(
> * been done up front, so we don't need to do them here.
> */
> if (xfs_is_cow_inode(ip)) {
> - struct xfs_bmbt_irec cmap;
> - bool directio = (flags & IOMAP_DIRECT);
> -
> /* if zeroing doesn't need COW allocation, then we are done. */
> if ((flags & IOMAP_ZERO) &&
> !needs_cow_for_zeroing(&imap, nimaps))
> @@ -997,23 +997,11 @@ xfs_file_iomap_begin(
>
> /* may drop and re-acquire the ilock */
> error = xfs_reflink_allocate_cow(ip, &imap, &cmap, &shared,
> - &lockmode, directio);
> + &lockmode, flags & IOMAP_DIRECT);
> if (error)
> goto out_unlock;
> -
> - /*
> - * For buffered writes we need to report the address of the
> - * previous block (if there was any) so that the higher level
> - * write code can perform read-modify-write operations; we
> - * won't need the CoW fork mapping until writeback. For direct
> - * I/O, which must be block aligned, we need to report the
> - * newly allocated address. If the data fork has a hole, copy
> - * the COW fork mapping to avoid allocating to the data fork.
> - */
> - if (shared &&
> - (directio || imap.br_startblock == HOLESTARTBLOCK))
> - imap = cmap;
> -
> + if (shared)
> + goto out_found_cow;
> end_fsb = imap.br_startoff + imap.br_blockcount;
> length = XFS_FSB_TO_B(mp, end_fsb) - offset;
> }
> @@ -1067,6 +1055,17 @@ xfs_file_iomap_begin(
> trace_xfs_iomap_found(ip, offset, length, XFS_DATA_FORK, &imap);
> goto out_finish;
>
> +out_found_cow:
> + xfs_iunlock(ip, lockmode);
> + length = XFS_FSB_TO_B(mp, cmap.br_startoff + cmap.br_blockcount);
> + trace_xfs_iomap_found(ip, offset, length - offset, XFS_COW_FORK, &cmap);
> + if (imap.br_startblock != HOLESTARTBLOCK) {
> + error = xfs_bmbt_to_iomap(ip, srcmap, &imap, 0);
> + if (error)
> + return error;
> + }
> + return xfs_bmbt_to_iomap(ip, iomap, &cmap, IOMAP_F_SHARED);
> +
> out_unlock:
> xfs_iunlock(ip, lockmode);
> return error;
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-10-08 15:26 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 7:15 iomap and xfs COW cleanups v2 Christoph Hellwig
2019-10-08 7:15 ` [PATCH 01/20] iomap: better document the IOMAP_F_* flags Christoph Hellwig
2019-10-08 7:15 ` [PATCH 02/20] iomap: remove the unused iomap argument to __iomap_write_end Christoph Hellwig
2019-10-08 7:15 ` [PATCH 03/20] iomap: always use AOP_FLAG_NOFS in iomap_write_begin Christoph Hellwig
2019-10-08 7:15 ` [PATCH 04/20] iomap: ignore non-shared or non-data blocks in xfs_file_dirty Christoph Hellwig
2019-10-08 7:15 ` [PATCH 05/20] iomap: move the zeroing case out of iomap_read_page_sync Christoph Hellwig
2019-10-08 7:15 ` [PATCH 06/20] iomap: use write_begin to read pages to unshare Christoph Hellwig
2019-10-08 15:12 ` Darrick J. Wong
2019-10-08 7:15 ` [PATCH 07/20] iomap: renumber IOMAP_HOLE to 0 Christoph Hellwig
2019-10-08 15:01 ` Darrick J. Wong
2019-10-08 7:15 ` [PATCH 08/20] iomap: use a srcmap for a read-modify-write I/O Christoph Hellwig
2019-10-08 15:00 ` Darrick J. Wong
2019-10-09 6:28 ` Christoph Hellwig
2019-10-09 17:16 ` Darrick J. Wong
2019-10-14 23:27 ` Darrick J. Wong
2019-10-15 13:00 ` Goldwyn Rodrigues
2019-10-08 7:15 ` [PATCH 09/20] xfs: also call xfs_file_iomap_end_delalloc for zeroing operations Christoph Hellwig
2019-10-08 7:15 ` [PATCH 10/20] xfs: remove xfs_reflink_dirty_extents Christoph Hellwig
2019-10-08 15:20 ` Darrick J. Wong
2019-10-08 7:15 ` [PATCH 11/20] xfs: pass two imaps to xfs_reflink_allocate_cow Christoph Hellwig
2019-10-08 7:15 ` [PATCH 12/20] xfs: refactor xfs_file_iomap_begin_delay Christoph Hellwig
2019-10-08 7:15 ` [PATCH 13/20] xfs: fill out the srcmap in iomap_begin Christoph Hellwig
2019-10-08 15:26 ` Darrick J. Wong [this message]
2019-10-08 7:15 ` [PATCH 14/20] xfs: factor out a helper to calculate the end_fsb Christoph Hellwig
2019-10-08 7:15 ` [PATCH 15/20] xfs: split out a new set of read-only iomap ops Christoph Hellwig
2019-10-08 15:27 ` Darrick J. Wong
2019-10-08 7:15 ` [PATCH 16/20] xfs: move xfs_file_iomap_begin_delay around Christoph Hellwig
2019-10-08 7:15 ` [PATCH 17/20] xfs: split the iomap ops for buffered vs direct writes Christoph Hellwig
2019-10-08 15:28 ` Darrick J. Wong
2019-10-08 7:15 ` [PATCH 18/20] xfs: rename the whichfork variable in xfs_buffered_write_iomap_begin Christoph Hellwig
2019-10-08 7:15 ` [PATCH 19/20] xfs: cleanup xfs_iomap_write_unwritten Christoph Hellwig
2019-10-08 7:15 ` [PATCH 20/20] xfs: improve the IOMAP_NOWAIT check for COW inodes 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=20191008152603.GZ13108@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=rgoldwyn@suse.com \
/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).