From: Jens Axboe <axboe@kernel.dk>
To: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-aio@kvack.org
Cc: hch@lst.de, Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 26/27] iov_iter: add import_kvec()
Date: Fri, 30 Nov 2018 09:56:45 -0700 [thread overview]
Message-ID: <20181130165646.27341-27-axboe@kernel.dk> (raw)
In-Reply-To: <20181130165646.27341-1-axboe@kernel.dk>
This explicitly sets up an ITER_KVEC from an iovec with kernel ranges
mapped.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
include/linux/uio.h | 3 +++
lib/iov_iter.c | 35 ++++++++++++++++++++++++++---------
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 55ce99ddb912..bbefdb421f6d 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -284,6 +284,9 @@ int compat_import_iovec(int type, const struct compat_iovec __user * uvector,
int import_single_range(int type, void __user *buf, size_t len,
struct iovec *iov, struct iov_iter *i);
+int import_kvec(int type, const struct kvec *kvecs, unsigned nr_segs,
+ size_t bytes, struct iov_iter *iter);
+
int iov_iter_for_each_range(struct iov_iter *i, size_t bytes,
int (*f)(struct kvec *vec, void *context),
void *context);
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 7ebccb5c1637..a5b6dd691f37 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -431,25 +431,33 @@ int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes)
}
EXPORT_SYMBOL(iov_iter_fault_in_readable);
-void iov_iter_init(struct iov_iter *i, unsigned int direction,
- const struct iovec *iov, unsigned long nr_segs,
- size_t count)
+static void iov_iter_init_type(struct iov_iter *i, int type,
+ unsigned int direction, const struct iovec *iov,
+ unsigned long nr_segs, size_t count)
{
WARN_ON(direction & ~(READ | WRITE));
direction &= READ | WRITE;
- /* It will get better. Eventually... */
- if (uaccess_kernel()) {
- i->type = ITER_KVEC | direction;
+ i->type = type | direction;
+ if (i->type == ITER_KVEC)
i->kvec = (struct kvec *)iov;
- } else {
- i->type = ITER_IOVEC | direction;
+ else
i->iov = iov;
- }
+
i->nr_segs = nr_segs;
i->iov_offset = 0;
i->count = count;
}
+
+void iov_iter_init(struct iov_iter *i, unsigned int direction,
+ const struct iovec *iov, unsigned long nr_segs,
+ size_t count)
+{
+ /* It will get better. Eventually... */
+ int type = uaccess_kernel() ? ITER_KVEC : ITER_IOVEC;
+
+ iov_iter_init_type(i, type, direction, iov, nr_segs, count);
+}
EXPORT_SYMBOL(iov_iter_init);
static void memcpy_from_page(char *to, struct page *page, size_t offset, size_t len)
@@ -1582,6 +1590,15 @@ int import_iovec(int type, const struct iovec __user * uvector,
}
EXPORT_SYMBOL(import_iovec);
+int import_kvec(int type, const struct kvec *kvecs, unsigned nr_segs,
+ size_t bytes, struct iov_iter *iter)
+{
+ const struct iovec *p = (const struct iovec *) kvecs;
+
+ iov_iter_init_type(iter, ITER_KVEC, type, p, nr_segs, bytes);
+ return 0;
+}
+
#ifdef CONFIG_COMPAT
#include <linux/compat.h>
--
2.17.1
next prev parent reply other threads:[~2018-11-30 16:57 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-30 16:56 [PATCHSET v4] Support for polled aio Jens Axboe
2018-11-30 16:56 ` [PATCH 01/27] aio: fix failure to put the file pointer Jens Axboe
2018-11-30 17:07 ` Bart Van Assche
2018-11-30 17:08 ` Jens Axboe
2018-11-30 17:24 ` Bart Van Assche
2018-11-30 16:56 ` [PATCH 02/27] aio: clear IOCB_HIPRI Jens Axboe
2018-11-30 17:13 ` Christoph Hellwig
2018-11-30 17:14 ` Jens Axboe
2018-12-04 14:46 ` Christoph Hellwig
2018-12-04 16:40 ` Jens Axboe
2018-11-30 16:56 ` [PATCH 03/27] fs: add an iopoll method to struct file_operations Jens Axboe
2018-11-30 16:56 ` [PATCH 04/27] block: wire up block device iopoll method Jens Axboe
2018-11-30 16:56 ` [PATCH 05/27] block: ensure that async polled IO is marked REQ_NOWAIT Jens Axboe
2018-11-30 17:12 ` Bart Van Assche
2018-11-30 17:17 ` Jens Axboe
2018-12-04 14:48 ` Christoph Hellwig
2018-12-04 18:13 ` Jens Axboe
2018-11-30 16:56 ` [PATCH 06/27] iomap: wire up the iopoll method Jens Axboe
2018-11-30 16:56 ` [PATCH 07/27] iomap: ensure that async polled IO is marked REQ_NOWAIT Jens Axboe
2018-11-30 16:56 ` [PATCH 08/27] aio: use assigned completion handler Jens Axboe
2018-11-30 16:56 ` [PATCH 09/27] aio: separate out ring reservation from req allocation Jens Axboe
2018-11-30 16:56 ` [PATCH 10/27] aio: don't zero entire aio_kiocb aio_get_req() Jens Axboe
2018-12-04 14:49 ` Christoph Hellwig
2018-12-04 15:27 ` Jens Axboe
2018-11-30 16:56 ` [PATCH 11/27] aio: only use blk plugs for > 2 depth submissions Jens Axboe
2018-12-04 14:50 ` Christoph Hellwig
2018-11-30 16:56 ` [PATCH 12/27] aio: use iocb_put() instead of open coding it Jens Axboe
2018-12-04 14:50 ` Christoph Hellwig
2018-11-30 16:56 ` [PATCH 13/27] aio: split out iocb copy from io_submit_one() Jens Axboe
2018-11-30 16:56 ` [PATCH 14/27] aio: abstract out io_event filler helper Jens Axboe
2018-11-30 16:56 ` [PATCH 15/27] aio: add io_setup2() system call Jens Axboe
2018-11-30 16:56 ` [PATCH 16/27] aio: add support for having user mapped iocbs Jens Axboe
2018-11-30 16:56 ` [PATCH 17/27] aio: support for IO polling Jens Axboe
2018-11-30 16:56 ` [PATCH 18/27] aio: add submission side request cache Jens Axboe
2018-11-30 16:56 ` [PATCH 19/27] fs: add fget_many() and fput_many() Jens Axboe
2018-11-30 16:56 ` [PATCH 20/27] aio: use fget/fput_many() for file references Jens Axboe
2018-11-30 16:56 ` [PATCH 21/27] aio: split iocb init from allocation Jens Axboe
2018-11-30 16:56 ` [PATCH 22/27] aio: batch aio_kiocb allocation Jens Axboe
2018-11-30 16:56 ` [PATCH 23/27] block: add BIO_HOLD_PAGES flag Jens Axboe
2018-11-30 16:56 ` [PATCH 24/27] block: implement bio helper to add iter kvec pages to bio Jens Axboe
2018-11-30 19:21 ` Al Viro
2018-11-30 20:15 ` Jens Axboe
2018-11-30 20:32 ` Jens Axboe
2018-11-30 21:11 ` Al Viro
2018-11-30 21:16 ` Jens Axboe
2018-11-30 21:25 ` Al Viro
2018-11-30 21:34 ` Jens Axboe
2018-11-30 22:06 ` Jens Axboe
2018-12-04 14:55 ` Christoph Hellwig
2018-12-04 15:25 ` Jens Axboe
2018-11-30 16:56 ` [PATCH 25/27] fs: add support for mapping an ITER_KVEC for O_DIRECT Jens Axboe
2018-11-30 16:56 ` Jens Axboe [this message]
2018-11-30 19:17 ` [PATCH 26/27] iov_iter: add import_kvec() Al Viro
2018-11-30 20:15 ` Jens Axboe
2018-11-30 16:56 ` [PATCH 27/27] aio: add support for pre-mapped user IO buffers Jens Axboe
2018-11-30 21:44 ` Jeff Moyer
2018-11-30 21:57 ` Jens Axboe
2018-11-30 22:04 ` Jeff Moyer
2018-11-30 22:11 ` Jens Axboe
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=20181130165646.27341-27-axboe@kernel.dk \
--to=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-aio@kvack.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.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).