提交 0ef9763f 编写于 作者: S Sagi Grimberg 提交者: Cheng Jian

nvme-rdma: fix possible hang when failing to set io queues

stable inclusion
from linux-4.19.183
commit 5d9873e46c6d5a3c358341e40c373b79677f14e2

--------------------------------

[ Upstream commit c4c6df5f ]

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.
Reported-by: NChao Leng <lengchao@huawei.com>
Fixes: 71102307 ("nvme-rdma: add a NVMe over Fabrics RDMA host driver")
Signed-off-by: NSagi Grimberg <sagi@grimberg.me>
Reviewed-by: NChao Leng <lengchao@huawei.com>
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NCheng Jian <cj.chengjian@huawei.com>
上级 dd268d03
......@@ -651,8 +651,11 @@ static int nvme_rdma_alloc_io_queues(struct nvme_rdma_ctrl *ctrl)
return ret;
ctrl->ctrl.queue_count = nr_io_queues + 1;
if (ctrl->ctrl.queue_count < 2)
return 0;
if (ctrl->ctrl.queue_count < 2) {
dev_err(ctrl->ctrl.device,
"unable to set any I/O queues\n");
return -ENOMEM;
}
dev_info(ctrl->ctrl.device,
"creating %d I/O queues.\n", nr_io_queues);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册