From: Christoph Hellwig <hch@infradead.org> To: "Darrick J. Wong" <darrick.wong@oracle.com> Cc: david@fromorbit.com, sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: Re: [PATCH 24/25] xfs: support returning partial reflink results Date: Sun, 14 Oct 2018 10:35:46 -0700 [thread overview] Message-ID: <20181014173546.GI30673@infradead.org> (raw) In-Reply-To: <153938931226.8361.7365948775364411156.stgit@magnolia> On Fri, Oct 12, 2018 at 05:08:32PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Back when the XFS reflink code only supported clone_file_range, we were > only able to return zero or negative error codes to userspace. However, > now that copy_file_range (which returns bytes copied) can use XFS' > clone_file_range, we have the opportunity to return partial results. > For example, if userspace sends a 1GB clone request and we run out of > space halfway through, we at least can tell userspace that we completed > 512M of that request like a regular write. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > fs/xfs/xfs_file.c | 5 +---- > fs/xfs/xfs_reflink.c | 20 +++++++++++++++----- > fs/xfs/xfs_reflink.h | 2 +- > 3 files changed, 17 insertions(+), 10 deletions(-) > > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index bc9e94bcb7a3..b2b15b8dc4a1 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -928,14 +928,11 @@ xfs_file_remap_range( > loff_t len, > unsigned int remap_flags) > { > - int ret; > - > if (!remap_check_flags(remap_flags, RFR_SAME_DATA)) > return -EINVAL; > > - ret = xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out, > + return xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out, > len, remap_flags); Is there any reason not to merge xfs_file_remap_range and xfs_reflink_remap_range at this point? > STATIC int > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c > index e1592e751cc2..66a8ddb9c058 100644 > --- a/fs/xfs/xfs_reflink.c > +++ b/fs/xfs/xfs_reflink.c > @@ -1123,6 +1123,7 @@ xfs_reflink_remap_blocks( > struct xfs_inode *dest, > xfs_fileoff_t destoff, > xfs_filblks_t len, > + xfs_filblks_t *remapped_len, > xfs_off_t new_isize) > { > struct xfs_bmbt_irec imap; > @@ -1130,6 +1131,7 @@ xfs_reflink_remap_blocks( > int error = 0; > xfs_filblks_t range_len; > > + *remapped_len = 0; > /* drange = (destoff, destoff + len); srange = (srcoff, srcoff + len) */ > while (len) { > uint lock_mode; > @@ -1168,6 +1170,7 @@ xfs_reflink_remap_blocks( > srcoff += range_len; > destoff += range_len; > len -= range_len; > + *remapped_len += range_len; > } > > return 0; > @@ -1391,7 +1394,7 @@ xfs_reflink_remap_prep( > /* > * Link a range of blocks from one file to another. > */ > -int > +loff_t > xfs_reflink_remap_range( > struct file *file_in, > loff_t pos_in, > @@ -1406,9 +1409,10 @@ xfs_reflink_remap_range( > struct xfs_inode *dest = XFS_I(inode_out); > struct xfs_mount *mp = src->i_mount; > xfs_fileoff_t sfsbno, dfsbno; > - xfs_filblks_t fsblen; > + xfs_filblks_t fsblen, remappedfsb = 0; > + loff_t remapped_bytes = 0; > xfs_extlen_t cowextsize; > - ssize_t ret; > + int ret; > > if (!xfs_sb_version_hasreflink(&mp->m_sb)) > return -EOPNOTSUPP; > @@ -1424,11 +1428,17 @@ xfs_reflink_remap_range( > > trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out); > > + if (len == 0) { > + ret = 0; > + goto out_unlock; > + } Looking at the final tree this looks like dead (and bogus) code: if (ret <= 0) return ret; trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out); if (len == 0) { ret = 0; goto out_unlock; } > + > dfsbno = XFS_B_TO_FSBT(mp, pos_out); > sfsbno = XFS_B_TO_FSBT(mp, pos_in); > fsblen = XFS_B_TO_FSB(mp, len); > ret = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen, > + &remappedfsb, pos_out + len); > + remapped_bytes = min_t(int64_t, len, XFS_FSB_TO_B(mp, remappedfsb)); > if (ret) > goto out_unlock; Shouldn't we just follow the calling convention of the method here: negative return value: error positive: number of bytes handled Something like: done = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen, pos_out + len); if (done < 0) { xfs_reflink_remap_unlock(file_in, file_out); trace_xfs_reflink_remap_range_error(dest, done, _RET_IP_); return done; } > > @@ -1451,7 +1461,7 @@ xfs_reflink_remap_range( > xfs_reflink_remap_unlock(file_in, file_out); > if (ret) > trace_xfs_reflink_remap_range_error(dest, ret, _RET_IP_); And then we can drop this conditional here.
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@infradead.org> To: "Darrick J. Wong" <darrick.wong@oracle.com> Cc: david@fromorbit.com, sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH 24/25] xfs: support returning partial reflink results Date: Sun, 14 Oct 2018 10:35:46 -0700 [thread overview] Message-ID: <20181014173546.GI30673@infradead.org> (raw) In-Reply-To: <153938931226.8361.7365948775364411156.stgit@magnolia> On Fri, Oct 12, 2018 at 05:08:32PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Back when the XFS reflink code only supported clone_file_range, we were > only able to return zero or negative error codes to userspace. However, > now that copy_file_range (which returns bytes copied) can use XFS' > clone_file_range, we have the opportunity to return partial results. > For example, if userspace sends a 1GB clone request and we run out of > space halfway through, we at least can tell userspace that we completed > 512M of that request like a regular write. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > fs/xfs/xfs_file.c | 5 +---- > fs/xfs/xfs_reflink.c | 20 +++++++++++++++----- > fs/xfs/xfs_reflink.h | 2 +- > 3 files changed, 17 insertions(+), 10 deletions(-) > > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index bc9e94bcb7a3..b2b15b8dc4a1 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -928,14 +928,11 @@ xfs_file_remap_range( > loff_t len, > unsigned int remap_flags) > { > - int ret; > - > if (!remap_check_flags(remap_flags, RFR_SAME_DATA)) > return -EINVAL; > > - ret = xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out, > + return xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out, > len, remap_flags); Is there any reason not to merge xfs_file_remap_range and xfs_reflink_remap_range at this point? > STATIC int > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c > index e1592e751cc2..66a8ddb9c058 100644 > --- a/fs/xfs/xfs_reflink.c > +++ b/fs/xfs/xfs_reflink.c > @@ -1123,6 +1123,7 @@ xfs_reflink_remap_blocks( > struct xfs_inode *dest, > xfs_fileoff_t destoff, > xfs_filblks_t len, > + xfs_filblks_t *remapped_len, > xfs_off_t new_isize) > { > struct xfs_bmbt_irec imap; > @@ -1130,6 +1131,7 @@ xfs_reflink_remap_blocks( > int error = 0; > xfs_filblks_t range_len; > > + *remapped_len = 0; > /* drange = (destoff, destoff + len); srange = (srcoff, srcoff + len) */ > while (len) { > uint lock_mode; > @@ -1168,6 +1170,7 @@ xfs_reflink_remap_blocks( > srcoff += range_len; > destoff += range_len; > len -= range_len; > + *remapped_len += range_len; > } > > return 0; > @@ -1391,7 +1394,7 @@ xfs_reflink_remap_prep( > /* > * Link a range of blocks from one file to another. > */ > -int > +loff_t > xfs_reflink_remap_range( > struct file *file_in, > loff_t pos_in, > @@ -1406,9 +1409,10 @@ xfs_reflink_remap_range( > struct xfs_inode *dest = XFS_I(inode_out); > struct xfs_mount *mp = src->i_mount; > xfs_fileoff_t sfsbno, dfsbno; > - xfs_filblks_t fsblen; > + xfs_filblks_t fsblen, remappedfsb = 0; > + loff_t remapped_bytes = 0; > xfs_extlen_t cowextsize; > - ssize_t ret; > + int ret; > > if (!xfs_sb_version_hasreflink(&mp->m_sb)) > return -EOPNOTSUPP; > @@ -1424,11 +1428,17 @@ xfs_reflink_remap_range( > > trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out); > > + if (len == 0) { > + ret = 0; > + goto out_unlock; > + } Looking at the final tree this looks like dead (and bogus) code: if (ret <= 0) return ret; trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out); if (len == 0) { ret = 0; goto out_unlock; } > + > dfsbno = XFS_B_TO_FSBT(mp, pos_out); > sfsbno = XFS_B_TO_FSBT(mp, pos_in); > fsblen = XFS_B_TO_FSB(mp, len); > ret = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen, > + &remappedfsb, pos_out + len); > + remapped_bytes = min_t(int64_t, len, XFS_FSB_TO_B(mp, remappedfsb)); > if (ret) > goto out_unlock; Shouldn't we just follow the calling convention of the method here: negative return value: error positive: number of bytes handled Something like: done = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen, pos_out + len); if (done < 0) { xfs_reflink_remap_unlock(file_in, file_out); trace_xfs_reflink_remap_range_error(dest, done, _RET_IP_); return done; } > > @@ -1451,7 +1461,7 @@ xfs_reflink_remap_range( > xfs_reflink_remap_unlock(file_in, file_out); > if (ret) > trace_xfs_reflink_remap_range_error(dest, ret, _RET_IP_); And then we can drop this conditional here.
next prev parent reply other threads:[~2018-10-14 17:35 UTC|newest] Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-13 0:05 [PATCH v4 00/25] fs: fixes for serious clone/dedupe problems Darrick J. Wong 2018-10-13 0:05 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:05 ` [PATCH 01/25] xfs: add a per-xfs trace_printk macro Darrick J. Wong 2018-10-13 0:05 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:05 ` [PATCH 02/25] vfs: vfs_clone_file_prep_inodes should return EINVAL for a clone from beyond EOF Darrick J. Wong 2018-10-13 0:05 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 03/25] vfs: check file ranges before cloning files Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 04/25] vfs: strengthen checking of file range inputs to generic_remap_checks Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 05/25] vfs: avoid problematic remapping requests into partial EOF block Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:11 ` Christoph Hellwig 2018-10-14 17:11 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:06 ` [PATCH 06/25] vfs: skip zero-length dedupe requests Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 07/25] vfs: combine the clone and dedupe into a single remap_file_range Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:19 ` Christoph Hellwig 2018-10-14 17:19 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 6:04 ` Amir Goldstein 2018-10-15 12:47 ` Christoph Hellwig 2018-10-15 12:47 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 12:54 ` Amir Goldstein 2018-10-15 17:13 ` Darrick J. Wong 2018-10-15 17:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-15 18:32 ` Christoph Hellwig 2018-10-15 18:32 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 13:18 ` Matthew Wilcox 2018-10-15 16:42 ` Darrick J. Wong 2018-10-15 16:42 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 08/25] vfs: rename vfs_clone_file_prep to be more descriptive Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 09/25] vfs: rename clone_verify_area to remap_verify_area Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 10/25] vfs: create generic_remap_file_range_touch to update inode metadata Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:21 ` Christoph Hellwig 2018-10-14 17:21 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 16:30 ` Darrick J. Wong 2018-10-15 16:30 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-15 18:19 ` Christoph Hellwig 2018-10-15 18:19 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:06 ` [PATCH 11/25] vfs: pass remap flags to generic_remap_file_range_prep Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:22 ` Christoph Hellwig 2018-10-14 17:22 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-14 17:37 ` Christoph Hellwig 2018-10-14 17:37 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 15:42 ` Darrick J. Wong 2018-10-15 15:42 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 12/25] vfs: pass remap flags to generic_remap_checks Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 13/25] vfs: make remap_file_range functions take and return bytes completed Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 14/25] vfs: plumb RFR_* remap flags through the vfs clone functions Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` Darrick J. Wong 2018-10-13 0:07 ` [PATCH 15/25] vfs: plumb RFR_* remap flags through the vfs dedupe functions Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 16/25] vfs: make remapping to source file eof more explicit Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:24 ` Christoph Hellwig 2018-10-14 17:24 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-14 17:24 ` Christoph Hellwig 2018-10-14 17:24 ` Christoph Hellwig 2018-10-15 15:32 ` Darrick J. Wong 2018-10-15 15:32 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-15 18:28 ` Christoph Hellwig 2018-10-15 18:28 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:07 ` [PATCH 17/25] vfs: enable remap callers that can handle short operations Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 18/25] vfs: hide file range comparison function Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:43 ` Christoph Hellwig 2018-10-14 17:43 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:07 ` [PATCH 19/25] vfs: implement opportunistic short dedupe Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:26 ` Christoph Hellwig 2018-10-14 17:26 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:08 ` [PATCH 20/25] ocfs2: truncate page cache for clone destination file before remapping Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 21/25] ocfs2: fix pagecache truncation prior to reflink Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 22/25] ocfs2: support partial clone range and dedupe range Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:41 ` Christoph Hellwig 2018-10-14 17:41 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:08 ` [PATCH 23/25] xfs: fix pagecache truncation prior to reflink Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 24/25] xfs: support returning partial reflink results Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:35 ` Christoph Hellwig [this message] 2018-10-14 17:35 ` Christoph Hellwig 2018-10-14 23:05 ` Dave Chinner 2018-10-14 23:05 ` [Ocfs2-devel] " Dave Chinner 2018-10-15 15:49 ` Darrick J. Wong 2018-10-15 15:49 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 25/25] xfs: remove redundant remap partial EOF block checks Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong -- strict thread matches above, loose matches on Subject: below -- 2018-10-11 4:12 [PATCH v3 00/25] fs: fixes for serious clone/dedupe problems Darrick J. Wong 2018-10-11 4:15 ` [PATCH 24/25] xfs: support returning partial reflink results Darrick J. Wong 2018-10-12 1:22 ` Dave Chinner 2018-10-12 16:06 ` Darrick J. Wong
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=20181014173546.GI30673@infradead.org \ --to=hch@infradead.org \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nfs@vger.kernel.org \ --cc=linux-unionfs@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=ocfs2-devel@oss.oracle.com \ --cc=sandeen@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.