Commit 82469c59 authored Sep 06, 2016 by Gabriel Krisman Bertazi Committed by Jens Axboe Sep 07, 2016

nvme: Don't suspend admin queue that wasn't created



This fixes a regression in my previous commit c21377f8 ("nvme:
Suspend all queues before deletion"), which provoked an Oops in the
removal path when removing a device that became IO incapable very early
at probe (i.e. after a failed EEH recovery).

Turns out, if the error occurred very early at the probe path, before
even configuring the admin queue, we might try to suspend the
uninitialized admin queue, accessing bad memory.

Fixes: c21377f8 ("nvme: Suspend all queues before deletion")
Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Reviewed-by: Jay Freyensee <james_p_freyensee@linux.intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent c6935931

drivers/nvme/host/pci.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1693,6 +1693,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
		nvme_suspend_queue(dev->queues[i]);

		if (csts & NVME_CSTS_CFS \|\| !(csts & NVME_CSTS_RDY)) {
		/* A device might become IO incapable very soon during
		* probe, before the admin queue is configured. Thus,
		* queue_count can be 0 here.
		*/
		if (dev->queue_count)
		nvme_suspend_queue(dev->queues[0]);
		} else {
		nvme_disable_io_queues(dev);

Admin message