From: Douglas Gilbert <dgilbert@interlog.com>
To: Logan Gunthorpe <logang@deltatee.com>, linux-nvme@lists.infradead.org
Cc: Christoph Hellwig <hch@lst.de>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Sagi Grimberg <sagi@grimberg.me>
Subject: Re: [PATCH] nvmet-passthru: Cleanup nvmet_passthru_map_sg()
Date: Tue, 13 Oct 2020 18:38:46 -0400 [thread overview]
Message-ID: <1b6ced06-dd44-ac20-cafa-b4724d9a188d@interlog.com> (raw)
In-Reply-To: <20201009231816.1524-1-logang@deltatee.com>
On 2020-10-09 7:18 p.m., Logan Gunthorpe wrote:
> Clean up some confusing elements of nvmet_passthru_map_sg() by returning
> early if the request is greater than the maximum bio size. This allows
> us to drop the sg_cnt variable.
>
> This should not result in any functional change but makes the code
> clearer and more understandable. The original code allocated a truncated
> bio then would return EINVAL when bio_add_pc_page() filled that bio. The
> new code just returns EINVAL early if this would happen.
>
> Fixes: c1fef73f793b ("nvmet: add passthru code to process commands")
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> Suggested-by: Douglas Gilbert <dgilbert@interlog.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Sagi Grimberg <sagi@grimberg.me>
> Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Douglas Gilbert <dgilbert@interlog.com>
I have commented offline to Logan about the return from bio_alloc()
not being checked for NULL. He assures me that can't happen but I believe
that is true only for small scatter-gather lists. So I guess it depends
on the size of the data this is planned to be sent through this
pass-through.
> ---
> drivers/nvme/target/passthru.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvme/target/passthru.c b/drivers/nvme/target/passthru.c
> index dacfa7435d0b..076e829490a1 100644
> --- a/drivers/nvme/target/passthru.c
> +++ b/drivers/nvme/target/passthru.c
> @@ -180,18 +180,20 @@ static void nvmet_passthru_req_done(struct request *rq,
>
> static int nvmet_passthru_map_sg(struct nvmet_req *req, struct request *rq)
> {
> - int sg_cnt = req->sg_cnt;
> struct scatterlist *sg;
> int op_flags = 0;
> struct bio *bio;
> int i, ret;
>
> + if (req->sg_cnt > BIO_MAX_PAGES)
> + return -EINVAL;
> +
> if (req->cmd->common.opcode == nvme_cmd_flush)
> op_flags = REQ_FUA;
> else if (nvme_is_write(req->cmd))
> op_flags = REQ_SYNC | REQ_IDLE;
>
> - bio = bio_alloc(GFP_KERNEL, min(sg_cnt, BIO_MAX_PAGES));
> + bio = bio_alloc(GFP_KERNEL, req->sg_cnt);
> bio->bi_end_io = bio_put;
> bio->bi_opf = req_op(rq) | op_flags;
>
> @@ -201,7 +203,6 @@ static int nvmet_passthru_map_sg(struct nvmet_req *req, struct request *rq)
> bio_put(bio);
> return -EINVAL;
> }
> - sg_cnt--;
> }
>
> ret = blk_rq_append_bio(rq, &bio);
>
> base-commit: 549738f15da0e5a00275977623be199fbbf7df50
>
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-10-13 22:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 23:18 [PATCH] nvmet-passthru: Cleanup nvmet_passthru_map_sg() Logan Gunthorpe
2020-10-13 22:26 ` Sagi Grimberg
2020-10-13 22:38 ` Douglas Gilbert [this message]
2020-10-14 0:16 ` Chaitanya Kulkarni
2020-10-14 0:20 ` Logan Gunthorpe
2020-10-14 0:25 ` Chaitanya Kulkarni
2020-10-14 15:47 ` Logan Gunthorpe
2020-10-15 7:56 ` Christoph Hellwig
2020-10-15 16:01 ` Logan Gunthorpe
2020-10-15 17:24 ` Douglas Gilbert
2020-10-15 18:01 ` Christoph Hellwig
2020-10-15 18:40 ` Logan Gunthorpe
2020-10-16 13:57 ` Christoph Hellwig
2020-10-16 16:49 ` Logan Gunthorpe
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=1b6ced06-dd44-ac20-cafa-b4724d9a188d@interlog.com \
--to=dgilbert@interlog.com \
--cc=chaitanya.kulkarni@wdc.com \
--cc=hch@lst.de \
--cc=linux-nvme@lists.infradead.org \
--cc=logang@deltatee.com \
--cc=sagi@grimberg.me \
/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).