* [PATCH] nvme: move NVMF_OPT_CTRL_LOSS_TMO to generic list of allowed options
@ 2021-02-05 15:47 Hannes Reinecke
2021-02-05 16:25 ` Christoph Hellwig
0 siblings, 1 reply; 4+ messages in thread
From: Hannes Reinecke @ 2021-02-05 15:47 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-nvme, Sagi Grimberg, Keith Busch, Hannes Reinecke
Every single fabrics driver with the exception of loop is setting
NVMF_OPT_CTRL_LOSS_TMO, and recent nvme-cli has begun to set this
in the default options when create a discovery controller.
As it's not listed for loop connections to the loop controller will
fail.
So move it to the generic options to avoid this failure.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/nvme/host/fabrics.c | 1 +
drivers/nvme/host/fc.c | 2 +-
drivers/nvme/host/rdma.c | 2 +-
drivers/nvme/host/tcp.c | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index 72ac00173500..e752acfd85a4 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -1007,6 +1007,7 @@ EXPORT_SYMBOL_GPL(nvmf_free_options);
NVMF_OPT_KATO | NVMF_OPT_HOSTNQN | \
NVMF_OPT_HOST_ID | NVMF_OPT_DUP_CONNECT |\
NVMF_OPT_DISABLE_SQFLOW |\
+ NVMF_OPT_CTRL_LOSS_TMO |\
NVMF_OPT_FAIL_FAST_TMO)
static struct nvme_ctrl *
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index bcc086fcbe61..2348722ed276 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -3721,7 +3721,7 @@ static struct nvmf_transport_ops nvme_fc_transport = {
.name = "fc",
.module = THIS_MODULE,
.required_opts = NVMF_OPT_TRADDR | NVMF_OPT_HOST_TRADDR,
- .allowed_opts = NVMF_OPT_RECONNECT_DELAY | NVMF_OPT_CTRL_LOSS_TMO,
+ .allowed_opts = NVMF_OPT_RECONNECT_DELAY,
.create_ctrl = nvme_fc_create_ctrl,
};
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 634ed5f5f778..80f5740ca9c1 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -2410,7 +2410,7 @@ static struct nvmf_transport_ops nvme_rdma_transport = {
.module = THIS_MODULE,
.required_opts = NVMF_OPT_TRADDR,
.allowed_opts = NVMF_OPT_TRSVCID | NVMF_OPT_RECONNECT_DELAY |
- NVMF_OPT_HOST_TRADDR | NVMF_OPT_CTRL_LOSS_TMO |
+ NVMF_OPT_HOST_TRADDR |
NVMF_OPT_NR_WRITE_QUEUES | NVMF_OPT_NR_POLL_QUEUES |
NVMF_OPT_TOS,
.create_ctrl = nvme_rdma_create_ctrl,
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index eee9470bb1bd..94ab52045dfc 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -2544,7 +2544,7 @@ static struct nvmf_transport_ops nvme_tcp_transport = {
.module = THIS_MODULE,
.required_opts = NVMF_OPT_TRADDR,
.allowed_opts = NVMF_OPT_TRSVCID | NVMF_OPT_RECONNECT_DELAY |
- NVMF_OPT_HOST_TRADDR | NVMF_OPT_CTRL_LOSS_TMO |
+ NVMF_OPT_HOST_TRADDR |
NVMF_OPT_HDR_DIGEST | NVMF_OPT_DATA_DIGEST |
NVMF_OPT_NR_WRITE_QUEUES | NVMF_OPT_NR_POLL_QUEUES |
NVMF_OPT_TOS,
--
2.29.2
_______________________________________________
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] nvme: move NVMF_OPT_CTRL_LOSS_TMO to generic list of allowed options
2021-02-05 15:47 [PATCH] nvme: move NVMF_OPT_CTRL_LOSS_TMO to generic list of allowed options Hannes Reinecke
@ 2021-02-05 16:25 ` Christoph Hellwig
2021-02-05 16:35 ` Hannes Reinecke
0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2021-02-05 16:25 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: linux-nvme, Christoph Hellwig, Keith Busch, Sagi Grimberg
On Fri, Feb 05, 2021 at 04:47:14PM +0100, Hannes Reinecke wrote:
> Every single fabrics driver with the exception of loop is setting
> NVMF_OPT_CTRL_LOSS_TMO, and recent nvme-cli has begun to set this
> in the default options when create a discovery controller.
> As it's not listed for loop connections to the loop controller will
> fail.
> So move it to the generic options to avoid this failure.
Well, the option doesn't really make sense for loop. I think nvme-cli
needs to be fixed to not set in this case.
_______________________________________________
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] nvme: move NVMF_OPT_CTRL_LOSS_TMO to generic list of allowed options
2021-02-05 16:25 ` Christoph Hellwig
@ 2021-02-05 16:35 ` Hannes Reinecke
2021-02-05 18:47 ` Chaitanya Kulkarni
0 siblings, 1 reply; 4+ messages in thread
From: Hannes Reinecke @ 2021-02-05 16:35 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-nvme, Sagi Grimberg, Keith Busch
On 2/5/21 5:25 PM, Christoph Hellwig wrote:
> On Fri, Feb 05, 2021 at 04:47:14PM +0100, Hannes Reinecke wrote:
>> Every single fabrics driver with the exception of loop is setting
>> NVMF_OPT_CTRL_LOSS_TMO, and recent nvme-cli has begun to set this
>> in the default options when create a discovery controller.
>> As it's not listed for loop connections to the loop controller will
>> fail.
>> So move it to the generic options to avoid this failure.
>
> Well, the option doesn't really make sense for loop. I think nvme-cli
> needs to be fixed to not set in this case.
>
Neither does NVMF_OPT_FAIL_FAST_TMO, yet there it is ...
Cheers,
Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
_______________________________________________
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] nvme: move NVMF_OPT_CTRL_LOSS_TMO to generic list of allowed options
2021-02-05 16:35 ` Hannes Reinecke
@ 2021-02-05 18:47 ` Chaitanya Kulkarni
0 siblings, 0 replies; 4+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-05 18:47 UTC (permalink / raw)
To: Hannes Reinecke
Cc: Keith Busch, Christoph Hellwig, linux-nvme@lists.infradead.org,
Sagi Grimberg
> On Feb 5, 2021, at 8:45 AM, Hannes Reinecke <hare@suse.de> wrote:
>
> On 2/5/21 5:25 PM, Christoph Hellwig wrote:
>>> On Fri, Feb 05, 2021 at 04:47:14PM +0100, Hannes Reinecke wrote:
>>> Every single fabrics driver with the exception of loop is setting
>>> NVMF_OPT_CTRL_LOSS_TMO, and recent nvme-cli has begun to set this
>>> in the default options when create a discovery controller.
>>> As it's not listed for loop connections to the loop controller will
>>> fail.
>>> So move it to the generic options to avoid this failure.
>> Well, the option doesn't really make sense for loop. I think nvme-cli
>> needs to be fixed to not set in this case.
> Neither does NVMF_OPT_FAIL_FAST_TMO, yet there it is ...
>
I have already sent a patch to fix this and we have decided to fix the issue with NVMe-cli.
> Cheers,
>
> Hannes
> --
> Dr. Hannes Reinecke Kernel Storage Architect
> hare@suse.de +49 911 74053 688
> SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
> HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
>
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme
_______________________________________________
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-02-05 18:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-05 15:47 [PATCH] nvme: move NVMF_OPT_CTRL_LOSS_TMO to generic list of allowed options Hannes Reinecke
2021-02-05 16:25 ` Christoph Hellwig
2021-02-05 16:35 ` Hannes Reinecke
2021-02-05 18:47 ` Chaitanya Kulkarni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox