From: Christoph Hellwig Date: Fri, 2 Oct 2015 16:51:31 +0000 (+0200) Subject: nvme: properly handle partially initialized queues in nvme_create_io_queues X-Git-Tag: v4.1.12-92~126^2~231 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=059eb932ae71c3f8cc54f8b4560fa0dad5c9a793;p=users%2Fjedix%2Flinux-maple.git 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: Christoph Hellwig Reviewed-by: Keith Busch Signed-off-by: Jens Axboe (cherry picked from commit 2659e57b906562bb020fb093b0c1b670b9700314) Orabug: 22620486 Signed-off-by: Jason Luo --- diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 5190a7d3dcd0f..e728c57de2d16 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -2196,6 +2196,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; @@ -2205,8 +2212,10 @@ 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) @@ -3012,9 +3021,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);