Commit 2659e57b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: properly handle partially initialized queues in nvme_create_io_queues 



This avoids having to clean up later in a seemingly unrelated place.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3cf519b5

drivers/block/nvme-core.c

+14 −2
Original line number Diff line number Diff line
@@ -2189,6 +2189,13 @@ static void nvme_alloc_ns(struct nvme_dev *dev, unsigned nsid) 
	kfree(ns);

}



/*

 * Create I/O queues.  Failing to create an I/O queue is not an issue,

 * we can continue with less than the desired amount of queues, and

 * even a controller without I/O queues an still be used to issue

 * admin commands.  This might be useful to upgrade a buggy firmware

 * for example.

 */

static void nvme_create_io_queues(struct nvme_dev *dev)

{

	unsigned i;
@@ -2198,9 +2205,11 @@ static void nvme_create_io_queues(struct nvme_dev *dev) 
			break;



	for (i = dev->online_queues; i <= dev->queue_count - 1; i++)

		if (nvme_create_queue(dev->queues[i], i))

		if (nvme_create_queue(dev->queues[i], i)) {

			nvme_free_queues(dev, i);

			break;

		}

}



static int set_queue_count(struct nvme_dev *dev, int count)

{
@@ -2994,9 +3003,12 @@ static void nvme_probe_work(struct work_struct *work) 


	dev->event_limit = 1;



	/*

	 * Keep the controller around but remove all namespaces if we don't have

	 * any working I/O queue.

	 */

	if (dev->online_queues < 2) {

		dev_warn(dev->dev, "IO queues not created\n");

		nvme_free_queues(dev, 1);

		nvme_dev_remove(dev);

	} else {

		nvme_unfreeze_queues(dev);