Skip to contentSkip to conversation

nvme-fabrics: Ignore nr_io_queues option for discovery controllers

PATCH New Roland Dreier 4 participants 4 messages Mar 5, 2018 – Mar 8, 2018 NVMe

lore
Share & tools
lore

Roland Dreier

author
#0 lore raw

PATCH v2 1/1 nvme-fabrics: Ignore nr_io_queues option for discovery controllers

From: Roland Dreier <[email protected]>

This removes a dependency on the order options are passed when creating a fabrics controller. With the old code, if "nr_io_queues" appears before an "nqn" option specifying the discovery controller, then nr_io_queues is overridden with zero. If "nr_io_queues" appears after specifying the discovery controller, then the nr_io_queues option is used to set the number of queues, and the driver attempts to establish IO connections to the discovery controller (which doesn't work).

It seems better to ignore (and warn about) the "nr_io_queues" option if userspace has already asked to connect to the discovery controller.

Signed-off-by Roland Dreier <roland at purestorage.com>
---
 drivers/nvme/host/fabrics.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/nvme/host/fabrics.c +5 -0
index 5dd4ceefed8f..6ec6b13fa582 100644
@@ -650,6 +650,11 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
 				ret = -EINVAL;
 				goto out;
 			}
+			if (opts->discovery_nqn) {
+				pr_debug("Ignoring nr_io_queues value for discovery controller\n");
+				break;
+			}
+
 			opts->nr_io_queues = min_t(unsigned int,
 					num_online_cpus(), token);
 			break;
Signature · 1 line
2.15.1
#1 lore raw

PATCH v2 1/1 nvme-fabrics: Ignore nr_io_queues option for discovery controllers

Quoted 24 lines · Roland Dreier

From: Roland Dreier <roland at purestorage.com>

This removes a dependency on the order options are passed when creating a fabrics controller. With the old code, if "nr_io_queues" appears before an "nqn" option specifying the discovery controller, then nr_io_queues is overridden with zero. If "nr_io_queues" appears after specifying the discovery controller, then the nr_io_queues option is used to set the number of queues, and the driver attempts to establish IO connections to the discovery controller (which doesn't work).

It seems better to ignore (and warn about) the "nr_io_queues" option if userspace has already asked to connect to the discovery controller.

Signed-off-by Roland Dreier <roland at purestorage.com>
---
  drivers/nvme/host/fabrics.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/nvme/host/fabrics.c +0 -0
index 5dd4ceefed8f..6ec6b13fa582 100644
@@ -650,6 +650,11 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
  				ret = -EINVAL;

drivers/nvme/host/fabrics.c static int nvmf_parse_options(struct nvmf_ctrl_options *opts, · line 660

Quoted 10 lines
drivers/nvme/host/fabrics.c +5 -0
  				goto out;
  			}
+			if (opts->discovery_nqn) {
+				pr_debug("Ignoring nr_io_queues value for discovery controller\n");
+				break;
+			}
+
  			opts->nr_io_queues = min_t(unsigned int,
  					num_online_cpus(), token);
  			break;
Reviewed-by James Smart <james.smart at broadcom.com>

-- james

Applied
#3 lore raw

PATCH v2 1/1 nvme-fabrics: Ignore nr_io_queues option for discovery controllers

Thanks, applied.