Messages in this thread | | | From | Himanshu Madhani <> | Subject | Re: [PATCH v7 1/3] nvme-fc: Update hardware queues before using them | Date | Tue, 14 Sep 2021 13:52:47 +0000 |
| |
> On Sep 14, 2021, at 4:20 AM, Daniel Wagner <dwagner@suse.de> wrote: > > In case the number of hardware queues changes, we need to update the > tagset and the mapping of ctx to hctx first. > > If we try to create and connect the I/O queues first, this operation > will fail (target will reject the connect call due to the wrong number > of queues) and hence we bail out of the recreate function. Then we > will to try the very same operation again, thus we don't make any > progress. > > Reviewed-by: James Smart <jsmart2021@gmail.com> > Reviewed-by: Ming Lei <ming.lei@redhat.com> > Reviewed-by: Hannes Reinecke <hare@suse.de> > Signed-off-by: Daniel Wagner <dwagner@suse.de> > --- > drivers/nvme/host/fc.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c > index b08a61ca283f..b5d9a5507de5 100644 > --- a/drivers/nvme/host/fc.c > +++ b/drivers/nvme/host/fc.c > @@ -2951,14 +2951,6 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl) > if (ctrl->ctrl.queue_count == 1) > return 0; > > - ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1); > - if (ret) > - goto out_free_io_queues; > - > - ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1); > - if (ret) > - goto out_delete_hw_queues; > - > if (prior_ioq_cnt != nr_io_queues) { > dev_info(ctrl->ctrl.device, > "reconnect: revising io queue count from %d to %d\n", > @@ -2968,6 +2960,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl) > nvme_unfreeze(&ctrl->ctrl); > } > > + ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1); > + if (ret) > + goto out_free_io_queues; > + > + ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1); > + if (ret) > + goto out_delete_hw_queues; > + > return 0; > > out_delete_hw_queues: > -- > 2.29.2 >
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
-- Himanshu Madhani Oracle Linux Engineering
| |