On Wed, Jul 05, 2017 at 09:53:05AM +0300, Sagi Grimberg wrote: > unlike blk_mq_stop_hw_queues and blk_mq_start_stopped_hw_queues > quiescing/unquiescing respects the submission path rcu grace. > > Also, make sure to unquiesce before cleanup the admin queue. > > Reviewed-By: James Smart <[email protected]> > Signed-off-by: Sagi Grimberg <[email protected]> > --- > drivers/nvme/host/fc.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c > index 50cc3b2b0e11..3e35fc622680 100644 > --- a/drivers/nvme/host/fc.c > +++ b/drivers/nvme/host/fc.c > @@ -1703,6 +1703,7 @@ nvme_fc_ctrl_free(struct kref *ref) > list_del(&ctrl->ctrl_list); > spin_unlock_irqrestore(&ctrl->rport->lock, flags); > > + blk_mq_unquiesce_queue(ctrl->ctrl.admin_q); > blk_cleanup_queue(ctrl->ctrl.admin_q); > blk_mq_free_tag_set(&ctrl->admin_tag_set); > > @@ -2320,8 +2321,10 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) > if (ret) > goto out_delete_hw_queue; > > - if (ctrl->ctrl.state != NVME_CTRL_NEW) > - blk_mq_start_stopped_hw_queues(ctrl->ctrl.admin_q, true); > + if (ctrl->ctrl.state != NVME_CTRL_NEW) { > + blk_mq_unquiesce_queue(ctrl->ctrl.admin_q); > + blk_mq_kick_requeue_list(ctrl->ctrl.admin_q);
Same comment with patch 1 -- Ming
