Commit 5e063101 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Christoph Hellwig

nvmet: cleanup nvmet_passthru_map_sg()

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: c1fef73f ("nvmet: add passthru code to process commands")
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Suggested-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent df06047d
...@@ -187,18 +187,20 @@ static void nvmet_passthru_req_done(struct request *rq, ...@@ -187,18 +187,20 @@ static void nvmet_passthru_req_done(struct request *rq,
static int nvmet_passthru_map_sg(struct nvmet_req *req, 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; struct scatterlist *sg;
int op_flags = 0; int op_flags = 0;
struct bio *bio; struct bio *bio;
int i, ret; int i, ret;
if (req->sg_cnt > BIO_MAX_PAGES)
return -EINVAL;
if (req->cmd->common.opcode == nvme_cmd_flush) if (req->cmd->common.opcode == nvme_cmd_flush)
op_flags = REQ_FUA; op_flags = REQ_FUA;
else if (nvme_is_write(req->cmd)) else if (nvme_is_write(req->cmd))
op_flags = REQ_SYNC | REQ_IDLE; 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_end_io = bio_put;
bio->bi_opf = req_op(rq) | op_flags; bio->bi_opf = req_op(rq) | op_flags;
...@@ -208,7 +210,6 @@ static int nvmet_passthru_map_sg(struct nvmet_req *req, struct request *rq) ...@@ -208,7 +210,6 @@ static int nvmet_passthru_map_sg(struct nvmet_req *req, struct request *rq)
bio_put(bio); bio_put(bio);
return -EINVAL; return -EINVAL;
} }
sg_cnt--;
} }
ret = blk_rq_append_bio(rq, &bio); ret = blk_rq_append_bio(rq, &bio);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment