android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme-loop: retrieve iod from the cqe command_id

Browse Source 
useful to validate that the we didn't mess up
the command_id.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Sagi Grimberg 2017-02-27 18:28:25 +02:00 committed by Jens Axboe
parent d89a39be5f
commit 3b06837630
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/nvme/target/loop.c
View File

@ -111,11 +111,20 @@ static void nvme_loop_complete_rq(struct request *req)
blk_mq_end_request(req, error); 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) static void nvme_loop_queue_response(struct nvmet_req *req)
{ {
struct nvme_loop_iod *iod = struct nvme_loop_queue *queue =
container_of(req, struct nvme_loop_iod, req); container_of(req->sq, struct nvme_loop_queue, nvme_sq);
struct nvme_completion *cqe = &iod->rsp; struct nvme_completion *cqe = req->rsp;
/* /*
* AEN requests are special as they don't time out and can * AEN requests are special as they don't time out and can
@ -123,13 +132,23 @@ static void nvme_loop_queue_response(struct nvmet_req *req)
* aborts. We don't even bother to allocate a struct request * aborts. We don't even bother to allocate a struct request
* for them but rather special case them here. * 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)) { 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); &cqe->result);
} else { } 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; iod->nvme_req.result = cqe->result;
blk_mq_complete_request(rq, le16_to_cpu(cqe->status) >> 1); blk_mq_complete_request(rq, le16_to_cpu(cqe->status) >> 1);
} }