* [PATCH] NVMe: Fix command setup on IO retry
@ 2014-12-04 0:07 Keith Busch
2014-12-04 2:08 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Keith Busch @ 2014-12-04 0:07 UTC (permalink / raw)
On retry, the req->special is pointing to an already setup IOD, but we
still need to setup the command context and callback, otherwise you'll
see false twice completed errors and leak requests.
Signed-off-by: Keith Busch <keith.busch at intel.com>
---
drivers/block/nvme-core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 0da7756..23dd4fd 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -641,8 +641,6 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
iod->private = req;
req->special = iod;
- nvme_set_info(cmd, iod, req_completion);
-
if (req->cmd_flags & REQ_DISCARD) {
void *range;
/*
@@ -678,6 +676,7 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
blk_mq_start_request(req);
submit_iod:
+ nvme_set_info(cmd, iod, req_completion);
spin_lock_irq(&nvmeq->q_lock);
if (req->cmd_flags & REQ_DISCARD)
nvme_submit_discard(nvmeq, ns, req, iod);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] NVMe: Fix command setup on IO retry
2014-12-04 0:07 [PATCH] NVMe: Fix command setup on IO retry Keith Busch
@ 2014-12-04 2:08 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2014-12-04 2:08 UTC (permalink / raw)
On 12/03/2014 05:07 PM, Keith Busch wrote:
> On retry, the req->special is pointing to an already setup IOD, but we
> still need to setup the command context and callback, otherwise you'll
> see false twice completed errors and leak requests.
Good catch!
I'll queue this up for 3.19.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-04 2:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-04 0:07 [PATCH] NVMe: Fix command setup on IO retry Keith Busch
2014-12-04 2:08 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox