From: Christoph Hellwig <[email protected]>
To: Kanchan Joshi <[email protected]>
Cc: [email protected], [email protected], [email protected],
[email protected], [email protected],
[email protected], [email protected],
[email protected]
Subject: Re: [PATCH for-next v7 3/5] nvme: refactor nvme_alloc_user_request
Date: Tue, 20 Sep 2022 14:02:26 +0200 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On Fri, Sep 09, 2022 at 03:51:34PM +0530, Kanchan Joshi wrote:
> Separate this out to two functions with reduced number of arguments.
> _
> Signed-off-by: Kanchan Joshi <[email protected]>
> ---
> drivers/nvme/host/ioctl.c | 116 ++++++++++++++++++++++----------------
> 1 file changed, 66 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
> index 548aca8b5b9f..cb2fa4db50dd 100644
> --- a/drivers/nvme/host/ioctl.c
> +++ b/drivers/nvme/host/ioctl.c
> @@ -65,18 +65,10 @@ static int nvme_finish_user_metadata(struct request *req, void __user *ubuf,
> }
>
> static struct request *nvme_alloc_user_request(struct request_queue *q,
> + struct nvme_command *cmd, unsigned timeout,
> blk_opf_t rq_flags, blk_mq_req_flags_t blk_flags)
I think we can also drop the timeout flag here, which seems like it
can be handled cleaner in the callers.
to set it can just do that.
> +static int nvme_map_user_request(struct request *req, void __user *ubuffer,
> + unsigned bufflen, void __user *meta_buffer, unsigned meta_len,
> + u32 meta_seed, void **metap, bool vec)
> +{
> + struct request_queue *q = req->q;
> + struct nvme_ns *ns = q->queuedata;
> + struct block_device *bdev = ns ? ns->disk->part0 : NULL;
> + struct bio *bio = NULL;
> + void *meta = NULL;
> + int ret;
> +
> + if (!ubuffer || !bufflen)
> + return 0;
I'd leave these in the callers and not call the helper if there is
no data to transfer.
> +
> + if (!vec)
> + ret = blk_rq_map_user(q, req, NULL, ubuffer, bufflen,
> + GFP_KERNEL);
> + else {
> + 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);
> + if (ret < 0)
> goto out;
> + ret = blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL);
> + kfree(iov);
To me some of this almost screams like lifting the vectored vs
not to the block layer into a separate helper.
> + }
> + bio = req->bio;
> + if (ret)
> + goto out_unmap;
This seems incorrect, we don't need to unmap if blk_rq_map_user*
failed.
> + if (bdev)
> + bio_set_dev(bio, bdev);
I think we can actually drop this now - bi_bdev should only be used
by the non-passthrough path these days.
> + if (bdev && meta_buffer && meta_len) {
> + meta = nvme_add_user_metadata(bio, meta_buffer, meta_len,
> + meta_seed, req_op(req) == REQ_OP_DRV_OUT);
> + if (IS_ERR(meta)) {
> + ret = PTR_ERR(meta);
> + goto out_unmap;
> }
> + req->cmd_flags |= REQ_INTEGRITY;
> + *metap = meta;
And if we pass the request to nvme_add_user_metadata, that can set
REQ_INTEGRITY. And we don't need this second helper at all.
next prev parent reply other threads:[~2022-09-20 12:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220909103131epcas5p23d146916eccedf30d498e0ea23e54052@epcas5p2.samsung.com>
2022-09-09 10:21 ` [PATCH for-next v7 0/5] fixed-buffer for uring-cmd/passthru Kanchan Joshi
[not found] ` <CGME20220909103136epcas5p38ea3a933e90d9f9d7451848dc3a60829@epcas5p3.samsung.com>
2022-09-09 10:21 ` [PATCH for-next v7 1/5] io_uring: add io_uring_cmd_import_fixed Kanchan Joshi
[not found] ` <CGME20220909103140epcas5p36689726422eb68e6fdc1d39019a4a8ba@epcas5p3.samsung.com>
2022-09-09 10:21 ` [PATCH for-next v7 2/5] io_uring: introduce fixed buffer support for io_uring_cmd Kanchan Joshi
[not found] ` <CGME20220909103143epcas5p2eda60190cd23b79fb8f48596af3e1524@epcas5p2.samsung.com>
2022-09-09 10:21 ` [PATCH for-next v7 3/5] nvme: refactor nvme_alloc_user_request Kanchan Joshi
2022-09-20 12:02 ` Christoph Hellwig [this message]
2022-09-22 15:46 ` Kanchan Joshi
2022-09-23 9:25 ` Kanchan Joshi
[not found] ` <CGME20220909103147epcas5p2a83ec151333bcb1d2abb8c7536789bfd@epcas5p2.samsung.com>
2022-09-09 10:21 ` [PATCH for-next v7 4/5] block: add helper to map bvec iterator for passthrough Kanchan Joshi
2022-09-20 12:08 ` Christoph Hellwig
2022-09-22 15:23 ` Kanchan Joshi
2022-09-23 15:29 ` Christoph Hellwig
2022-09-23 18:43 ` Kanchan Joshi
2022-09-25 17:46 ` Kanchan Joshi
2022-09-26 14:50 ` Christoph Hellwig
2022-09-27 16:47 ` Kanchan Joshi
[not found] ` <CGME20220909103151epcas5p1e25127c3053ba21e8f8418a701878973@epcas5p1.samsung.com>
2022-09-09 10:21 ` [PATCH for-next v7 5/5] nvme: wire up fixed buffer support for nvme passthrough Kanchan Joshi
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] \
/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