NVMe: Disable admin queue on init failure
Subsystems (2)
PATCH v2 1/1 NVMe: Disable admin queue on init failure
Disable the admin queue if device fails during initialization so the queue's irq is freed.
---v1->v2:
Moved the responsibilty of handling the admin queue to the funtion that set it up. This fixes the case where the controller is responsive but unable to handle io, so the cdev is still usable.
Fixed my typo in commit message from the sad rush to post the patch yesterday.
drivers/block/nvme-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/block/nvme-core.c +6 -1
@@ -1864,7 +1864,11 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)return 0 ; free_queues: -nvme_free_queues (dev); +for (i = dev->queue_count -1 ; i >0 ; i--) { +nvme_free_queue (dev->queues[i]); + dev->queue_count--; + dev->queues[i] =NULL ; + }return result; }
@@ -2141,6 +2145,7 @@ static int nvme_dev_start(struct nvme_dev *dev)return result; disable: +nvme_disable_queue (dev,0 );spin_lock (&dev_list_lock);list_del_init (&dev->node);spin_unlock (&dev_list_lock);
Signature · 1 line
1.7.10.4
PATCH v2 1/1 NVMe: Disable admin queue on init failure
Quoted 21 lines · Keith Busch
Disable the admin queue if device fails during initialization so the queue's irq is freed.
Signed-off-by Keith Busch <keith.busch at intel.com>---
v1->v2:
Moved the responsibilty of handling the admin queue to the funtion that set it up. This fixes the case where the controller is responsive but unable to handle io, so the cdev is still usable.Fixed my typo in commit message from the sad rush to post the patch yesterday.
drivers/block/nvme-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/block/nvme-core.c +0
-0
drivers/block/nvme-core.c static int nvme_setup_io_queues(struct nvme_dev *dev) · line 1871
Quoted 9 lines
drivers/block/nvme-core.c +5
-1@@ -1864,7 +1864,11 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)return 0 ; free_queues: -nvme_free_queues (dev); +for (i = dev->queue_count -1 ; i >0 ; i--) { +nvme_free_queue (dev->queues[i]); + dev->queue_count--; + dev->queues[i] =NULL ; + }
I don't really like duplicating the guts of nvme_free_queues here. How about this?
drivers/block/nvme-core.c +6 -5
@@ -1151,11 +1151,11 @@ static void nvme_free_queue(struct nvme_queue *nvmeq)kfree (nvmeq); } -static void nvme_free_queues (struct nvme_dev *dev) +static void nvme_free_queues (struct nvme_dev *dev,int lowest) {int i; -for (i = dev->queue_count -1 ; i >=0 ; i--) { +for (i = dev->queue_count -1 ; i >= lowest; i--) {nvme_free_queue (dev->queues[i]); dev->queue_count--; dev->queues[i] =NULL ;
@@ -1985,7 +1985,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)return 0 ; free_queues: -nvme_free_queues (dev); +nvme_free_queues (dev,1 );return result; }
@@ -2405,6 +2405,7 @@ static int nvme_dev_start(struct nvme_dev *dev)return result; disable: +nvme_disable_queue (dev,0 );spin_lock (&dev_list_lock);list_del_init (&dev->node);spin_unlock (&dev_list_lock);
@@ -2536,7 +2537,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) shutdown:nvme_dev_shutdown (dev); release_pools: -nvme_free_queues (dev); +nvme_free_queues (dev,0 );nvme_release_prp_pools (dev); release:nvme_release_instance (dev);
@@ -2560,7 +2561,7 @@ static void nvme_remove(struct pci_dev *pdev)misc_deregister (&dev->miscdev);nvme_dev_remove (dev);nvme_dev_shutdown (dev); -nvme_free_queues (dev); +nvme_free_queues (dev,0 );nvme_release_instance (dev);nvme_release_prp_pools (dev);kref_put (&dev->kref, nvme_free_dev);
PATCH v2 1/1 NVMe: Disable admin queue on init failure
Quoted 24 lines · Matthew Wilcox
Quoted 23 lines · Keith Busch
Disable the admin queue if device fails during initialization so the queue's irq is freed.
Signed-off-by Keith Busch <keith.busch at intel.com>---
v1->v2:
Moved the responsibilty of handling the admin queue to the funtion that set it up. This fixes the case where the controller is responsive but unable to handle io, so the cdev is still usable.Fixed my typo in commit message from the sad rush to post the patch yesterday.
drivers/block/nvme-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/block/nvme-core.c +0
-0@@ -1864,7 +1864,11 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)return 0 ;
Quoted 10 lines
drivers/block/nvme-core.c static int nvme_setup_io_queues(struct nvme_dev *dev) · line 1871
Quoted 7 lines
drivers/block/nvme-core.c +5
-1free_queues: -nvme_free_queues (dev); +for (i = dev->queue_count -1 ; i >0 ; i--) { +nvme_free_queue (dev->queues[i]); + dev->queue_count--; + dev->queues[i] =NULL ; + }I don't really like duplicating the guts of
nvme_free_queueshere. How about this?
Lovely, I like that much better too. Thanks!
Quoted 54 lines
drivers/block/nvme-core.c +6
-5@@ -1151,11 +1151,11 @@ static void nvme_free_queue(struct nvme_queue *nvmeq)kfree (nvmeq); } -static void nvme_free_queues (struct nvme_dev *dev) +static void nvme_free_queues (struct nvme_dev *dev,int lowest) {int i; -for (i = dev->queue_count -1 ; i >=0 ; i--) { +for (i = dev->queue_count -1 ; i >= lowest; i--) {nvme_free_queue (dev->queues[i]); dev->queue_count--; dev->queues[i] =NULL ;@@ -1985,7 +1985,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)return 0 ; free_queues: -nvme_free_queues (dev); +nvme_free_queues (dev,1 );return result; }@@ -2405,6 +2405,7 @@ static int nvme_dev_start(struct nvme_dev *dev)return result; disable: +nvme_disable_queue (dev,0 );spin_lock (&dev_list_lock);list_del_init (&dev->node);spin_unlock (&dev_list_lock);@@ -2536,7 +2537,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) shutdown:nvme_dev_shutdown (dev); release_pools: -nvme_free_queues (dev); +nvme_free_queues (dev,0 );nvme_release_prp_pools (dev); release:nvme_release_instance (dev);@@ -2560,7 +2561,7 @@ static void nvme_remove(struct pci_dev *pdev)misc_deregister (&dev->miscdev);nvme_dev_remove (dev);nvme_dev_shutdown (dev); -nvme_free_queues (dev); +nvme_free_queues (dev,0 );nvme_release_instance (dev);nvme_release_prp_pools (dev);kref_put (&dev->kref, nvme_free_dev);