[PATCH] nvme-rdma: Don't update queue count when failing to set io queues

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi at grimberg.me>

Can you send this patch for tcp as well?

On 7/28/21 2:41 AM, Ruozhu Li wrote:
> We update ctrl->queue_count and schedule another reconnect when io queue
> count is zero.But we will never try to create any io queue in next reco-
> nnection, because ctrl->queue_count already set to zero.We will end up
> having an admin-only session in Live state, which is exactly what we try
> to avoid in the original patch.
> Update ctrl->queue_count after queue_count zero checking to fix it.
> 
> Signed-off-by: Ruozhu Li <liruozhu at huawei.com>
> ---
>   drivers/nvme/host/rdma.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 7f6b3a991501..3bd9cbc80246 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -735,13 +735,13 @@ static int nvme_rdma_alloc_io_queues(struct nvme_rdma_ctrl *ctrl)
>   	if (ret)
>   		return ret;
>   
> -	ctrl->ctrl.queue_count = nr_io_queues + 1;
> -	if (ctrl->ctrl.queue_count < 2) {
> +	if (nr_io_queues == 0) {
>   		dev_err(ctrl->ctrl.device,
>   			"unable to set any I/O queues\n");
>   		return -ENOMEM;
>   	}
>   
> +	ctrl->ctrl.queue_count = nr_io_queues + 1;
>   	dev_info(ctrl->ctrl.device,
>   		"creating %d I/O queues.\n", nr_io_queues);
>   
>