diff options
| author | Ruozhu Li <liruozhu@huawei.com> | 2021-08-07 11:50:23 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-15 09:50:25 +0200 |
| commit | 5d0f0c3bbe9926e373329a6fe142f5edcf59e102 (patch) | |
| tree | 5ce351fb2ce7de86bd3ae1629019e7665b50c7b8 /drivers/nvme | |
| parent | 591f69d7c415a64f96df6de9a674aaead355de21 (diff) | |
| download | kernel_replicant_linux-5d0f0c3bbe9926e373329a6fe142f5edcf59e102.tar.gz kernel_replicant_linux-5d0f0c3bbe9926e373329a6fe142f5edcf59e102.tar.bz2 kernel_replicant_linux-5d0f0c3bbe9926e373329a6fe142f5edcf59e102.zip | |
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>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 82b2611d39a2..5b11d8a23813 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1755,13 +1755,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); |