From: "Darrick J. Wong" <darrick.wong@oracle.com> To: david@fromorbit.com, darrick.wong@oracle.com Cc: 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: [PATCH 18/25] vfs: enable remap callers that can handle short operations Date: Tue, 09 Oct 2018 17:14:04 -0700 [thread overview] Message-ID: <153913044431.32295.9717425324455762449.stgit@magnolia> (raw) In-Reply-To: <153913023835.32295.13962696655740190941.stgit@magnolia> From: Darrick J. Wong <darrick.wong@oracle.com> Plumb in a remap flag that enables the filesystem remap handler to shorten remapping requests for callers that can handle it. Now copy_file_range can report partial success (in case we run up against alignment problems, resource limits, etc.). Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- fs/read_write.c | 3 ++- include/linux/fs.h | 2 ++ mm/filemap.c | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index a628fd9a47cf..8ed0aed81649 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1593,7 +1593,8 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, cloned = file_in->f_op->remap_file_range(file_in, pos_in, file_out, pos_out, - min_t(loff_t, MAX_RW_COUNT, len), 0); + min_t(loff_t, MAX_RW_COUNT, len), + RFR_CAN_SHORTEN); if (cloned >= 0) { ret = cloned; goto done; diff --git a/include/linux/fs.h b/include/linux/fs.h index 9f90dcd4df3b..e0494d719ebc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1726,9 +1726,11 @@ struct block_device_operations; * * RFR_IDENTICAL_DATA: only remap if contents identical (i.e. deduplicate) * RFR_TO_SRC_EOF: remap to the end of the source file + * RFR_CAN_SHORTEN: caller can handle a shortened request */ #define RFR_IDENTICAL_DATA (1 << 0) #define RFR_TO_SRC_EOF (1 << 1) +#define RFR_CAN_SHORTEN (1 << 2) struct iov_iter; diff --git a/mm/filemap.c b/mm/filemap.c index 2522737483de..2179d0204ee6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3064,8 +3064,12 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in, if (pos_in + count == size_in) { bcount = ALIGN(size_in, bs) - pos_in; } else { - if (!IS_ALIGNED(count, bs)) - return -EINVAL; + if (!IS_ALIGNED(count, bs)) { + if (remap_flags & RFR_CAN_SHORTEN) + count = ALIGN_DOWN(count, bs); + else + return -EINVAL; + } bcount = count; } @@ -3076,10 +3080,14 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in, pos_out < pos_in + bcount) return -EINVAL; - /* For now we don't support changing the length. */ - if (*req_count != count) + /* + * We shortened the request but the caller can't deal with that, so + * bounce the request back to userspace. + */ + if (*req_count != count && !(remap_flags & RFR_CAN_SHORTEN)) return -EINVAL; + *req_count = count; return 0; }
WARNING: multiple messages have this Message-ID (diff)
From: Darrick J. Wong <darrick.wong@oracle.com> To: david@fromorbit.com, darrick.wong@oracle.com Cc: 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 18/25] vfs: enable remap callers that can handle short operations Date: Tue, 09 Oct 2018 17:14:04 -0700 [thread overview] Message-ID: <153913044431.32295.9717425324455762449.stgit@magnolia> (raw) In-Reply-To: <153913023835.32295.13962696655740190941.stgit@magnolia> From: Darrick J. Wong <darrick.wong@oracle.com> Plumb in a remap flag that enables the filesystem remap handler to shorten remapping requests for callers that can handle it. Now copy_file_range can report partial success (in case we run up against alignment problems, resource limits, etc.). Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- fs/read_write.c | 3 ++- include/linux/fs.h | 2 ++ mm/filemap.c | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index a628fd9a47cf..8ed0aed81649 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1593,7 +1593,8 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, cloned = file_in->f_op->remap_file_range(file_in, pos_in, file_out, pos_out, - min_t(loff_t, MAX_RW_COUNT, len), 0); + min_t(loff_t, MAX_RW_COUNT, len), + RFR_CAN_SHORTEN); if (cloned >= 0) { ret = cloned; goto done; diff --git a/include/linux/fs.h b/include/linux/fs.h index 9f90dcd4df3b..e0494d719ebc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1726,9 +1726,11 @@ struct block_device_operations; * * RFR_IDENTICAL_DATA: only remap if contents identical (i.e. deduplicate) * RFR_TO_SRC_EOF: remap to the end of the source file + * RFR_CAN_SHORTEN: caller can handle a shortened request */ #define RFR_IDENTICAL_DATA (1 << 0) #define RFR_TO_SRC_EOF (1 << 1) +#define RFR_CAN_SHORTEN (1 << 2) struct iov_iter; diff --git a/mm/filemap.c b/mm/filemap.c index 2522737483de..2179d0204ee6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3064,8 +3064,12 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in, if (pos_in + count == size_in) { bcount = ALIGN(size_in, bs) - pos_in; } else { - if (!IS_ALIGNED(count, bs)) - return -EINVAL; + if (!IS_ALIGNED(count, bs)) { + if (remap_flags & RFR_CAN_SHORTEN) + count = ALIGN_DOWN(count, bs); + else + return -EINVAL; + } bcount = count; } @@ -3076,10 +3080,14 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in, pos_out < pos_in + bcount) return -EINVAL; - /* For now we don't support changing the length. */ - if (*req_count != count) + /* + * We shortened the request but the caller can't deal with that, so + * bounce the request back to userspace. + */ + if (*req_count != count && !(remap_flags & RFR_CAN_SHORTEN)) return -EINVAL; + *req_count = count; return 0; }
next prev parent reply other threads:[~2018-10-10 0:14 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-10 0:10 [PATCH v2 00/25] fs: fixes for serious clone/dedupe problems Darrick J. Wong 2018-10-10 0:10 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:10 ` [PATCH 01/25] xfs: add a per-xfs trace_printk macro Darrick J. Wong 2018-10-10 0:10 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:36 ` Dave Chinner 2018-10-10 0:36 ` [Ocfs2-devel] " Dave Chinner 2018-10-10 15:00 ` [PATCH v2 " Darrick J. Wong 2018-10-10 15:00 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:10 ` [PATCH 02/25] xfs: refactor clonerange preparation into a separate helper Darrick J. Wong 2018-10-10 0:10 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:10 ` [PATCH 03/25] xfs: zero posteof blocks when cloning above eof Darrick J. Wong 2018-10-10 0:10 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:11 ` [PATCH 04/25] xfs: update ctime and remove suid before cloning files Darrick J. Wong 2018-10-10 0:11 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:11 ` [PATCH 05/25] vfs: check file ranges " Darrick J. Wong 2018-10-10 0:11 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 23:06 ` Dave Chinner 2018-10-10 23:06 ` [Ocfs2-devel] " Dave Chinner 2018-10-10 23:13 ` Darrick J. Wong 2018-10-10 23:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:11 ` [PATCH 06/25] vfs: strengthen checking of file range inputs to generic_remap_checks Darrick J. Wong 2018-10-10 0:11 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 5:23 ` Amir Goldstein 2018-10-10 17:01 ` Darrick J. Wong 2018-10-10 17:01 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 17:26 ` Amir Goldstein 2018-10-10 0:11 ` [PATCH 07/25] vfs: skip zero-length dedupe requests Darrick J. Wong 2018-10-10 0:11 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:11 ` [PATCH 08/25] vfs: combine the clone and dedupe into a single remap_file_range Darrick J. Wong 2018-10-10 0:11 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 5:54 ` Amir Goldstein 2018-10-10 15:13 ` Darrick J. Wong 2018-10-10 15:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 15:23 ` Amir Goldstein 2018-10-10 0:11 ` [PATCH 09/25] vfs: rename vfs_clone_file_prep to be more descriptive Darrick J. Wong 2018-10-10 0:11 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:11 ` [PATCH 10/25] vfs: rename clone_verify_area to remap_verify_area Darrick J. Wong 2018-10-10 0:11 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:13 ` [PATCH 11/25] vfs: create generic_remap_file_range_touch to update inode metadata Darrick J. Wong 2018-10-10 0:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:13 ` [PATCH 12/25] vfs: pass remap flags to generic_remap_file_range_prep Darrick J. Wong 2018-10-10 0:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:13 ` [PATCH 13/25] vfs: pass remap flags to generic_remap_checks Darrick J. Wong 2018-10-10 0:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:13 ` [PATCH 14/25] vfs: make remap_file_range functions take and return bytes completed Darrick J. Wong 2018-10-10 0:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 6:47 ` Amir Goldstein 2018-10-10 15:50 ` Darrick J. Wong 2018-10-10 15:50 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 18:28 ` Amir Goldstein 2018-10-10 18:32 ` Darrick J. Wong 2018-10-10 18:32 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:13 ` [PATCH 15/25] vfs: plumb RFR_* remap flags through the vfs clone functions Darrick J. Wong 2018-10-10 0:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 6:22 ` Amir Goldstein 2018-10-10 6:39 ` Amir Goldstein 2018-10-10 0:13 ` [PATCH 16/25] vfs: plumb RFR_* remap flags through the vfs dedupe functions Darrick J. Wong 2018-10-10 0:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:13 ` [PATCH 17/25] vfs: make remapping to source file eof more explicit Darrick J. Wong 2018-10-10 0:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 12:29 ` Amir Goldstein 2018-10-10 16:29 ` Darrick J. Wong 2018-10-10 16:29 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 17:31 ` Amir Goldstein 2018-10-10 0:14 ` Darrick J. Wong [this message] 2018-10-10 0:14 ` [Ocfs2-devel] [PATCH 18/25] vfs: enable remap callers that can handle short operations Darrick J. Wong 2018-10-10 0:14 ` [PATCH 19/25] vfs: hide file range comparison function Darrick J. Wong 2018-10-10 0:14 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:14 ` [PATCH 20/25] vfs: implement opportunistic short dedupe Darrick J. Wong 2018-10-10 0:14 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:14 ` [PATCH 21/25] ocfs2: truncate page cache for clone destination file before remapping Darrick J. Wong 2018-10-10 0:14 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:14 ` [PATCH 22/25] ocfs2: fix pagecache truncation prior to reflink Darrick J. Wong 2018-10-10 0:14 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:14 ` [PATCH 23/25] ocfs2: support partial clone range and dedupe range Darrick J. Wong 2018-10-10 0:14 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:14 ` [PATCH 24/25] xfs: fix pagecache truncation prior to reflink Darrick J. Wong 2018-10-10 0:14 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 0:14 ` [PATCH 25/25] xfs: support returning partial reflink results Darrick J. Wong 2018-10-10 0:14 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-10 1:02 ` [PATCH v2 00/25] fs: fixes for serious clone/dedupe problems Dave Chinner 2018-10-10 1:02 ` [Ocfs2-devel] " Dave Chinner 2018-10-10 1:06 ` Darrick J. Wong 2018-10-10 1:06 ` [Ocfs2-devel] " 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=153913044431.32295.9717425324455762449.stgit@magnolia \ --to=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.