linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Anuj Gupta <anuj20.g@samsung.com>
To: axboe@kernel.dk, hch@lst.de, kbusch@kernel.org
Cc: io-uring@vger.kernel.org, linux-nvme@lists.infradead.org,
	linux-block@vger.kernel.org, gost.dev@samsung.com,
	linux-scsi@vger.kernel.org, Kanchan Joshi <joshi.k@samsung.com>
Subject: [PATCH for-next v12 12/12] nvme: wire up fixed buffer support for nvme passthrough
Date: Fri, 30 Sep 2022 11:57:49 +0530	[thread overview]
Message-ID: <20220930062749.152261-13-anuj20.g@samsung.com> (raw)
In-Reply-To: <20220930062749.152261-1-anuj20.g@samsung.com>

From: Kanchan Joshi <joshi.k@samsung.com>

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 <joshi.k@samsung.com>
---
 drivers/nvme/host/ioctl.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index 7a41caa9bfd2..81f5550b670d 100644
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -95,8 +95,22 @@ static int nvme_map_user_request(struct request *req, u64 ubuffer,
 	void *meta = NULL;
 	int ret;
 
-	ret = blk_rq_map_user_io(req, NULL, nvme_to_user_ptr(ubuffer), bufflen,
-			GFP_KERNEL, vec, 0, 0, rq_data_dir(req));
+	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 {
+		ret = blk_rq_map_user_io(req, NULL, nvme_to_user_ptr(ubuffer),
+				bufflen, GFP_KERNEL, vec, 0, 0,
+				rq_data_dir(req));
+	}
 
 	if (ret)
 		goto out;
-- 
2.25.1



  parent reply	other threads:[~2022-09-30  6:48 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20220930063754epcas5p2aff33c952032713a39604388eacda910@epcas5p2.samsung.com>
2022-09-30  6:27 ` [PATCH for-next v12 00/12] Fixed-buffer for uring-cmd/passthru Anuj Gupta
     [not found]   ` <CGME20220930063805epcas5p2c8eb80f32507f011baedc6d6b4d3f38d@epcas5p2.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 01/12] io_uring: add io_uring_cmd_import_fixed Anuj Gupta
     [not found]   ` <CGME20220930063809epcas5p328b9e14ead49e9612b905e6f5b6682f7@epcas5p3.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 02/12] io_uring: introduce fixed buffer support for io_uring_cmd Anuj Gupta
2022-09-30 13:42       ` Jens Axboe
2022-09-30 14:04         ` Anuj gupta
     [not found]   ` <CGME20220930063811epcas5p43cce58f5e1589c3e3780ce0cfd563986@epcas5p4.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 03/12] block: add blk_rq_map_user_io Anuj Gupta
     [not found]   ` <CGME20220930063815epcas5p1e056d6a2a53949296a7657de804fd2ec@epcas5p1.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 04/12] scsi: Use blk_rq_map_user_io helper Anuj Gupta
     [not found]   ` <CGME20220930063818epcas5p4e321f0efa5a53759ea19eb8f1c63deef@epcas5p4.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 05/12] nvme: " Anuj Gupta
     [not found]   ` <CGME20220930063821epcas5p48d4ec5136d487ea779ac74e2c0b740ac@epcas5p4.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 06/12] nvme: refactor nvme_add_user_metadata Anuj Gupta
     [not found]   ` <CGME20220930063824epcas5p4f829f3b8673e2603cdc9a799ca44ea6e@epcas5p4.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 07/12] nvme: refactor nvme_alloc_request Anuj Gupta
     [not found]   ` <CGME20220930063826epcas5p491d9bc62214c1d7c8c24c883299edfb7@epcas5p4.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 08/12] block: rename bio_map_put to blk_mq_map_bio_put Anuj Gupta
     [not found]   ` <CGME20220930063828epcas5p2bfddb254b0dffde77e99c2acc4440bde@epcas5p2.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 09/12] block: factor out blk_rq_map_bio_alloc helper Anuj Gupta
     [not found]   ` <CGME20220930063831epcas5p4b6a8559dedd39ef423a0b9a317163969@epcas5p4.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 10/12] block: extend functionality to map bvec iterator Anuj Gupta
     [not found]   ` <CGME20220930063833epcas5p40fbff95f9d132f5a42dda80d307426e9@epcas5p4.samsung.com>
2022-09-30  6:27     ` [PATCH for-next v12 11/12] nvme: pass ubuffer as an integer Anuj Gupta
     [not found]   ` <CGME20220930063835epcas5p2812f8e3d0758b19c01198034fcddc019@epcas5p2.samsung.com>
2022-09-30  6:27     ` Anuj Gupta [this message]
2022-09-30 14:04   ` [PATCH for-next v12 00/12] Fixed-buffer for uring-cmd/passthru 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=20220930062749.152261-13-anuj20.g@samsung.com \
    --to=anuj20.g@samsung.com \
    --cc=axboe@kernel.dk \
    --cc=gost.dev@samsung.com \
    --cc=hch@lst.de \
    --cc=io-uring@vger.kernel.org \
    --cc=joshi.k@samsung.com \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-scsi@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).