diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2021-03-16 00:04:26 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2021-03-18 07:39:01 +0300 |
| commit | 72f572428b83d0bc7028e7c4326d1a5f45205e44 (patch) | |
| tree | 94d24abf670768df1cc10d97974c08598a5948c2 /drivers/nvme/host | |
| parent | bb83337058a7000644cdeffc67361d2473534756 (diff) | |
| download | linux-72f572428b83d0bc7028e7c4326d1a5f45205e44.tar.xz | |
nvme-tcp: fix possible hang when failing to set io queues
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: 3f2304f8c6d6 ("nvme-tcp: add NVMe over TCP host driver")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 35a78682f8de..a0f00cb8f9f3 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1752,8 +1752,11 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) return ret; ctrl->queue_count = nr_io_queues + 1; - if (ctrl->queue_count < 2) - return 0; + if (ctrl->queue_count < 2) { + dev_err(ctrl->device, + "unable to set any I/O queues\n"); + return -ENOMEM; + } dev_info(ctrl->device, "creating %d I/O queues.\n", nr_io_queues); |