From: David Howells <dhowells@redhat.com>
To: Pavel Begunkov <asml.silence@gmail.com>,
Matthew Wilcox <willy@infradead.org>,
Jens Axboe <axboe@kernel.dk>,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: dhowells@redhat.com,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 21/29] iov_iter: Split iov_iter_get_pages()
Date: Sat, 21 Nov 2020 14:16:05 +0000 [thread overview]
Message-ID: <160596816579.154728.8100196610696982437.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <160596800145.154728.7192318545120181269.stgit@warthog.procyon.org.uk>
Split iov_iter_get_pages() by type.
Signed-off-by: David Howells <dhowells@redhat.com>
---
lib/iov_iter.c | 46 +++++++++++++++++++++++++++++-----------------
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 5744ddec854f..a2de201b947f 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1611,6 +1611,8 @@ static ssize_t pipe_get_pages(struct iov_iter *i,
unsigned int iter_head, npages;
size_t capacity;
+ if (maxsize > i->count)
+ maxsize = i->count;
if (!maxsize)
return 0;
@@ -1625,19 +1627,14 @@ static ssize_t pipe_get_pages(struct iov_iter *i,
return __pipe_get_pages(i, min(maxsize, capacity), pages, iter_head, start);
}
-static ssize_t xxx_get_pages(struct iov_iter *i,
+static ssize_t iovec_get_pages(struct iov_iter *i,
struct page **pages, size_t maxsize, unsigned maxpages,
size_t *start)
{
if (maxsize > i->count)
maxsize = i->count;
- if (unlikely(iov_iter_is_pipe(i)))
- return pipe_get_pages(i, pages, maxsize, maxpages, start);
- if (unlikely(iov_iter_is_discard(i)))
- return -EFAULT;
-
- iterate_all_kinds(i, maxsize, v, ({
+ iterate_over_iovec(i, maxsize, v, ({
unsigned long addr = (unsigned long)v.iov_base;
size_t len = v.iov_len + (*start = addr & (PAGE_SIZE - 1));
int n;
@@ -1653,18 +1650,33 @@ static ssize_t xxx_get_pages(struct iov_iter *i,
if (unlikely(res < 0))
return res;
return (res == n ? len : res * PAGE_SIZE) - *start;
- 0;}),({
+ 0;}));
+ return 0;
+}
+
+static ssize_t bvec_get_pages(struct iov_iter *i,
+ struct page **pages, size_t maxsize, unsigned maxpages,
+ size_t *start)
+{
+ if (maxsize > i->count)
+ maxsize = i->count;
+
+ iterate_over_bvec(i, maxsize, v, ({
/* can't be more than PAGE_SIZE */
*start = v.bv_offset;
get_page(*pages = v.bv_page);
return v.bv_len;
- }),({
- return -EFAULT;
- })
- )
+ }));
return 0;
}
+static ssize_t no_get_pages(struct iov_iter *i,
+ struct page **pages, size_t maxsize, unsigned maxpages,
+ size_t *start)
+{
+ return -EFAULT;
+}
+
static struct page **get_pages_array(size_t n)
{
return kvmalloc_array(n, sizeof(struct page *), GFP_KERNEL);
@@ -2179,7 +2191,7 @@ static const struct iov_iter_ops iovec_iter_ops = {
.zero = iovec_zero,
.alignment = iovec_alignment,
.gap_alignment = iovec_gap_alignment,
- .get_pages = xxx_get_pages,
+ .get_pages = iovec_get_pages,
.get_pages_alloc = xxx_get_pages_alloc,
.npages = xxx_npages,
.dup_iter = xxx_dup_iter,
@@ -2213,7 +2225,7 @@ static const struct iov_iter_ops kvec_iter_ops = {
.zero = kvec_zero,
.alignment = kvec_alignment,
.gap_alignment = kvec_gap_alignment,
- .get_pages = xxx_get_pages,
+ .get_pages = no_get_pages,
.get_pages_alloc = xxx_get_pages_alloc,
.npages = xxx_npages,
.dup_iter = xxx_dup_iter,
@@ -2247,7 +2259,7 @@ static const struct iov_iter_ops bvec_iter_ops = {
.zero = bvec_zero,
.alignment = bvec_alignment,
.gap_alignment = bvec_gap_alignment,
- .get_pages = xxx_get_pages,
+ .get_pages = bvec_get_pages,
.get_pages_alloc = xxx_get_pages_alloc,
.npages = xxx_npages,
.dup_iter = xxx_dup_iter,
@@ -2281,7 +2293,7 @@ static const struct iov_iter_ops pipe_iter_ops = {
.zero = pipe_zero,
.alignment = pipe_alignment,
.gap_alignment = no_gap_alignment,
- .get_pages = xxx_get_pages,
+ .get_pages = pipe_get_pages,
.get_pages_alloc = xxx_get_pages_alloc,
.npages = xxx_npages,
.dup_iter = xxx_dup_iter,
@@ -2315,7 +2327,7 @@ static const struct iov_iter_ops discard_iter_ops = {
.zero = discard_zero,
.alignment = no_alignment,
.gap_alignment = no_gap_alignment,
- .get_pages = xxx_get_pages,
+ .get_pages = no_get_pages,
.get_pages_alloc = xxx_get_pages_alloc,
.npages = xxx_npages,
.dup_iter = xxx_dup_iter,
next prev parent reply other threads:[~2020-11-21 14:16 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-21 14:13 [PATCH 00/29] RFC: iov_iter: Switch to using an ops table David Howells
2020-11-21 14:13 ` [PATCH 01/29] iov_iter: Switch to using a table of operations David Howells
2020-11-21 14:31 ` Pavel Begunkov
2020-11-23 23:21 ` Pavel Begunkov
2020-11-21 18:21 ` Linus Torvalds
2020-12-11 1:30 ` Al Viro
2020-11-22 13:33 ` David Howells
2020-11-22 13:58 ` David Laight
2020-11-22 19:22 ` Linus Torvalds
2020-11-22 22:34 ` David Laight
2020-11-22 22:46 ` David Laight
2020-11-23 8:05 ` Christoph Hellwig
2020-11-23 10:31 ` David Howells
2020-11-23 23:42 ` Pavel Begunkov
2020-11-24 12:50 ` David Howells
2020-11-24 15:30 ` Jens Axboe
2020-11-27 17:14 ` David Howells
2020-11-23 11:14 ` David Howells
[not found] ` <20201203064536.GE27350@xsang-OptiPlex-9020>
2020-12-03 17:47 ` [iov_iter] 9bd0e337c6: will-it-scale.per_process_ops -4.8% regression Linus Torvalds
2020-12-03 17:50 ` Jens Axboe
2020-12-04 11:50 ` David Howells
2020-12-04 11:51 ` David Howells
2020-12-07 13:10 ` Oliver Sang
2020-12-07 13:20 ` David Howells
2020-11-21 14:13 ` [PATCH 02/29] iov_iter: Split copy_page_to_iter() David Howells
2020-11-21 14:13 ` [PATCH 03/29] iov_iter: Split iov_iter_fault_in_readable David Howells
2020-11-21 14:13 ` [PATCH 04/29] iov_iter: Split the iterate_and_advance() macro David Howells
2020-11-21 14:14 ` [PATCH 05/29] iov_iter: Split copy_to_iter() David Howells
2020-11-21 14:14 ` [PATCH 06/29] iov_iter: Split copy_mc_to_iter() David Howells
2020-11-21 14:14 ` [PATCH 07/29] iov_iter: Split copy_from_iter() David Howells
2020-11-21 14:14 ` [PATCH 08/29] iov_iter: Split the iterate_all_kinds() macro David Howells
2020-11-21 14:14 ` [PATCH 09/29] iov_iter: Split copy_from_iter_full() David Howells
2020-11-21 14:14 ` [PATCH 10/29] iov_iter: Split copy_from_iter_nocache() David Howells
2020-11-21 14:14 ` [PATCH 11/29] iov_iter: Split copy_from_iter_flushcache() David Howells
2020-11-21 14:14 ` [PATCH 12/29] iov_iter: Split copy_from_iter_full_nocache() David Howells
2020-11-21 14:15 ` [PATCH 13/29] iov_iter: Split copy_page_from_iter() David Howells
2020-11-21 14:15 ` [PATCH 14/29] iov_iter: Split iov_iter_zero() David Howells
2020-11-21 14:15 ` [PATCH 15/29] iov_iter: Split copy_from_user_atomic() David Howells
2020-11-21 14:15 ` [PATCH 16/29] iov_iter: Split iov_iter_advance() David Howells
2020-11-21 14:15 ` [PATCH 17/29] iov_iter: Split iov_iter_revert() David Howells
2020-11-21 14:15 ` [PATCH 18/29] iov_iter: Split iov_iter_single_seg_count() David Howells
2020-11-21 14:15 ` [PATCH 19/29] iov_iter: Split iov_iter_alignment() David Howells
2020-11-21 14:15 ` [PATCH 20/29] iov_iter: Split iov_iter_gap_alignment() David Howells
2020-11-21 14:16 ` David Howells [this message]
2020-11-21 14:16 ` [PATCH 22/29] iov_iter: Split iov_iter_get_pages_alloc() David Howells
2020-11-21 14:16 ` [PATCH 23/29] iov_iter: Split csum_and_copy_from_iter() David Howells
2020-11-21 14:16 ` [PATCH 24/29] iov_iter: Split csum_and_copy_from_iter_full() David Howells
2020-11-21 14:16 ` [PATCH 25/29] iov_iter: Split csum_and_copy_to_iter() David Howells
2020-11-21 14:16 ` [PATCH 26/29] iov_iter: Split iov_iter_npages() David Howells
2020-11-21 14:16 ` [PATCH 27/29] iov_iter: Split dup_iter() David Howells
2020-11-21 14:17 ` [PATCH 28/29] iov_iter: Split iov_iter_for_each_range() David Howells
2020-11-21 14:17 ` [PATCH 29/29] iov_iter: Remove iterate_all_kinds() and iterate_and_advance() David Howells
2020-11-21 14:34 ` [PATCH 00/29] RFC: iov_iter: Switch to using an ops table Pavel Begunkov
2020-11-21 18:23 ` Linus Torvalds
2020-12-11 3:24 ` Matthew Wilcox
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=160596816579.154728.8100196610696982437.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.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).