nvme-cli: nvmf auto-connect scripts
cover nvme-cli: nvmf auto-connect scripts
This is a formal posting of the patches, not an RFC.
This posting is a combination of the RFC postings of nvme-fc auto-connect scripts by Hannes, Sagi, and I. The auto-connect scripts are utilized on nvme-fc and for persistent discovery controllers that send AENs. It does not contain the code that handles the persistent discovery controller AEN and generates the event.
The auto-connect scripts are now commonized with the exception of the nvme-fc boot connections service. It's expected that both the persistent discovery controllers and nvme-fc can post the same udev event. Whenever the discovery aen generates an event, the new --device=<name> argument will be used to identify the persistent discovery controller. When --device is used, the other connect attributes will be specified, set to the values of the discovery controller, and will be used by the cli to validate the device is who it should be or a new discovery controller will be created. When nvme-fc generates it's events, it will specify --device=none and specify the discovery controller addressing arguments. If a persistent discovery controller exists on nvme-fc, will do nothing special and AEN's from it will follow the --device=<name> syntax.
The udev event handler supports both the new event to be used by discovery controllers as well as the existing nvme-fc transport event. The nvme-fc transport will be migrated to issue the new event syntax. The udev script will continue to support the older style nvme-fc event info in case the cli is running against an older kernel.
Since last rfc:
Add reviewed-by's
Parsing for ctlr_list_item left as is.
Moved SYS_NVME from fabrics.c to nvme.h
Changed udev device variable to NVME_CTRL_NAME
Removed full pathname for nvme and echo in systemd service that
invokes connect-all
Moved --quiet option. Rather than include in "arguments" in
systemd service name, add directly to systemd service that invokes connect-all
Makefile:
Created install-systemd and install-dracut Make targets Changed PREFIX to /usr to match nvme.spec.in's %install target Changed LIBDIR to use PREFIX as base path
James Smart (8):
nvme-cli: ignore arguments that pass in "none"
nvme-cli: allow discover to address discovery controller by persistent
name
nvme-cli: Refactor to create a get_nvme_ctrl_info routine
nvme-cli: extend ctrl_list_item for connect attributes
nvme-cli: Add routine to compare ctrl_list_item to connect args
nvme-cli: Add routine to search for controller with specific
attributes
nvme-cli: Expand --device argument processing
nvme-cli: nvmf auto-connect scripts
Sagi Grimberg (2):
nvme-cli: support persistent connections to a discovery controller
nvme-cli: add --quiet option
Makefile | 22 ++- fabrics.c | 118 +++++++++--- fabrics.h | 2 + nvme.c | 226 +++++++++++++++++++---- nvme.h | 24 +++ nvme.spec.in | 9 + nvmf-autoconnect/70-nvmf-autoconnect.conf | 1 + nvmf-autoconnect/70-nvmf-autoconnect.rules | 18 ++ nvmf-autoconnect/nvmefc-boot-connections.service | 9 + nvmf-autoconnect/nvmf-connect.target | 2 + nvmf-autoconnect/nvmf-connect at .service | 14 ++ 11 files changed, 386 insertions(+), 59 deletions(-) create mode 100644 nvmf-autoconnect/70-nvmf-autoconnect.conf create mode 100644 nvmf-autoconnect/70-nvmf-autoconnect.rules create mode 100644 nvmf-autoconnect/nvmefc-boot-connections.service create mode 100644 nvmf-autoconnect/nvmf-connect.target create mode 100644 nvmf-autoconnect/nvmf-connect at .service
Signature · 1 line
2.13.7
PATCH 1/10 nvme-cli: ignore arguments that pass in "none"
As we want to support discovery uevents over different transports, we want to allow the kernel to provide missing information in the form of none and have nvme-cli properly ignore it.
One example is the host_traddr. If it is not set (which means that the default route determined the host address) we will want to do the same for newly discovered controllers.
So allow users to pass 'none' arguments as well.
Example:
nvme connect-all ... --hostnqn=none --hostid=none --host_traddr=none
--- fabrics.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fabrics.c +4 -4
@@ -578,7 +578,7 @@ add_argument(char **argstr, int *max_len, char *arg_str, char *arg) {int len; -if (arg) { +if (arg &&strcmp (arg,"none" )) { len =snprintf (*argstr, *max_len,",%s=%s" , arg_str, arg);if (len <0 )return -EINVAL ;
@@ -671,14 +671,14 @@ retry:return -EINVAL ; p += len; -if (cfg.hostnqn) { +if (cfg.hostnqn &&strcmp (cfg.hostnqn,"none" )) { len =sprintf (p,",hostnqn=%s" , cfg.hostnqn);if (len <0 )return -EINVAL ; p += len; } -if (cfg.hostid) { +if (cfg.hostid &&strcmp (cfg.hostid,"none" )) { len =sprintf (p,",hostid=%s" , cfg.hostid);if (len <0 )return -EINVAL ;
@@ -713,7 +713,7 @@ retry: p += len; } -if (cfg.host_traddr) { +if (cfg.host_traddr &&strcmp (cfg.host_traddr,"none" )) { len =sprintf (p,",host_traddr=%s" , cfg.host_traddr);if (len <0 )return -EINVAL ;
Signature · 1 line
2.13.7
Sagi Grimberg
maintainerPATCH 1/10 nvme-cli: ignore arguments that pass in "none"
PATCH 2/10 nvme-cli: support persistent connections to a discovery controller
In reply to James SmartFrom: Sagi Grimberg <[email protected]>
Simply don't destroy the discovery controller after getting the log pages. Note that persistent connection to a discovery subsystem require to pass in a non-zero kato value, so if not provided we simply use a default of 30 seconds kato.
Example:
nvme connect-all ... --persistent
--- fabrics.c | 15 ++++++++++++--- fabrics.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-)
fabrics.c +12 -3
@@ -66,6 +66,7 @@ static struct config {int disable_sqflow;int hdr_digest;int data_digest; +bool persistent; } cfg = { NULL };#define BUF_SIZE 4096
@@ -872,9 +873,11 @@ static int do_discover(char *argstr, bool connect)return -errno; ret =nvmf_get_log_page_discovery (dev_name, &log, &numrec, &status);free (dev_name); - err =remove_ctrl (instance); -if (err) -return err; +if (!cfg.persistent) { + err =remove_ctrl (instance); +if (err) +return err; + }switch (ret) {case DISC_OK :
@@ -957,6 +960,9 @@ static int discover_from_conf_file(const char *desc, char *argstr,if (err)continue ; +if (cfg.persistent && !cfg.keep_alive_tmo) + cfg.keep_alive_tmo =NVMF_DEF_DISC_TMO ; + err =build_options (argstr,BUF_SIZE );if (err) { ret = err;
@@ -999,6 +1005,7 @@ int discover(const char *desc, int argc, char **argv, bool connect) {"nr-write-queues", 'W', "LIST", CFG_INT, &cfg.nr_write_queues, required_argument, "number of write queues to use (default 0)" }, {"nr-poll-queues", 'P', "LIST", CFG_INT, &cfg.nr_poll_queues, required_argument, "number of poll queues to use (default 0)" }, {"queue-size", 'Q', "LIST", CFG_INT, &cfg.queue_size, required_argument, "number of io queue elements to use (default 128)" }, + {"persistent", 'p', "LIST", CFG_NONE, &cfg.persistent, no_argument, "persistent discovery connection" }, {NULL}, };
@@ -1013,6 +1020,8 @@ int discover(const char *desc, int argc, char **argv, bool connect) ret =discover_from_conf_file (desc, argstr, command_line_options, connect); }else { +if (cfg.persistent && !cfg.keep_alive_tmo) + cfg.keep_alive_tmo =NVMF_DEF_DISC_TMO ; ret =build_options (argstr,BUF_SIZE );if (ret) goto out;
fabrics.h +2 -0
@@ -1,6 +1,8 @@#ifndef _DISCOVER_H#define _DISCOVER_H +#define NVMF_DEF_DISC_TMO 30 +extern int discover (const char *desc,int argc,char **argv,bool connect);extern int connect (const char *desc,int argc,char **argv);extern int disconnect (const char *desc,int argc,char **argv);
Signature · 1 line
2.13.7
PATCH 3/10 nvme-cli: allow discover to address discovery controller by persistent name
In reply to James SmartTo support discovery (connect/connect-all) to operate against a persistent discovery controller, let the discovery controller to be specified by its device node name rather than new connection attributes.
Example:
nvme connect-all ... --device=nvme5
Also centralize extraction of controller instance from the controller name to a common helper.
--- fabrics.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-)
fabrics.c +27 -10
@@ -190,6 +190,21 @@ static const char *cms_str(__u8 cm)static int do_discover (char *argstr,bool connect); +static int ctrl_instance (char *device) +{ +char d[64 ]; +int ret, instance; + + device =basename (device); + ret =sscanf (device,"nvme%d" , &instance); +if (ret <=0 ) +return -EINVAL ; +if (snprintf (d,sizeof (d),"nvme%d" , instance) <=0 || +strcmp (device, d)) +return -EINVAL ; +return instance; +} +static int add_ctrl (const char *argstr) {substring_t args[MAX_OPT_ARGS ];
@@ -865,7 +880,10 @@ static int do_discover(char *argstr, bool connect)int instance, numrec =0 , ret, err;int status =0 ; - instance =add_ctrl (argstr); +if (!cfg.device) + instance =add_ctrl (argstr); +else + instance =ctrl_instance (cfg.device);if (instance <0 )return instance;
@@ -873,7 +891,7 @@ static int do_discover(char *argstr, bool connect)return -errno; ret =nvmf_get_log_page_discovery (dev_name, &log, &numrec, &status);free (dev_name); -if (!cfg.persistent) { +if (!cfg.device && !cfg.persistent) { err =remove_ctrl (instance);if (err)return err;
@@ -996,6 +1014,7 @@ int discover(const char *desc, int argc, char **argv, bool connect) {"hostnqn", 'q', "LIST", CFG_STRING, &cfg.hostnqn, required_argument, "user-defined hostnqn (if default not used)" }, {"hostid", 'I', "LIST", CFG_STRING, &cfg.hostid, required_argument, "user-defined hostid (if default not used)"}, {"raw", 'r', "LIST", CFG_STRING, &cfg.raw, required_argument, "raw output file" }, + {"device", 'd', "LIST", CFG_STRING, &cfg.device, required_argument, "use existing discovery controller device" }, {"keep-alive-tmo", 'k', "LIST", CFG_INT, &cfg.keep_alive_tmo, required_argument, "keep alive timeout period in seconds" }, {"reconnect-delay", 'c', "LIST", CFG_INT, &cfg.reconnect_delay, required_argument, "reconnect timeout period in seconds" }, {"ctrl-loss-tmo", 'l', "LIST", CFG_INT, &cfg.ctrl_loss_tmo, required_argument, "controller loss timeout period in seconds" },
@@ -1014,6 +1033,9 @@ int discover(const char *desc, int argc, char **argv, bool connect)if (ret) goto out; +if (cfg.device && !strcmp (cfg.device,"none" )) + cfg.device =NULL ; + cfg.nqn =NVME_DISC_SUBSYS_NAME ;if (!cfg.transport && !cfg.traddr) {
@@ -1157,15 +1179,10 @@ static int disconnect_by_nqn(char *nqn)static int disconnect_by_device (char *device) {int instance; -int ret; - - device =basename (device); - ret =sscanf (device,"nvme%d" , &instance); -if (ret <0 ) -return ret; -if (!ret) -return -1 ; + instance =ctrl_instance (device); +if (instance <0 ) +return instance;return remove_ctrl (instance); }
Signature · 1 line
2.13.7
PATCH 4/10 nvme-cli: Refactor to create a get_nvme_ctrl_info routine
In reply to James SmartIn preparation for searching controllers to match with connect args:
Refactor the get_nvme_subsystem_info() routine to take the portion that creates a ctrl_list_item and sets its values and put it in a separate get_nvme_ctrl_info() routine.
--- nvme.c | 77 ++++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 32 deletions(-)
nvme.c +45 -32
@@ -1544,10 +1544,50 @@ static void free_ctrl_list_item(struct ctrl_list_item *ctrls)free (ctrls->ana_state); } +static int get_nvme_ctrl_info (char *name,char *path, +struct ctrl_list_item *ctrl,__u32 nsid) +{ +char ctrl_path[512 ]; + + ctrl->name =strdup (name); + +snprintf (ctrl_path,sizeof (ctrl_path),"%s/%s" , path, ctrl->name); + + ctrl->address =get_nvme_ctrl_attr (ctrl_path,"address" ); +if (!ctrl->address) { +fprintf (stderr,"%s: failed to get controller address.\n" , + ctrl->name); + goto free_ctrl_items; + } + + ctrl->transport =get_nvme_ctrl_attr (ctrl_path,"transport" ); +if (!ctrl->transport) { +fprintf (stderr,"%s: failed to get controller transport.\n" , + ctrl->name); + goto free_ctrl_items; + } + + ctrl->state =get_nvme_ctrl_attr (ctrl_path,"state" ); +if (!ctrl->state) { +fprintf (stderr,"%s: failed to get controller state.\n" , + ctrl->name); + goto free_ctrl_items; + } + +if (nsid !=NVME_NSID_ALL ) + ctrl->ana_state =get_nvme_ctrl_path_ana_state (ctrl_path, nsid); + +return 0 ;/* success */ + +free_ctrl_items: +free_ctrl_list_item (ctrl); + +return 1 ;/* failure */ +} +static int get_nvme_subsystem_info (char *name,char *path,struct subsys_list_item *item,__u32 nsid) { -char ctrl_path[512 ];struct dirent **ctrls;int n, i, ret =1 , ccnt =0 ;
@@ -1574,38 +1614,11 @@ static int get_nvme_subsystem_info(char *name, char *path, item->nctrls = n;for (i =0 ; i < n; i++) { - item->ctrls[ccnt].name =strdup (ctrls[i]->d_name); - -snprintf (ctrl_path,sizeof (ctrl_path),"%s/%s" , path, - item->ctrls[ccnt].name); - - item->ctrls[ccnt].address = -get_nvme_ctrl_attr (ctrl_path,"address" ); -if (!item->ctrls[ccnt].address) { -fprintf (stderr,"failed to get controller[%d] address.\n" , i); -free_ctrl_list_item (&item->ctrls[ccnt]); -continue ; +if (get_nvme_ctrl_info (ctrls[i]->d_name, path, + &item->ctrls[ccnt], nsid)) { +fprintf (stderr,"failed to get controller[%d] info.\n" , + i); } - - item->ctrls[ccnt].transport = -get_nvme_ctrl_attr (ctrl_path,"transport" ); -if (!item->ctrls[ccnt].transport) { -fprintf (stderr,"failed to get controller[%d] transport.\n" , i); -free_ctrl_list_item (&item->ctrls[ccnt]); -continue ; - } - - item->ctrls[ccnt].state = -get_nvme_ctrl_attr (ctrl_path,"state" ); -if (!item->ctrls[ccnt].state) { -fprintf (stderr,"failed to get controller[%d] state.\n" , i); -free_ctrl_list_item (&item->ctrls[ccnt]); -continue ; - } - -if (nsid !=NVME_NSID_ALL ) - item->ctrls[ccnt].ana_state = -get_nvme_ctrl_path_ana_state (ctrl_path, nsid); ccnt++; }
Signature · 1 line
2.13.7
PATCH 5/10 nvme-cli: extend ctrl_list_item for connect attributes
In reply to James SmartIn preparation for searching controllers to match with connect args:
Extend the ctrl_list_item with elements that can be compared against connect arguments. Extend the get_nvme_ctrl_info() routine to set the fields.
subsysnqn was added as the ctrl_list_item may now be used outside of a subsystem listing.
traddr, trsvid, and host_traddr are added. Their values come from the address attribute. A new parsing routine was added that extracts the values from the address string.
The new parsing routine and supporting field names strings are declared as a global interface as a subsequent patch will call it from the fabrics routines.
--- nvme.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ nvme.h | 10 ++++++++++ 2 files changed, 82 insertions(+)
nvme.c +72 -0
@@ -1542,6 +1542,64 @@ static void free_ctrl_list_item(struct ctrl_list_item *ctrls)free (ctrls->address);free (ctrls->state);free (ctrls->ana_state); +free (ctrls->subsysnqn); +free (ctrls->traddr); +free (ctrls->trsvcid); +free (ctrls->host_traddr); +} + +static const char delim_space =' ' ; +const char *conarg_traddr ="traddr" ; +const char *conarg_trsvcid ="trsvcid" ; +const char *conarg_host_traddr ="host_traddr" ; + +/* +* parse strings with connect arguments to find a particular field. +* If field found, return string containing field value. If field +* not found, return an empty string. +*/ +char *__parse_connect_arg (char *conargs,const char delim,const char *fieldnm) +{ +char *s, *e; +size_t cnt; + +/* +* There are field name overlaps: traddr and host_traddr. +* By chance, both connect arg strings are set up to +* have traddr field followed by host_traddr field. Thus field +* name matching doesn't overlap in the searches. Technically, +* as is, the loop and delimiter checking isn't necessary. +* However, better to be prepared. +*/ +do { + s =strstr (conargs, fieldnm); +if (!s) + goto empty_field; +/* validate prior character is delimiter */ +if (s == conargs || *(s -1 ) == delim) { +/* match requires next character to be assignment */ + s +=strlen (fieldnm); +if (*s =='=' ) +/* match */ +break ; + } +/* field overlap: seek to delimiter and keep looking */ + conargs =strchr (s, delim); +if (!conargs) + goto empty_field; + conargs++;/* skip delimiter */ + }while (1 ); + s++;/* skip assignment character */ + e =strchr (s, delim); +if (e) + cnt = e - s; +else + cnt =strlen (s); + +return strndup (s, cnt); + +empty_field: +return strdup ("\0" ); } static int get_nvme_ctrl_info(char *name, char *path,
@@ -1577,6 +1635,20 @@ static int get_nvme_ctrl_info(char *name, char *path,if (nsid !=NVME_NSID_ALL ) ctrl->ana_state =get_nvme_ctrl_path_ana_state (ctrl_path, nsid); + ctrl->subsysnqn =get_nvme_ctrl_attr (ctrl_path,"subsysnqn" ); +if (!ctrl->subsysnqn) { +fprintf (stderr,"%s: failed to get controller subsysnqn.\n" , + ctrl->name); + goto free_ctrl_items; + } + + ctrl->traddr =__parse_connect_arg (ctrl->address, delim_space, + conarg_traddr); + ctrl->trsvcid =__parse_connect_arg (ctrl->address, delim_space, + conarg_trsvcid); + ctrl->host_traddr =__parse_connect_arg (ctrl->address, delim_space, + conarg_host_traddr); +return 0 ;/* success */ free_ctrl_items:
nvme.h +10 -0
@@ -160,6 +160,10 @@ struct ctrl_list_item {char *transport;char *state;char *ana_state; +char *subsysnqn; +char *traddr; +char *trsvcid; +char *host_traddr; };struct subsys_list_item {
@@ -175,6 +179,12 @@ enum { BINARY, }; +char *__parse_connect_arg (char *conargs,const char delim,const char *fieldnm); + +extern const char *conarg_traddr; +extern const char *conarg_trsvcid; +extern const char *conarg_host_traddr; +void register_extension (struct plugin *plugin);#include "argconfig.h"
Signature · 1 line
2.13.7
PATCH 5/10 nvme-cli: extend ctrl_list_item for connect attributes
Quoted 17 lines · James Smart
In preparation for searching controllers to match with connect args:
Extend the
ctrl_list_itemwith elements that can be compared against connect arguments. Extend theget_nvme_ctrl_info()routine to set the fields.subsysnqn was added as the
ctrl_list_itemmay now be used outside of a subsystem listing.traddr, trsvid, and
host_traddrare added. Their values come from the address attribute. A new parsing routine was added that extracts the values from the address string.The new parsing routine and supporting field names strings are declared as a global interface as a subsequent patch will call it from the fabrics routines.
Quoted 8 lines
Signed-off-by James Smart <jsmart2021 at gmail.com>CC Sagi Grimberg <sagi at grimberg.me>CC Hannes Reinecke <hare at suse.com>--- nvme.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ nvme.h | 10 ++++++++++ 2 files changed, 82 insertions(+)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking hare at suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah HRB 21284 (AG N?rnberg)
Sagi Grimberg
maintainerPATCH 5/10 nvme-cli: extend ctrl_list_item for connect attributes
In reply to James SmartPATCH 6/10 nvme-cli: Add routine to compare ctrl_list_item to connect args
In reply to James SmartIn preparation for searching controllers to match with connect args:
Create a new routine that receives a structure containing connect arguments and a device name. The routine will build and fill in a ctrl_list_item for the device and compare its attributes with the connect arguments. The routine returns true/false on whether they match.
Routine is defined as a global as a subsequent patch will use it from the fabrics routines.
---
from rfc to actual posting:
moved SYS_NVME from fabrics.c to nvme.h
replaced nvme_ctrl_dir with SYS_NVME
--- fabrics.c | 1 - nvme.c | 38 ++++++++++++++++++++++++++++++++++++++ nvme.h | 11 +++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-)
fabrics.c +0 -1
@@ -74,7 +74,6 @@ static struct config {#define PATH_NVMF_DISC "/etc/nvme/discovery.conf"#define PATH_NVMF_HOSTNQN "/etc/nvme/hostnqn"#define PATH_NVMF_HOSTID "/etc/nvme/hostid" -#define SYS_NVME "/sys/class/nvme"#define MAX_DISC_ARGS 10#define MAX_DISC_RETRIES 10
nvme.c +38 -0
@@ -2010,6 +2010,44 @@ static int list(int argc, char **argv, struct command *cmd, struct plugin *plugireturn nvme_status_to_errno (ret, false); } +/* +* Given a controller name, create a ctrl_list_item with its +* attributes and compare the attributes against the connect args +* given. +* Return true/false based on whether it matches +*/ +bool ctrl_matches_connectargs (char *name,struct connect_args *args) +{ +struct ctrl_list_item *ctrl; +bool found = false; + + ctrl =malloc (sizeof (*ctrl)); +if (!ctrl) { +fprintf (stderr,"Failed to allocate controller list element\n" ); +return false; + } +memset (ctrl,0 ,sizeof (*ctrl)); + +if (get_nvme_ctrl_info (name,SYS_NVME , ctrl,NVME_NSID_ALL )) + goto cleanup_exit; + +if (!strcmp (ctrl->subsysnqn, args->subsysnqn) && + !strcmp (ctrl->transport, args->transport) && + (!strcmp (ctrl->traddr, args->traddr) || + !strcmp (args->traddr,"none" )) && + (!strcmp (ctrl->trsvcid, args->trsvcid) || + !strcmp (args->trsvcid,"none" )) && + (!strcmp (ctrl->host_traddr, args->host_traddr) || + !strcmp (args->host_traddr,"none" ))) + found = true; + +cleanup_exit: +free_ctrl_list_item (ctrl); +free (ctrl); + +return found; +} +int __id_ctrl (int argc,char **argv,struct command *cmd,struct plugin *plugin,void (*vs)(__u8 *vs,struct json_object *root)) {const char *desc ="Send an Identify Controller command to " \
nvme.h +11 -0
@@ -179,6 +179,17 @@ enum { BINARY, }; +struct connect_args { +char *subsysnqn; +char *transport; +char *traddr; +char *trsvcid; +char *host_traddr; +}; + +#define SYS_NVME "/sys/class/nvme" + +bool ctrl_matches_connectargs (char *name,struct connect_args *args);char *__parse_connect_arg (char *conargs,const char delim,const char *fieldnm);extern const char *conarg_traddr;
Signature · 1 line
2.13.7
PATCH 6/10 nvme-cli: Add routine to compare ctrl_list_item to connect args
Quoted 19 lines · James Smart
In preparation for searching controllers to match with connect args:
Create a new routine that receives a structure containing connect arguments and a device name. The routine will build and fill in a
ctrl_list_itemfor the device and compare its attributes with the connect arguments. The routine returns true/false on whether they match.Routine is defined as a global as a subsequent patch will use it from the fabrics routines.
Signed-off-by James Smart <jsmart2021 at gmail.com>CC Sagi Grimberg <sagi at grimberg.me>CC Hannes Reinecke <hare at suse.com>---
from rfc to actual posting:
movedSYS_NVMEfromfabrics.ctonvme.h
replacednvme_ctrl_dirwithSYS_NVME
Quoted 6 lines
--- fabrics.c | 1 - nvme.c | 38 ++++++++++++++++++++++++++++++++++++++ nvme.h | 11 +++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking hare at suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah HRB 21284 (AG N?rnberg)
Sagi Grimberg
maintainerPATCH 6/10 nvme-cli: Add routine to compare ctrl_list_item to connect args
In reply to James SmartPATCH 7/10 nvme-cli: Add routine to search for controller with specific attributes
In reply to James SmartIn preparation for searching controllers to match with connect args:
Create a new routine find_ctrl_with_connectargs() that will search the controllers that exist in the system to find one that has attributes that match the connect arguments specified. If found, the routine returns the controller name ("nvme?"). If not found, a NULL is returned.
Routine is defined as a global as a subsequent patch will use it from the fabrics routines.
--- nvme.c | 37 +++++++++++++++++++++++++++++++++++++ nvme.h | 1 + 2 files changed, 38 insertions(+)
nvme.c +37 -0
@@ -2048,6 +2048,43 @@ cleanup_exit:return found; } +/* +* Look through the system to find an existing controller whose +* attributes match the connect arguments specified +* If found, a string containing the controller name (ex: "nvme?") +* is returned. +* If not found, a NULL is returned. +*/ +char *find_ctrl_with_connectargs (struct connect_args *args) +{ +struct dirent **devices; +char *devname =NULL ; +int i, n; + + n =scandir (nvme_ctrl_dir, &devices, scan_ctrls_filter, alphasort); +if (n <0 ) { +fprintf (stderr,"no NVMe controller(s) detected.\n" ); +return NULL ; + } + +for (i =0 ; i < n; i++) { +if (ctrl_matches_connectargs (devices[i]->d_name, args)) { + devname =strdup (devices[i]->d_name); +if (devname ==NULL ) +fprintf (stderr,"no memory for ctlr name %s\n" , + devices[i]->d_name); + goto cleanup_devices; + } + } + +cleanup_devices: +for (i =0 ; i < n; i++) +free (devices[i]); +free (devices); + +return devname; +} +int __id_ctrl (int argc,char **argv,struct command *cmd,struct plugin *plugin,void (*vs)(__u8 *vs,struct json_object *root)) {const char *desc ="Send an Identify Controller command to " \
nvme.h +1 -0
@@ -190,6 +190,7 @@ struct connect_args {#define SYS_NVME "/sys/class/nvme"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_traddr;
Signature · 1 line
2.13.7
PATCH 7/10 nvme-cli: Add routine to search for controller with specific attributes
Quoted 40 lines · James Smart
In preparation for searching controllers to match with connect args:
Create a new routine
find_ctrl_with_connectargs()that will search the controllers that exist in the system to find one that has attributes that match the connect arguments specified. If found, the routine returns the controller name ("nvme?"). If not found, a NULL is returned.Routine is defined as a global as a subsequent patch will use it from the fabrics routines.
Signed-off-by James Smart <jsmart2021 at gmail.com>Reviewed-by Sagi Grimberg <sagi at grimberg.me>Reviewed-by Hannes Reinecke <hare at suse.com>--- nvme.c | 37 +++++++++++++++++++++++++++++++++++++ nvme.h | 1 + 2 files changed, 38 insertions(+)nvme.c +14
-0@@ -2048,6 +2048,43 @@ cleanup_exit:return found; } +/* +* Look through the system to find an existing controller whose +* attributes match the connect arguments specified +* If found, a string containing the controller name (ex: "nvme?") +* is returned. +* If not found, a NULL is returned. +*/ +char *find_ctrl_with_connectargs (struct connect_args *args) +{ +struct dirent **devices; +char *devname =NULL ; +int i, n; + + n =scandir (nvme_ctrl_dir, &devices, scan_ctrls_filter, alphasort);
nvme.c cleanup_exit: · line 2074
Quoted 10 lines
nvme.c +10
-0+if (n <0 ) { +fprintf (stderr,"no NVMe controller(s) detected.\n" ); +return NULL ; + } + +for (i =0 ; i < n; i++) { +if (ctrl_matches_connectargs (devices[i]->d_name, args)) { + devname =strdup (devices[i]->d_name); +if (devname ==NULL ) + fprintf(stderr, "no memory for ctlr name %s\n",
nitpick: s/ctlr/ctrl
Maybe it can be updated when it gets merged.
Otherwise, it looks good to me.
Thanks!
Sagi Grimberg
maintainerPATCH 7/10 nvme-cli: Add routine to search for controller with specific attributes
Quoted 10 lines
nvme.c cleanup_exit: · line 2074
Quoted 6 lines
nvme.c +5
-0+for (i =0 ; i < n; i++) { +if (ctrl_matches_connectargs (devices[i]->d_name, args)) { + devname =strdup (devices[i]->d_name); +if (devname ==NULL ) + fprintf(stderr, "no memory for ctlr name %s\n",nitpick: s/ctlr/ctrl
Maybe it can be updated when it gets merged.
Yea, lets change that (either james or keith)
PATCH 7/10 nvme-cli: Add routine to search for controller with specific attributes
Quoted 7 lines · Sagi Grimberg
Quoted 7 lines
Quoted 6 lines
+??? for (i = 0; i < n; i++) {
+??????? if (ctrl_matches_connectargs(devices[i]->d_name, args)) { +??????????? devname =strdup(devices[i]->d_name); +??????????? if (devname == NULL)
+??????????????? fprintf(stderr, "no memory for ctlr name %s\n",
Quoted 5 lines
Quoted 3 lines
nitpick: s/ctlr/ctrl
Maybe it can be updated when it gets merged.
Yea, lets change that (either james or keith)
NP. I'll plan on posting a v2 with the 2 small comments resolved (this print, Hannes's order).
I've been toying with tweaking the parse routines. I'm wondering if passing the connect args string to ctrl_matches_connectargs() is better than creating a new structure to pass it. It would mean we would parse the base connect args strings perhaps multiple times, but it sure localizes the parsing to the matches routine and eliminates the new structure. Thoughts ?
-- james
PATCH 8/10 nvme-cli: Expand --device argument processing
In reply to James SmartThe 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.
--- fabrics.c | 38 ++++++++++++++++++++++++++++++++++++++ nvme.c | 2 ++ nvme.h | 2 ++ 3 files changed, 42 insertions(+)
fabrics.c +38 -0
@@ -872,6 +872,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 ;
@@ -879,6 +881,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
nvme.c +2 -0
@@ -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" ;
nvme.h +2 -0
@@ -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;
Signature · 1 line
2.13.7
PATCH 9/10 nvme-cli: add --quiet option
In reply to James SmartFrom: Sagi Grimberg <[email protected]>
Now we are going to have discovery log change events, so instead of trying to figure out which NVM subsystem ports are already connected, we let the driver do that and only suppress the failure messages.
Example:
nvme connect-all ... --quiet
This option will be used by the discovery log change corresponding udev rule.
--- fabrics.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
fabrics.c +14 -7
@@ -67,6 +67,7 @@ static struct config {int hdr_digest;int data_digest;bool persistent; +bool quiet; } cfg = { NULL };#define BUF_SIZE 4096
@@ -218,9 +219,11 @@ static int add_ctrl(const char *argstr) goto out; } -if (write (fd, argstr, len) != len) { -fprintf (stderr,"Failed to write to %s: %s\n" , -PATH_NVME_FABRICS ,strerror (errno)); + ret =write (fd, argstr, len); +if (ret != len) { +if (errno !=EALREADY || !cfg.quiet) +fprintf (stderr,"Failed to write to %s: %s\n" , +PATH_NVME_FABRICS ,strerror (errno)); ret = -errno; goto out_close; }
@@ -854,10 +857,13 @@ static int connect_ctrls(struct nvmf_disc_rsp_page_hdr *log, int numrec)/* already connected print message */ if (instance == -EALREADY ) {const char *traddr = log->entries[i].traddr; -fprintf (stderr, -"traddr=%.*s is already connected\n" , -space_strip_len (NVMF_TRADDR_SIZE , traddr), - traddr); + +if (!cfg.quiet) +fprintf (stderr, +"traddr=%.*s is already connected\n" , +space_strip_len (NVMF_TRADDR_SIZE , + traddr), + traddr);continue ; }
@@ -1062,6 +1068,7 @@ int discover(const char *desc, int argc, char **argv, bool connect) {"nr-poll-queues", 'P', "LIST", CFG_INT, &cfg.nr_poll_queues, required_argument, "number of poll queues to use (default 0)" }, {"queue-size", 'Q', "LIST", CFG_INT, &cfg.queue_size, required_argument, "number of io queue elements to use (default 128)" }, {"persistent", 'p', "LIST", CFG_NONE, &cfg.persistent, no_argument, "persistent discovery connection" }, + {"quiet", 'Q', "LIST", CFG_NONE, &cfg.quiet, no_argument, "suppress already connected errors" }, {NULL}, };
Signature · 1 line
2.13.7
PATCH 10/10 nvme-cli: nvmf auto-connect scripts
In reply to James SmartThis set of scripts is a combination of those sent by Hannes, Sagi, and I in earlier patches and RFC's.
Auto-connect operates by the nvme core layer or nvme-fc transport generating a udev event with directory-controller addressing information. The nvme core layer generates an event when a persistent discovery controller generates a Discovery Log Change Notification AEN. The nvme-fc transport generates an event when an FC rport that has a NVME Discovery controller is detected or when a FC state change event occurs for for an FC rport that has a NVME Discovery controller
The udev event is handled by a script that extracts the Discovery controller addressing information and initiates a systemd service to perform a "nvme connect-all" to the Discovery controller. The "nvme connect-all" request is not called directly from the udev handler itself as the request may take some time or stall altogether, which would block other udev event handling. By transitioning to a sytemd service, the call can take as much time as needed to complete.
The scripts consist of:
- A udev script that handles nvme core and nvme-fc udev events. The udev handler starts a nvmf-connect systemd service.
- A nvmf-connect systemd service. The service, in its instance name, is passed the connect arguments for the discovery controller. The service performs a "nvme connect-all" to the discovery controller.
- A nvmefc-boot-connections systemd service. This is a run-once service run after udev is enabled, which will replay events generated by NVME-FC devices detected during boot while udev is not yet running.
- To stop autoconnect an additional nvmefc-connect.target has been added, which will instruct systemd to cancel all outstanding autoconnect services.
Note: Although the nvme-fc subsystem is converting to use the
same nvme core layer event mechanism, the nvme-fc-specific udev event that has been in existence for a while is contained in in the script so that the utilities may run against older kernels.
---
from rfc to actual posting:
Changed udev device variable to NVME_CTRL_NAME Removed full pathname for nvme and echo in systemd service that
invokes connect-all
Moved --quiet option. Rather than include in "arguments" in
systemd service name, add directly to systemd service that invokes connect-all
Created install-systemd and install-dracut Make targets Changed PREFIX to /usr to match nvme.spec.in's %install target Changed LIBDIR to use PREFIX as base path
--- Makefile | 22 +++++++++++++++++++--- nvme.spec.in | 9 +++++++++ nvmf-autoconnect/70-nvmf-autoconnect.conf | 1 + nvmf-autoconnect/70-nvmf-autoconnect.rules | 18 ++++++++++++++++++ nvmf-autoconnect/nvmefc-boot-connections.service | 9 +++++++++ nvmf-autoconnect/nvmf-connect.target | 2 ++ nvmf-autoconnect/nvmf-connect at .service | 14 ++++++++++++++ 7 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 nvmf-autoconnect/70-nvmf-autoconnect.conf create mode 100644 nvmf-autoconnect/70-nvmf-autoconnect.rules create mode 100644 nvmf-autoconnect/nvmefc-boot-connections.service create mode 100644 nvmf-autoconnect/nvmf-connect.target create mode 100644 nvmf-autoconnect/nvmf-connect at .service
Makefile +19 -3
@@ -5,9 +5,13 @@ LIBUUID = $(shell $(LD) -o /dev/null -luuid >/dev/null 2>&1; echo $$?) NVME = nvme INSTALL ?= install DESTDIR = -PREFIX ?= /usr/local +PREFIX ?= /usr SYSCONFDIR = /etc SBINDIR = $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib +SYSTEMDDIR ?= $(LIBDIR)/systemd +UDEVDIR ?= $(LIBDIR)/udev +DRACUTDIR ?= $(LIBDIR)/dracut LIB_DEPENDS = ifeq ($(LIBUUID),0)
@@ -89,6 +93,18 @@ install-bash-completion: $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/nvme +install-systemd: + $(INSTALL) -d $(DESTDIR)$(SYSTEMDDIR)/system + $(INSTALL) -m 644 ./nvmf-autoconnect/*.service ./nvmf-autoconnect/*.target $(DESTDIR)$(SYSTEMDDIR)/system + +install-udev: + $(INSTALL) -d $(DESTDIR)$(UDEVDIR)/rules.d + $(INSTALL) -m 644 ./nvmf-autoconnect/*.rules $(DESTDIR)$(UDEVDIR)/rules.d + +install-dracut: + $(INSTALL) -d $(DESTDIR)$(DRACUTDIR)/dracut.conf.d + $(INSTALL) -m 644 ./nvmf-autoconnect/*.conf $(DESTDIR)$(DRACUTDIR)/dracut.conf.d + install-zsh-completion: $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/zsh/site-functions $(INSTALL) -m 644 -T ./completions/_nvme $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_nvme
@@ -109,7 +125,7 @@ install-etc: $(INSTALL) -m 644 -T ./etc/discovery.conf.in $(DESTDIR)$(SYSCONFDIR)/nvme/discovery.conf; \ fi -install-spec: install-bin install-man install-bash-completion install-zsh-completion install-etc +install-spec: install-bin install-man install-bash-completion install-zsh-completion install-etc install-systemd install-udev install-dracut install: install-spec install-hostparams nvme.spec: nvme.spec.in NVME-VERSION-FILE
@@ -177,7 +193,7 @@ deb-light: $(NVME) pkg nvme.control.in dpkg-deb --build nvme-$(NVME_VERSION) rpm: dist - $(RPMBUILD) -ta nvme-$(NVME_VERSION).tar.gz + $(RPMBUILD) --define '_libdir ${LIBDIR}' -ta nvme-$(NVME_VERSION).tar.gz .PHONY: default doc all clean clobber install-man install-bin install .PHONY: dist pkg dist-orig deb deb-light rpm FORCE test
nvme.spec.in +9 -0
@@ -35,6 +35,11 @@ make install-spec DESTDIR=%{buildroot} PREFIX=/usr %{_sysconfdir}/nvme/hostnqn %{_sysconfdir}/nvme/hostid %{_sysconfdir}/nvme/discovery.conf +%{_libdir}/udev/rules.d/70-nvmf-autoconnect.rules +%{_libdir}/dracut/dracut.conf.d/70-nvmf-autoconnect.conf +%{_libdir}/systemd/system/nvmf-connect at .service +%{_libdir}/systemd/system/nvmefc-boot-connections.service +%{_libdir}/systemd/system/nvmf-connect.target %clean rm -rf $RPM_BUILD_ROOT
@@ -47,6 +52,10 @@ if [ $1 -eq 1 ]; then # 1 : This package is being installed for the first time if [ ! -s %{_sysconfdir}/nvme/hostid ]; then uuidgen > %{_sysconfdir}/nvme/hostid fi + + # apply udev and systemd changes that we did + udevadm control --reload-rules && udevadm trigger + systemctl daemon-reload fi %changelog
nvmf-autoconnect/70-nvmf-autoconnect.conf new file +1 -0
@@ -0,0 +1 @@ +install_items+="/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules"
nvmf-autoconnect/70-nvmf-autoconnect.rules new file +18 -0
@@ -0,0 +1,18 @@ +# +# nvmf-autoconnect.rules: +# Handles udev events which invoke automatically scan via discovery +# controller and connect to elements in the discovery log. +# +# + +# Events from persistent discovery controllers or nvme-fc transport events +ACTION=="change", SUBSYSTEM=="nvme", ENV{NVME_EVENT}=="discovery",\ + ENV{NVME_CTRL_NAME}=="*", ENV{NVME_TRTYPE}=="*", ENV{NVME_TRADDR}=="*", \ + ENV{NVME_TRSVCID}=="*", ENV{NVME_HOST_TRADDR}=="*", \ + RUN+="/usr/bin/systemctl --no-block start nvmf-connect at --device=$env{NVME_CTRL_NAME}\t--transport=$env{NVME_TRTYPE}\t--traddr=$env{NVME_TRADDR}\t--trsvcid=$env{NVME_TRSVCID}\t--host-traddr=$env{NVME_HOST_TRADDR}.service" + +# nvme-fc transport generated events (old-style for compatibility) +ACTION=="change", SUBSYSTEM=="fc", ENV{FC_EVENT}=="nvmediscovery", \ + ENV{NVMEFC_HOST_TRADDR}=="*", ENV{NVMEFC_TRADDR}=="*", \ + RUN+="/usr/bin/systemctl --no-block start nvmf-connect at --device=none\t--transport=fc\t--traddr=$env{NVMEFC_TRADDR}\t--trsvcid=none\t--host-traddr=$env{NVMEFC_HOST_TRADDR}.service" +
nvmf-autoconnect/nvmefc-boot-connections.service new file +9 -0
@@ -0,0 +1,9 @@ +[Unit] +Description=Auto-connect to subsystems on FC-NVME devices found during boot + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "echo add > /sys/class/fc/fc_udev_device/nvme_discovery" + +[Install] +WantedBy=default.target
nvmf-autoconnect/nvmf-connect.target new file +2 -0
@@ -0,0 +1,2 @@ +[Unit] +Description=All instances of nvmf-autoconnect daemon
nvmf-autoconnect/nvmf-connect at .service new file +14 -0
@@ -0,0 +1,14 @@ +# +# Unit file used by 70-nvmf-autoconnect.rules. +# + +[Unit] +Description=NVMf auto-connect scan upon nvme discovery controller Events +After=syslog.target +PartOf=nvmf-connect.target +Requires=nvmf-connect.target + +[Service] +Type=simple +Environment="CONNECT_ARGS=%i" +ExecStart=/bin/sh -c "nvme connect-all --quiet `echo -e $CONNECT_ARGS`"
Signature · 1 line
2.13.7
Sagi Grimberg
maintainerPATCH 10/10 nvme-cli: nvmf auto-connect scripts
PATCH 10/10 nvme-cli: nvmf auto-connect scripts
In reply to James SmartQuoted 58 lines · James Smart
This set of scripts is a combination of those sent by Hannes, Sagi, and I in earlier patches and RFC's.
Auto-connect operates by the nvme core layer or nvme-fc transport generating a udev event with directory-controller addressing information. The nvme core layer generates an event when a persistent discovery controller generates a Discovery Log Change Notification AEN. The nvme-fc transport generates an event when an FC rport that has a NVME Discovery controller is detected or when a FC state change event occurs for for an FC rport that has a NVME Discovery controller
The udev event is handled by a script that extracts the Discovery controller addressing information and initiates a systemd service to perform a "nvme connect-all" to the Discovery controller. The "nvme connect-all" request is not called directly from the udev handler itself as the request may take some time or stall altogether, which would block other udev event handling. By transitioning to a sytemd service, the call can take as much time as needed to complete.
The scripts consist of:
- A udev script that handles nvme core and nvme-fc udev events. The udev handler starts a nvmf-connect systemd service.
- A nvmf-connect systemd service. The service, in its instance name, is passed the connect arguments for the discovery controller. The service performs a "nvme connect-all" to the discovery controller.
- A nvmefc-boot-connections systemd service. This is a run-once service run after udev is enabled, which will replay events generated by NVME-FC devices detected during boot while udev is not yet running.
- To stop autoconnect an additional nvmefc-connect.target has been added, which will instruct systemd to cancel all outstanding autoconnect services.Note: Although the nvme-fc subsystem is converting to use the
same nvme core layer event mechanism, the nvme-fc-specific udev event that has been in existence for a while is contained in in the script so that the utilities may run against older kernels.Signed-off-by James Smart <jsmart2021 at gmail.com>CC Simon Schricker <sschricker at suse.com>CC Hannes Reinecke <hare at suse.com>CC Sagi Grimberg <sagi at grimberg.me>---
from rfc to actual posting:
Changed udev device variable toNVME_CTRL_NAMERemoved full pathname for nvme and echo in systemd service that
invokes connect-all
Moved --quiet option. Rather than include in "arguments" in
systemd service name, add directly to systemd service that invokes connect-all
Created install-systemd and install-dracut Make targets Changed PREFIX to /usr to match nvme.spec.in's %install target Changed LIBDIR to use PREFIX as base path
Quoted 15 lines
--- Makefile | 22 +++++++++++++++++++--- nvme.spec.in | 9 +++++++++ nvmf-autoconnect/70-nvmf-autoconnect.conf | 1 + nvmf-autoconnect/70-nvmf-autoconnect.rules | 18 ++++++++++++++++++ nvmf-autoconnect/nvmefc-boot-connections.service | 9 +++++++++ nvmf-autoconnect/nvmf-connect.target | 2 ++ nvmf-autoconnect/nvmf-connect at .service | 14 ++++++++++++++ 7 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 nvmf-autoconnect/70-nvmf-autoconnect.conf create mode 100644 nvmf-autoconnect/70-nvmf-autoconnect.rules create mode 100644 nvmf-autoconnect/nvmefc-boot-connections.service create mode 100644 nvmf-autoconnect/nvmf-connect.target create mode 100644 nvmf-autoconnect/nvmf-connect at .service
The install sequence is slightly odd, but not enough to complain. (udevadm trigger before systemd daemon-reload? I'd rather do it the other way round. Anyway.)
So:
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking hare at suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah HRB 21284 (AG N?rnberg)
Sagi Grimberg
maintainerPATCH 10/10 nvme-cli: nvmf auto-connect scripts
Quoted 2 lines
The install sequence is slightly odd, but not enough to complain.
Whats odd the udevadm vs. systemctl?
Quoted 2 lines
(udevadm trigger before systemd daemon-reload? I'd rather do it the other way round. Anyway.)
Why? just out of curiosity?
PATCH 10/10 nvme-cli: nvmf auto-connect scripts
Quoted 9 lines · Sagi Grimberg
Quoted 2 lines
The install sequence is slightly odd, but not enough to complain.
Whats odd the udevadm vs. systemctl?
Quoted 2 lines
(udevadm trigger before systemd daemon-reload? I'd rather do it the other way round. Anyway.)
Why? just out of curiosity?
I assume it's - if you load udev first, it can trigger systemd services that don't exit yet. Thus cleaner to have systemd setup then udev enabled to call it.
-- james
PATCH 10/10 nvme-cli: nvmf auto-connect scripts
Quoted 6 lines · James Smart
Quoted 5 lines · Sagi Grimberg
Quoted 2 lines
The install sequence is slightly odd, but not enough to complain.
Whats odd the udevadm vs. systemctl?
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
(udevadm trigger before systemd daemon-reload? I'd rather do it the other way round. Anyway.)
Why? just out of curiosity?
I assume it's - if you load udev first, it can trigger systemd services that don't exit yet. Thus cleaner to have systemd setup then udev enabled to call it.
Precisely.
Either udevadm trigger will already bring up the namespaces, but then the call to systemctl is pointless.
Or the call to systemctl is required, but then the udevadm trigger will draw a blank.
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking hare at suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah HRB 21284 (AG N?rnberg)