| Message ID | 20221108150252.2123727-5-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/12] nvme-pci: don't call nvme_init_ctrl_finish from nvme_passthru_end | expand |
> Once the controller is shutdown no one can access the admin queue. Tear > it down in nvme_dev_remove_admin, which matches the flow in the other > drivers. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/nvme/host/pci.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index c8f6ce5eee1c2..f526ad578088a 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -1747,6 +1747,7 @@ static void nvme_dev_remove_admin(struct nvme_dev *dev) > */ > nvme_start_admin_queue(&dev->ctrl); > blk_mq_destroy_queue(dev->ctrl.admin_q); > + blk_put_queue(dev->ctrl.admin_q); > blk_mq_free_tag_set(&dev->admin_tagset); > } > } > @@ -2774,8 +2775,6 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl) > > nvme_dbbuf_dma_free(dev); > nvme_free_tagset(dev); > - if (dev->ctrl.admin_q) > - blk_put_queue(dev->ctrl.admin_q); Is the check here valid? meaning can we get here with a NULL admin_q? In any event, looks good Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
On Wed, Nov 09, 2022 at 04:58:46AM +0200, Sagi Grimberg wrote: >> @@ -2774,8 +2775,6 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl) >> nvme_dbbuf_dma_free(dev); >> nvme_free_tagset(dev); >> - if (dev->ctrl.admin_q) >> - blk_put_queue(dev->ctrl.admin_q); > > Is the check here valid? meaning can we get here with > a NULL admin_q? Yes, the admin queue is only set in the middle of nvme_reset_work, and for errors before that we can get here.
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index c8f6ce5eee1c2..f526ad578088a 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1747,6 +1747,7 @@ static void nvme_dev_remove_admin(struct nvme_dev *dev) */ nvme_start_admin_queue(&dev->ctrl); blk_mq_destroy_queue(dev->ctrl.admin_q); + blk_put_queue(dev->ctrl.admin_q); blk_mq_free_tag_set(&dev->admin_tagset); } } @@ -2774,8 +2775,6 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl) nvme_dbbuf_dma_free(dev); nvme_free_tagset(dev); - if (dev->ctrl.admin_q) - blk_put_queue(dev->ctrl.admin_q); mempool_destroy(dev->iod_mempool); put_device(dev->dev); kfree(dev->queues);
Once the controller is shutdown no one can access the admin queue. Tear it down in nvme_dev_remove_admin, which matches the flow in the other drivers. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/nvme/host/pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)