* [PATCH 1/2] nvme-tcp: Fix possible hang when failing to set io queues
@ 2021-03-15 21:04 Sagi Grimberg
2021-03-15 21:04 ` [PATCH 2/2] nvme-rdma: " Sagi Grimberg
2021-03-18 4:35 ` [PATCH 1/2] nvme-tcp: " Christoph Hellwig
0 siblings, 2 replies; 4+ messages in thread
From: Sagi Grimberg @ 2021-03-15 21:04 UTC (permalink / raw)
To: linux-nvme, Christoph Hellwig, Keith Busch, Chaitanya Kulkarni,
Chao Leng
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>
---
drivers/nvme/host/tcp.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 5274cc5800f9..31e4e59f0866 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);
--
2.27.0
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] nvme-rdma: Fix possible hang when failing to set io queues
2021-03-15 21:04 [PATCH 1/2] nvme-tcp: Fix possible hang when failing to set io queues Sagi Grimberg
@ 2021-03-15 21:04 ` Sagi Grimberg
2021-03-16 1:33 ` Chao Leng
2021-03-18 4:35 ` [PATCH 1/2] nvme-tcp: " Christoph Hellwig
1 sibling, 1 reply; 4+ messages in thread
From: Sagi Grimberg @ 2021-03-15 21:04 UTC (permalink / raw)
To: linux-nvme, Christoph Hellwig, Keith Busch, Chaitanya Kulkarni,
Chao Leng
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: Chao Leng <lengchao@huawei.com>
Fixes: 711023071960 ("nvme-rdma: add a NVMe over Fabrics RDMA host driver")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---
drivers/nvme/host/rdma.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 53ac4d7442ba..eb093ea5ffa1 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -736,8 +736,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);
--
2.27.0
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] nvme-rdma: Fix possible hang when failing to set io queues
2021-03-15 21:04 ` [PATCH 2/2] nvme-rdma: " Sagi Grimberg
@ 2021-03-16 1:33 ` Chao Leng
0 siblings, 0 replies; 4+ messages in thread
From: Chao Leng @ 2021-03-16 1:33 UTC (permalink / raw)
To: Sagi Grimberg, linux-nvme, Christoph Hellwig, Keith Busch,
Chaitanya Kulkarni
Reviewed-by: Chao Leng <lengchao@huawei.com>
On 2021/3/16 5:04, Sagi Grimberg wrote:
> 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: Chao Leng <lengchao@huawei.com>
> Fixes: 711023071960 ("nvme-rdma: add a NVMe over Fabrics RDMA host driver")
> Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
> ---
> drivers/nvme/host/rdma.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 53ac4d7442ba..eb093ea5ffa1 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -736,8 +736,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);
>
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] nvme-tcp: Fix possible hang when failing to set io queues
2021-03-15 21:04 [PATCH 1/2] nvme-tcp: Fix possible hang when failing to set io queues Sagi Grimberg
2021-03-15 21:04 ` [PATCH 2/2] nvme-rdma: " Sagi Grimberg
@ 2021-03-18 4:35 ` Christoph Hellwig
1 sibling, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2021-03-18 4:35 UTC (permalink / raw)
To: Sagi Grimberg
Cc: linux-nvme, Christoph Hellwig, Keith Busch, Chaitanya Kulkarni,
Chao Leng
Applied both to nvme-5.12.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-18 4:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 21:04 [PATCH 1/2] nvme-tcp: Fix possible hang when failing to set io queues Sagi Grimberg
2021-03-15 21:04 ` [PATCH 2/2] nvme-rdma: " Sagi Grimberg
2021-03-16 1:33 ` Chao Leng
2021-03-18 4:35 ` [PATCH 1/2] nvme-tcp: " Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).