From: Anuj Gupta <[email protected]>
To: [email protected], [email protected], [email protected]
Cc: [email protected], [email protected],
[email protected], [email protected],
[email protected], Kanchan Joshi <[email protected]>
Subject: [PATCH for-next v11 10/13] nvme: wire up fixed buffer support for nvme passthrough
Date: Thu, 29 Sep 2022 17:36:29 +0530 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
From: Kanchan Joshi <[email protected]>
if io_uring sends passthrough command with IORING_URING_CMD_FIXED flag,
use the pre-registered buffer for IO (non-vectored variant). Pass the
buffer/length to io_uring and get the bvec iterator for the range. Next,
pass this bvec to block-layer and obtain a bio/request for subsequent
processing.
Signed-off-by: Kanchan Joshi <[email protected]>
Suggested-by: Christoph Hellwig <[email protected]>
---
drivers/nvme/host/ioctl.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index 4a7e45a263b6..25a68e8c60db 100644
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -95,21 +95,31 @@ static int nvme_map_user_request(struct request *req, u64 ubuffer,
void *meta = NULL;
int ret;
- if (!vec)
- ret = blk_rq_map_user(q, req, NULL, ubuffer, bufflen,
- GFP_KERNEL);
- else {
+ if (ioucmd && (ioucmd->flags & IORING_URING_CMD_FIXED)) {
+ struct iov_iter iter;
+
+ /* fixedbufs is only for non-vectored io */
+ if (WARN_ON_ONCE(vec))
+ return -EINVAL;
+ ret = io_uring_cmd_import_fixed(ubuffer, bufflen,
+ rq_data_dir(req), &iter, ioucmd);
+ if (ret < 0)
+ goto out;
+ ret = blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL);
+ } else if (vec) {
struct iovec fast_iov[UIO_FASTIOV];
struct iovec *iov = fast_iov;
struct iov_iter iter;
- ret = import_iovec(rq_data_dir(req), ubuffer, bufflen,
- UIO_FASTIOV, &iov, &iter);
+ ret = import_iovec(rq_data_dir(req), nvme_to_user_ptr(ubuffer),
+ bufflen, UIO_FASTIOV, &iov, &iter);
if (ret < 0)
goto out;
-
ret = blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL);
kfree(iov);
+ } else {
+ ret = blk_rq_map_user(q, req, NULL,
+ nvme_to_user_ptr(ubuffer), bufflen, GFP_KERNEL);
}
if (ret)
goto out;
--
2.25.1
next prev parent reply other threads:[~2022-09-29 12:24 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220929121630epcas5p3e1ed2c5251276d557f8f921e8186620f@epcas5p3.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 00/13] Fixed-buffer for uring-cmd/passthru Anuj Gupta
[not found] ` <CGME20220929121634epcas5p27400b84f8a8b43a91c4199ec39d50b51@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 01/13] io_uring: add io_uring_cmd_import_fixed Anuj Gupta
[not found] ` <CGME20220929121637epcas5p2ff344c7951037f79d117d000e405dd45@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 02/13] io_uring: introduce fixed buffer support for io_uring_cmd Anuj Gupta
2022-09-30 1:26 ` Jens Axboe
[not found] ` <CGME20220929121640epcas5p400a71aa51f374f016e2143d0228879bc@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 03/13] nvme: refactor nvme_add_user_metadata Anuj Gupta
[not found] ` <CGME20220929121643epcas5p4c58f6ebb794bde58981272cd33c69f9f@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 04/13] nvme: refactor nvme_alloc_request Anuj Gupta
2022-09-29 13:25 ` Christoph Hellwig
[not found] ` <CGME20220929121647epcas5p2d4ca8ae0b83a1fce230914f586ee3cc0@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 05/13] block: rename bio_map_put to blk_mq_map_bio_put Anuj Gupta
2022-09-29 13:25 ` Christoph Hellwig
[not found] ` <CGME20220929121650epcas5p424925af86ec6941bb53e5c102fd0ffc8@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 06/13] block: factor out blk_rq_map_bio_alloc helper Anuj Gupta
[not found] ` <CGME20220929121653epcas5p4ee82ef35b46d6686820dc4d870b6588e@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 07/13] block: add blk_rq_map_user_bvec Anuj Gupta
2022-09-29 13:26 ` Christoph Hellwig
[not found] ` <CGME20220929121657epcas5p213b7a187fd77b0783adb4b9389579b44@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 08/13] block: extend functionality to map bvec iterator Anuj Gupta
[not found] ` <CGME20220929121701epcas5p287a6d3f851626a5c7580d9a534432e9b@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 09/13] nvme: pass ubuffer as an integer Anuj Gupta
2022-09-29 13:27 ` Christoph Hellwig
[not found] ` <CGME20220929121704epcas5p3415fd4782cbcffa7b1e6ddf774bebb03@epcas5p3.samsung.com>
2022-09-29 12:06 ` Anuj Gupta [this message]
[not found] ` <CGME20220929121709epcas5p325553d10a7ada7717c2f51ddb566a3e5@epcas5p3.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 11/13] block: add blk_rq_map_user_io Anuj Gupta
2022-09-29 13:28 ` Christoph Hellwig
[not found] ` <CGME20220929121713epcas5p1824ed0c48c9e9ceeb18954d9c23564ed@epcas5p1.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 12/13] scsi: Use blk_rq_map_user_io helper Anuj Gupta
2022-09-29 13:28 ` Christoph Hellwig
[not found] ` <CGME20220929121715epcas5p488759f34f6e55d940c6dca523e24f464@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 13/13] nvme: " Anuj Gupta
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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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