NVMe: Fix memory leak on retried commands
Subsystems (2)
PATCH 1/1 NVMe: Fix memory leak on retried commands
commit 0dfc70c33409afc232ef0b9ec210535dfbf9bc61 upstream
Resources are reallocated for requeued commands, so unmap and release the iod for the failed command.
It's a pretty bad memory leak and causes a kernel hang if you remove a drive because of a busy dma pool. You'll get messages spewing like this:
nvme 0000:xx:xx.x: dma_pool_destroy prp list 256, ffff880420dec000 busy
and lock up pci and the driver since removal never completes while holding a lock.
Cc <[email protected]> # 4.0.x-
Signed-off-by Keith Busch <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Signed-off-by Jens Axboe <[email protected]>
--- drivers/block/nvme-core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/block/nvme-core.c +6 -3
@@ -597,6 +597,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,struct nvme_iod *iod = ctx;struct request *req =iod_get_private (iod);struct nvme_cmd_info *cmd_rq =blk_mq_rq_to_pdu (req); +bool requeue = false;u16 status =le16_to_cpup (&cqe->status) >>1 ;
@@ -605,12 +606,13 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, && (jiffies - req->start_time) < req->timeout) {unsigned long flags; + requeue = true;blk_mq_requeue_request (req);spin_lock_irqsave (req->q->queue_lock, flags);if (!blk_queue_stopped (req->q))blk_mq_kick_requeue_list (req->q);spin_unlock_irqrestore (req->q->queue_lock, flags); -return ; + goto release_iod; } req->errors =nvme_error_status (status); }else
@@ -620,7 +622,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,dev_warn (&nvmeq->dev->pci_dev->dev,"completing aborted command with status:%04x\n" , status); - + release_iod:if (iod->nents) {dma_unmap_sg (&nvmeq->dev->pci_dev->dev, iod->sg, iod->nents,rq_data_dir (req) ?DMA_TO_DEVICE :DMA_FROM_DEVICE );
@@ -633,7 +635,8 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, }nvme_free_iod (nvmeq->dev, iod); -blk_mq_complete_request (req); +if (likely (!requeue)) +blk_mq_complete_request (req); }/* length is in bytes. gfp flags indicates whether we may sleep. */
Signature · 1 line
2.6.2.307.g37023ba