Commit 3073ec7f authored Aug 07, 2021 by Ruozhu Li Committed by Greg Kroah-Hartman Sep 15, 2021

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



[ Upstream commit 664227fde63844d69e9ec9e90a8a7801e6ff072d ]

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>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 93cf19b4

drivers/nvme/host/tcp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1649,13 +1649,13 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
		if (ret)
		return ret;

		ctrl->queue_count = nr_io_queues + 1;
		if (ctrl->queue_count < 2) {
		if (nr_io_queues == 0) {
		dev_err(ctrl->device,
		"unable to set any I/O queues\n");
		return -ENOMEM;
		}

		ctrl->queue_count = nr_io_queues + 1;
		dev_info(ctrl->device,
		"creating %d I/O queues.\n", nr_io_queues);