linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-mm@kvack.org
Subject: Re: [PATCH 25/34] xfs: remove xfs_reflink_trim_irec_to_next_cow
Date: Thu, 24 May 2018 11:06:59 -0400	[thread overview]
Message-ID: <20180524150658.GC84959@bfoster.bfoster> (raw)
In-Reply-To: <20180524145943.GB84959@bfoster.bfoster>

On Thu, May 24, 2018 at 10:59:43AM -0400, Brian Foster wrote:
> On Wed, May 23, 2018 at 04:43:48PM +0200, Christoph Hellwig wrote:
> > In the only caller we just did a lookup in the COW extent tree for
> > the same offset.  Reuse that result and save a lookup, as well as
> > shortening the ilock hold time.
> > 
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > ---
> >  fs/xfs/xfs_aops.c    | 25 +++++++++++++++++--------
> >  fs/xfs/xfs_reflink.c | 33 ---------------------------------
> >  fs/xfs/xfs_reflink.h |  2 --
> >  3 files changed, 17 insertions(+), 43 deletions(-)
> > 
> > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> > index a4b4a7037deb..354d26d66c12 100644
> > --- a/fs/xfs/xfs_aops.c
> > +++ b/fs/xfs/xfs_aops.c
> > @@ -383,11 +383,12 @@ xfs_map_blocks(
> >  	struct xfs_inode	*ip = XFS_I(inode);
> >  	struct xfs_mount	*mp = ip->i_mount;
> >  	ssize_t			count = i_blocksize(inode);
> > -	xfs_fileoff_t		offset_fsb, end_fsb;
> > +	xfs_fileoff_t		offset_fsb, end_fsb, cow_fsb = 0;
> 
> cow_fsb should probably be initialized to NULLFSBLOCK rather than 0.
> With that, you also shouldn't need cow_valid. Otherwise looks Ok to me.
> 

Err.. I guess NULLFILEOFF would be more appropriate here, but same
idea..

> Brian
> 
> >  	int			whichfork = XFS_DATA_FORK;
> >  	struct xfs_iext_cursor	icur;
> >  	int			error = 0;
> >  	int			nimaps = 1;
> > +	bool			cow_valid = false;
> >  
> >  	if (XFS_FORCED_SHUTDOWN(mp))
> >  		return -EIO;
> > @@ -407,8 +408,11 @@ xfs_map_blocks(
> >  	 * it directly instead of looking up anything in the data fork.
> >  	 */
> >  	if (xfs_is_reflink_inode(ip) &&
> > -	    xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, imap) &&
> > -	    imap->br_startoff <= offset_fsb) {
> > +	    xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, imap)) {
> > +		cow_fsb = imap->br_startoff;
> > +		cow_valid = true;
> > +	}
> > +	if (cow_valid && cow_fsb <= offset_fsb) {
> >  		xfs_iunlock(ip, XFS_ILOCK_SHARED);
> >  		/*
> >  		 * Truncate can race with writeback since writeback doesn't
> > @@ -430,6 +434,10 @@ xfs_map_blocks(
> >  
> >  	error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb,
> >  				imap, &nimaps, XFS_BMAPI_ENTIRE);
> > +	xfs_iunlock(ip, XFS_ILOCK_SHARED);
> > +	if (error)
> > +		return error;
> > +
> >  	if (!nimaps) {
> >  		/*
> >  		 * Lookup returns no match? Beyond eof? regardless,
> > @@ -451,16 +459,17 @@ xfs_map_blocks(
> >  		 * is a pending CoW reservation before the end of this extent,
> >  		 * so that we pick up the COW extents in the next iteration.
> >  		 */
> > -		xfs_reflink_trim_irec_to_next_cow(ip, offset_fsb, imap);
> > +		if (cow_valid &&
> > +		    cow_fsb < imap->br_startoff + imap->br_blockcount) {
> > +			imap->br_blockcount = cow_fsb - imap->br_startoff;
> > +			trace_xfs_reflink_trim_irec(ip, imap);
> > +		}
> > +
> >  		if (imap->br_state == XFS_EXT_UNWRITTEN)
> >  			*type = XFS_IO_UNWRITTEN;
> >  		else
> >  			*type = XFS_IO_OVERWRITE;
> >  	}
> > -	xfs_iunlock(ip, XFS_ILOCK_SHARED);
> > -	if (error)
> > -		return error;
> > -
> >  done:
> >  	switch (*type) {
> >  	case XFS_IO_HOLE:
> > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> > index 8e5eb8e70c89..ff76bc56ff3d 100644
> > --- a/fs/xfs/xfs_reflink.c
> > +++ b/fs/xfs/xfs_reflink.c
> > @@ -484,39 +484,6 @@ xfs_reflink_allocate_cow(
> >  	return error;
> >  }
> >  
> > -/*
> > - * Trim an extent to end at the next CoW reservation past offset_fsb.
> > - */
> > -void
> > -xfs_reflink_trim_irec_to_next_cow(
> > -	struct xfs_inode		*ip,
> > -	xfs_fileoff_t			offset_fsb,
> > -	struct xfs_bmbt_irec		*imap)
> > -{
> > -	struct xfs_ifork		*ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
> > -	struct xfs_bmbt_irec		got;
> > -	struct xfs_iext_cursor		icur;
> > -
> > -	if (!xfs_is_reflink_inode(ip))
> > -		return;
> > -
> > -	/* Find the extent in the CoW fork. */
> > -	if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &icur, &got))
> > -		return;
> > -
> > -	/* This is the extent before; try sliding up one. */
> > -	if (got.br_startoff < offset_fsb) {
> > -		if (!xfs_iext_next_extent(ifp, &icur, &got))
> > -			return;
> > -	}
> > -
> > -	if (got.br_startoff >= imap->br_startoff + imap->br_blockcount)
> > -		return;
> > -
> > -	imap->br_blockcount = got.br_startoff - imap->br_startoff;
> > -	trace_xfs_reflink_trim_irec(ip, imap);
> > -}
> > -
> >  /*
> >   * Cancel CoW reservations for some block range of an inode.
> >   *
> > diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
> > index 15a456492667..e8d4d50c629f 100644
> > --- a/fs/xfs/xfs_reflink.h
> > +++ b/fs/xfs/xfs_reflink.h
> > @@ -32,8 +32,6 @@ extern int xfs_reflink_allocate_cow(struct xfs_inode *ip,
> >  		struct xfs_bmbt_irec *imap, bool *shared, uint *lockmode);
> >  extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset,
> >  		xfs_off_t count);
> > -extern void xfs_reflink_trim_irec_to_next_cow(struct xfs_inode *ip,
> > -		xfs_fileoff_t offset_fsb, struct xfs_bmbt_irec *imap);
> >  
> >  extern int xfs_reflink_cancel_cow_blocks(struct xfs_inode *ip,
> >  		struct xfs_trans **tpp, xfs_fileoff_t offset_fsb,
> > -- 
> > 2.17.0
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2018-05-24 15:06 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-23 14:43 buffered I/O without buffer heads in xfs and iomap v3 Christoph Hellwig
2018-05-23 14:43 ` [PATCH 01/34] block: add a lower-level bio_add_page interface Christoph Hellwig
2018-05-30  5:28   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 02/34] fs: factor out a __generic_write_end helper Christoph Hellwig
2018-05-30  5:30   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 03/34] fs: move page_cache_seek_hole_data to iomap.c Christoph Hellwig
2018-05-30  5:31   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 04/34] fs: remove the buffer_unwritten check in page_seek_hole_data Christoph Hellwig
2018-05-30  5:36   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 05/34] fs: use ->is_partially_uptodate in page_cache_seek_hole_data Christoph Hellwig
2018-05-30  5:41   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 06/34] mm: give the 'ret' variable a better name __do_page_cache_readahead Christoph Hellwig
2018-05-30  5:42   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 07/34] mm: return an unsigned int from __do_page_cache_readahead Christoph Hellwig
2018-05-30  5:44   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 08/34] mm: split ->readpages calls to avoid non-contiguous pages lists Christoph Hellwig
2018-05-30  5:46   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 09/34] iomap: inline data should be an iomap type, not a flag Christoph Hellwig
2018-05-30  5:49   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 10/34] iomap: fix the comment describing IOMAP_NOWAIT Christoph Hellwig
2018-05-30  5:49   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 11/34] iomap: move IOMAP_F_BOUNDARY to gfs2 Christoph Hellwig
2018-05-30  5:50   ` Darrick J. Wong
2018-05-30  9:30     ` [Cluster-devel] " Steven Whitehouse
2018-05-30  9:59       ` Christoph Hellwig
2018-05-30 10:02         ` Steven Whitehouse
2018-05-30 10:10           ` Christoph Hellwig
2018-05-30 10:12             ` Steven Whitehouse
2018-05-30 11:03               ` Andreas Gruenbacher
2018-05-23 14:43 ` [PATCH 12/34] iomap: use __bio_add_page in iomap_dio_zero Christoph Hellwig
2018-05-30  5:51   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 13/34] iomap: add a iomap_sector helper Christoph Hellwig
2018-05-30  5:52   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 14/34] iomap: add an iomap-based bmap implementation Christoph Hellwig
2018-05-30  5:54   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 15/34] iomap: add an iomap-based readpage and readpages implementation Christoph Hellwig
2018-05-30  6:11   ` Darrick J. Wong
2018-05-30  6:23     ` Christoph Hellwig
2018-05-23 14:43 ` [PATCH 16/34] iomap: add initial support for writes without buffer heads Christoph Hellwig
2018-05-30  6:21   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 17/34] xfs: use iomap_bmap Christoph Hellwig
2018-05-30  6:14   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 18/34] xfs: use iomap for blocksize == PAGE_SIZE readpage and readpages Christoph Hellwig
2018-05-30  6:22   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 19/34] xfs: simplify xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-23 16:17   ` Brian Foster
2018-05-24  8:01     ` Christoph Hellwig
2018-05-23 14:43 ` [PATCH 20/34] xfs: simplify xfs_aops_discard_page Christoph Hellwig
2018-05-23 14:43 ` [PATCH 21/34] xfs: move locking into xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-23 14:43 ` [PATCH 22/34] xfs: make xfs_writepage_map extent map centric Christoph Hellwig
2018-05-24 14:59   ` Brian Foster
2018-05-24 16:53     ` Christoph Hellwig
2018-05-24 18:13       ` Brian Foster
2018-05-25  6:19         ` Christoph Hellwig
2018-05-25 11:35           ` Brian Foster
2018-05-28  7:15             ` Christoph Hellwig
2018-05-29 11:26               ` Brian Foster
2018-05-29 13:08                 ` Christoph Hellwig
2018-05-29 17:04                   ` Brian Foster
2018-05-23 14:43 ` [PATCH 23/34] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Christoph Hellwig
2018-05-23 14:43 ` [PATCH 24/34] xfs: remove xfs_reflink_find_cow_mapping Christoph Hellwig
2018-05-23 14:43 ` [PATCH 25/34] xfs: remove xfs_reflink_trim_irec_to_next_cow Christoph Hellwig
2018-05-24 14:59   ` Brian Foster
2018-05-24 15:06     ` Brian Foster [this message]
2018-05-24 17:10       ` Christoph Hellwig
2018-05-23 14:43 ` [PATCH 26/34] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Christoph Hellwig
2018-05-23 14:43 ` [PATCH 27/34] xfs: don't clear imap_valid for a non-uptodate buffers Christoph Hellwig
2018-05-23 14:43 ` [PATCH 28/34] xfs: remove the imap_valid flag Christoph Hellwig
2018-05-23 14:43 ` [PATCH 29/34] xfs: don't look at buffer heads in xfs_add_to_ioend Christoph Hellwig
2018-05-23 14:43 ` [PATCH 30/34] xfs: move all writeback buffer_head manipulation into xfs_map_at_offset Christoph Hellwig
2018-05-23 14:43 ` [PATCH 31/34] xfs: remove xfs_start_page_writeback Christoph Hellwig
2018-05-23 14:43 ` [PATCH 32/34] xfs: refactor the tail of xfs_writepage_map Christoph Hellwig
2018-05-23 14:43 ` [PATCH 33/34] xfs: do not set the page uptodate in xfs_writepage_map Christoph Hellwig
2018-05-23 14:43 ` [PATCH 34/34] xfs: allow writeback on pages without buffer heads Christoph Hellwig
  -- strict thread matches above, loose matches on Subject: below --
2018-05-18 16:47 buffered I/O without buffer heads in xfs and iomap v2 Christoph Hellwig
2018-05-18 16:48 ` [PATCH 25/34] xfs: remove xfs_reflink_trim_irec_to_next_cow 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=20180524150658.GC84959@bfoster.bfoster \
    --to=bfoster@redhat.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-xfs@vger.kernel.org \
    --subject='Re: [PATCH 25/34] xfs: remove xfs_reflink_trim_irec_to_next_cow' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox