nvme-cli: Expand --device argument processing

The connect-all --device argument was used to specify a specific device
to be used as the discovery controller. The device is typically a
long-lived discovery controller that posted a discovery event.
No attempt was made to ensure the device is who it is supposed to be
before using it.

Revised the code to use the other arguments in the connect-all request
to validate that the device is the entity that was expected. If the
device doesn't match, the cli will look for an existing matching device
in the system (should be a discovery controller due to nqn) with the
same connect parameters and use it.  If one is not found on the system,
a new discovery controller will be created for the connect-all request.

The revision uses new routines to parse the connect arguments given
in the argstr parameter. As a couple of new fieldnames are needed, the
parse routine constants were expanded for them.

The revision uses the new routines to match the specified device vs
it's attributes as well as the search routine that looks for a device
with the connect arguments.

Signed-off-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>

diff --git a/fabrics.c b/fabrics.c
index a0c433c2df1a04acee738a8c43fa7a9700d37d0d..f1a5ad2efe67e86ce90dd745ebb6ccdf4f3dea20 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -876,6 +876,8 @@ static int connect_ctrls(struct nvmf_disc_rsp_page_hdr *log, int numrec)
        return ret;
 }
 
+static const char delim_comma  = ',';
+
 static int do_discover(char *argstr, bool connect)
 {
        struct nvmf_disc_rsp_page_hdr *log = NULL;
@@ -883,6 +885,42 @@ static int do_discover(char *argstr, bool connect)
        int instance, numrec = 0, ret, err;
        int status = 0;
 
+       if (cfg.device) {
+               struct connect_args cargs;
+
+               memset(&cargs, 0, sizeof(cargs));
+               cargs.subsysnqn = __parse_connect_arg(argstr, delim_comma,
+                                               conarg_nqn);
+               cargs.transport = __parse_connect_arg(argstr, delim_comma,
+                                               conarg_transport);
+               cargs.traddr = __parse_connect_arg(argstr, delim_comma,
+                                               conarg_traddr);
+               cargs.trsvcid = __parse_connect_arg(argstr, delim_comma,
+                                               conarg_trsvcid);
+               cargs.host_traddr = __parse_connect_arg(argstr, delim_comma,
+                                               conarg_host_traddr);
+
+               /*
+                * if the cfg.device passed in matches the connect args
+                *    cfg.device is left as-is
+                * else if there exists a controller that matches the
+                *         connect args
+                *    cfg.device is the matching ctrl name
+                * else if no ctrl matches the connect args
+                *    cfg.device is set to null. This will attempt to
+                *    create a new ctrl.
+                * endif
+                */
+               if (!ctrl_matches_connectargs(cfg.device, &cargs))
+                       cfg.device = find_ctrl_with_connectargs(&cargs);
+
+               free(cargs.subsysnqn);
+               free(cargs.transport);
+               free(cargs.traddr);
+               free(cargs.trsvcid);
+               free(cargs.host_traddr);
+       }
+
        if (!cfg.device)
                instance = add_ctrl(argstr);
        else

diff --git a/nvme.c b/nvme.c
index eb106c06845b718b78ec131ee72804fb77b9c0cf..b266c837e395ece1bb525edb95aaf4d523b2413c 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -1549,6 +1549,8 @@ static void free_ctrl_list_item(struct ctrl_list_item *ctrls)
 }
 
 static const char delim_space  = ' ';
+const char *conarg_nqn = "nqn";
+const char *conarg_transport = "transport";
 const char *conarg_traddr = "traddr";
 const char *conarg_trsvcid = "trsvcid";
 const char *conarg_host_traddr = "host_traddr";

diff --git a/nvme.h b/nvme.h
index b91a22cf89b545dc14e80477f5c96bf76ffe4c1a..e630b1036c2c6dd647eb72e6e8446cbfeb42feaa 100644 (file)
--- a/nvme.h
+++ b/nvme.h
@@ -193,6 +193,8 @@ bool ctrl_matches_connectargs(char *name, struct connect_args *args);
 char *find_ctrl_with_connectargs(struct connect_args *args);
 char *__parse_connect_arg(char *conargs, const char delim, const char *fieldnm);
 
+extern const char *conarg_nqn;
+extern const char *conarg_transport;
 extern const char *conarg_traddr;
 extern const char *conarg_trsvcid;
 extern const char *conarg_host_traddr;