Commit 6cb5d6ae authored Jul 28, 2021 by Ruozhu Li Committed by Greg Kroah-Hartman Sep 15, 2021

nvme-rdma: don't update queue count when failing to set io queues



[ Upstream commit 85032874f80ba17bf187de1d14d9603bf3f582b8 ]

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@huawei.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 3073ec7f

drivers/nvme/host/rdma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -665,13 +665,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);