NVMe: Fix device cleanup on initialization failure

Don't release block queue and tagging resoureces if the driver never
got them in the first place. This can happen if the controller fails to
become ready, if memory wasn't available to allocate a tagset or admin
queue, or if the resources were released as part of error recovery.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 4af0e21caf8e676e57ea27d7cce3426e473e498c)

Conflicts:

	drivers/block/nvme-core.c

Orabug: 21569452

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 61d053899a7013878e6834590e052d547a8ac308..ade7cb9b77706cc0e191ff67cac9f36dfd70889d 100644 (file)
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -189,6 +189,13 @@ static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
        return 0;
 }
 
+static void nvme_admin_exit_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx)
+{
+       struct nvme_queue *nvmeq = hctx->driver_data;
+
+       nvmeq->hctx = NULL;
+}
+
 static int nvme_admin_init_request(void *data, struct request *req,
                                unsigned int hctx_idx, unsigned int rq_idx,
                                unsigned int numa_node)
@@ -1555,7 +1562,7 @@ static struct blk_mq_ops nvme_mq_admin_ops = {
        .queue_rq       = nvme_admin_queue_rq,
        .map_queue      = blk_mq_map_queue,
        .init_hctx      = nvme_admin_init_hctx,
-       .exit_hctx      = nvme_exit_hctx,
+       .exit_hctx      = nvme_admin_exit_hctx,
        .init_request   = nvme_admin_init_request,
        .timeout        = nvme_timeout,
 };
@@ -1599,6 +1606,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
                }
                if (!blk_get_queue(dev->admin_q)) {
                        nvme_dev_remove_admin(dev);
+                       dev->admin_q = NULL;
                        return -ENODEV;
                }
        } else
@@ -2734,8 +2742,10 @@ static void nvme_free_dev(struct kref *kref)
        put_device(dev->device);
        nvme_free_namespaces(dev);
        nvme_release_instance(dev);
-       blk_mq_free_tag_set(&dev->tagset);
-       blk_put_queue(dev->admin_q);
+       if (dev->tagset.tags)
+               blk_mq_free_tag_set(&dev->tagset);
+       if (dev->admin_q)
+               blk_put_queue(dev->admin_q);
        kfree(dev->queues);
        kfree(dev->entry);
        kfree(dev);
@@ -2866,6 +2876,8 @@ static int nvme_dev_start(struct nvme_dev *dev)
 
  free_tags:
        nvme_dev_remove_admin(dev);
+       blk_put_queue(dev->admin_q);
+       dev->admin_q = NULL;
  disable:
        nvme_disable_queue(dev, 0);
        nvme_dev_list_remove(dev);