nvme-loop: retrieve iod from the cqe command_id
Subsystems (2)
Sagi Grimberg
maintainerPATCH 1/2 nvme-loop: retrieve iod from the cqe command_id
useful to validate that the we didn't mess up
the command_id.
--- drivers/nvme/target/loop.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-)
drivers/nvme/target/loop.c +25 -6
@@ -113,11 +113,20 @@ static void nvme_loop_complete_rq(struct request *req)blk_mq_end_request (req, error); } +static struct blk_mq_tags *nvme_loop_tagset (struct nvme_loop_queue *queue) +{ +u32 queue_idx =nvme_loop_queue_idx (queue); + +if (queue_idx ==0 ) +return queue->ctrl->admin_tag_set.tags[queue_idx]; +return queue->ctrl->tag_set.tags[queue_idx -1 ]; +} +static void nvme_loop_queue_response (struct nvmet_req *req) { -struct nvme_loop_iod *iod = - container_of(req, struct nvme_loop_iod, req); -struct nvme_completion *cqe = &iod->rsp; +struct nvme_loop_queue *queue = + container_of(req->sq, struct nvme_loop_queue, nvme_sq); +struct nvme_completion *cqe = req->rsp;/* * AEN requests are special as they don't time out and can
@@ -125,13 +134,23 @@ static void nvme_loop_queue_response(struct nvmet_req *req)* aborts. We don't even bother to allocate a struct request * for them but rather special case them here. */ -if (unlikely (nvme_loop_queue_idx (iod->queue) ==0 && +if (unlikely (nvme_loop_queue_idx (queue) ==0 && cqe->command_id >=NVME_LOOP_AQ_BLKMQ_DEPTH )) { -nvme_complete_async_event (&iod->queue->ctrl->ctrl, cqe->status, +nvme_complete_async_event (&queue->ctrl->ctrl, cqe->status, &cqe->result); }else { -struct request *rq =blk_mq_rq_from_pdu (iod); +struct request *rq; +struct nvme_loop_iod *iod; + + rq =blk_mq_tag_to_rq (nvme_loop_tagset (queue), cqe->command_id); +if (!rq) { +dev_err (queue->ctrl->ctrl.device, +"tag 0x%x on queue %d not found\n" , + cqe->command_id,nvme_loop_queue_idx (queue)); +return ; + } + iod =blk_mq_rq_to_pdu (rq); iod->nvme_req.result = cqe->result;blk_mq_complete_request (rq,le16_to_cpu (cqe->status) >>1 ); }
Signature · 1 line
2.7.4
Sagi Grimberg
maintainerPATCH 2/2 nvme-loop: fix a possible use-after-free when destroying the admin queue
we need to destroy the nvmet sq and let it finish gracefully before continue to cleanup the queue.
--- drivers/nvme/target/loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/loop.c +1 -1
@@ -307,9 +307,9 @@ static struct blk_mq_ops nvme_loop_admin_mq_ops = {static void nvme_loop_destroy_admin_queue (struct nvme_loop_ctrl *ctrl) { +nvmet_sq_destroy (&ctrl->queues[0 ].nvme_sq);blk_cleanup_queue (ctrl->ctrl.admin_q);blk_mq_free_tag_set (&ctrl->admin_tag_set); -nvmet_sq_destroy (&ctrl->queues[0 ].nvme_sq); }static void nvme_loop_free_ctrl (struct nvme_ctrl *nctrl)
Signature · 1 line
2.7.4
Christoph Hellwig
maintainerPATCH 2/2 nvme-loop: fix a possible use-after-free when destroying the admin queue
Looks fine,
Christoph Hellwig
maintainerPATCH 1/2 nvme-loop: retrieve iod from the cqe command_id
In reply to Sagi GrimbergQuoted 2 lines · Sagi Grimberg
useful to validate that the we didn't mess up
thecommand_id.
But also less efficient, so I don't really see a good reason for it.
Sagi Grimberg
maintainerPATCH 1/2 nvme-loop: retrieve iod from the cqe command_id
Quoted 5 lines
Quoted 3 lines
useful to validate that the we didn't mess up
thecommand_id.But also less efficient, so I don't really see a good reason for it.
Less efficient? I highly doubt this will ever make any noticeable difference...
I changed that because the blk-mq scheduler facilities broke nvmf and it took me a while to figure out why loop doesn't break like rdma, but I really don't see why we do something different from all other transports, especially since its main usage is testing...
I can drop it if you insist against it but I sorta disagree with you.