mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
nvme-tcp: fix possible hang when failing to set io queues
commit72f572428b
upstream. We only setup io queues for nvme controllers, and it makes absolutely no sense to allow a controller (re)connect without any I/O queues. If we happen to fail setting the queue count for any reason, we should not allow this to be a successful reconnect as I/O has no chance in going through. Instead just fail and schedule another reconnect. Fixes:3f2304f8c6
("nvme-tcp: add NVMe over TCP host driver") Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a83e5c6c35
commit
7089cdfce3
1 changed files with 5 additions and 2 deletions
|
@ -1748,8 +1748,11 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ctrl->queue_count = nr_io_queues + 1;
|
ctrl->queue_count = nr_io_queues + 1;
|
||||||
if (ctrl->queue_count < 2)
|
if (ctrl->queue_count < 2) {
|
||||||
return 0;
|
dev_err(ctrl->device,
|
||||||
|
"unable to set any I/O queues\n");
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
dev_info(ctrl->device,
|
dev_info(ctrl->device,
|
||||||
"creating %d I/O queues.\n", nr_io_queues);
|
"creating %d I/O queues.\n", nr_io_queues);
|
||||||
|
|
Loading…
Reference in a new issue