nvme/fc: add 'discovery' sysfs attribute to fc transport device
Subsystems (2)
PATCH v2 1/1 nvme/fc: add 'discovery' sysfs attribute to fc transport device
The fc transport device should allow for a rediscovery, as userspace might have lost the events.
So add a sysfs entry 'discovery' to trigger the discover uevents.
With this patch one can add a simple udev rule like:
# cat /usr/lib/udev/rules.d/65-nvme-fc-autoconnect.rules
SUBSYSTEM!="block, GOTO="nvme_autoconnect_end"
ACTION!="add|change", GOTO="nvme_autoconnect_end"
ENV{FC_EVENT}!="nvmediscovery", GOTO="nvme_autoconnect_end"
ENV{NVMEFC_HOST_TRADDR}!="?*", GOTO="nvme_autoconnect_end"
ENV{NVMEFC_TRADDR}!="?*", GOTO="nvme_autoconnect_end"
RUN+="/usr/sbin/nvme connect-all -t fc --host-traddr=$env{NVMEFC_HOST_TRADDR} -a $env{NVMEFC_TRADDR}"
LABEL="nvme_autoconnect_end"to facilitate autoconnect.
--- drivers/nvme/host/fc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 9 deletions(-)
drivers/nvme/host/fc.c +66 -9
@@ -134,6 +134,7 @@ struct nvme_fc_rport {struct list_head endp_list;/* for lport->endp_list */ struct list_head ctrl_list;struct list_head ls_req_list; +struct list_head disc_list;struct device *dev;/* physical device for dma */ struct nvme_fc_lport *lport;spinlock_t lock;
@@ -227,7 +228,6 @@ struct nvme_fc_ctrl {* These items are short-term. They will eventually be moved into * a generic FC class. See comments in module init. */ -static struct class *fc_class;static struct device *fc_udev_device;
@@ -710,6 +710,7 @@ static void __nvme_fc_delete_hw_queue(struct nvme_fc_ctrl *,INIT_LIST_HEAD (&newrec->endp_list);INIT_LIST_HEAD (&newrec->ctrl_list);INIT_LIST_HEAD (&newrec->ls_req_list); +INIT_LIST_HEAD (&newrec->disc_list);kref_init (&newrec->ref);atomic_set (&newrec->act_ctrl_cnt,0 );spin_lock_init (&newrec->lock);
@@ -3457,6 +3458,63 @@ struct nvmet_fc_traddr { .create_ctrl = nvme_fc_create_ctrl, }; +static ssize_t nvme_fc_discovery_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +unsigned long flags; +LIST_HEAD (nvme_fc_disc_list); +struct nvme_fc_lport *lport; +struct nvme_fc_rport *rport, *tmp_rport; + +spin_lock_irqsave (&nvme_fc_lock, flags); +list_for_each_entry (lport, &nvme_fc_lport_list, port_list) { +list_for_each_entry (rport, &lport->endp_list, endp_list) { +if (!nvme_fc_lport_get (lport)) +continue ; +if (!nvme_fc_rport_get (rport)) +continue ; +if (list_empty (&rport->disc_list)) +list_add_tail (&rport->disc_list, + &nvme_fc_disc_list); + } + } +spin_unlock_irqrestore (&nvme_fc_lock, flags); + +list_for_each_entry_safe (rport, tmp_rport, + &nvme_fc_disc_list, disc_list) { +spin_lock_irqsave (&nvme_fc_lock, flags); +list_del_init (&rport->disc_list); +spin_unlock_irqrestore (&nvme_fc_lock, flags); + lport = rport->lport; +nvme_fc_signal_discovery_scan (lport, rport); +nvme_fc_rport_put (rport); +nvme_fc_lport_put (lport); + } +return count; +} +static DEVICE_ATTR(discovery, S_IWUSR, NULL, nvme_fc_discovery_store); + +static struct attribute *nvme_fc_attrs[] = { + &dev_attr_discovery.attr, +NULL +}; + +static struct attribute_group nvme_fc_attr_group = { + .attrs = nvme_fc_attrs, +}; + +static const struct attribute_group *nvme_fc_attr_groups[] = { + &nvme_fc_attr_group, +NULL +}; + +static struct class fc_class = { + .name ="fc" , + .dev_groups = nvme_fc_attr_groups, + .owner =THIS_MODULE , +}; +static int __init nvme_fc_init_module (void ) {int ret;
@@ -3479,17 +3537,16 @@ static int __init nvme_fc_init_module(void)* put in place, this code will move to a more generic * location for the class. */ - fc_class =class_create (THIS_MODULE ,"fc" ); -if (IS_ERR (fc_class)) { + ret =class_register (&fc_class); +if (ret) {pr_err ("couldn't register class fc\n" ); - ret =PTR_ERR (fc_class); goto out_destory_workqueue; }/* * Create a device for the FC-centric udev events */ - fc_udev_device =device_create (fc_class,NULL ,MKDEV (0 ,0 ),NULL , + fc_udev_device =device_create (&fc_class,NULL ,MKDEV (0 ,0 ),NULL ,"fc_udev_device" );if (IS_ERR (fc_udev_device)) {pr_err ("couldn't create fc_udev device!\n" );
@@ -3504,9 +3561,9 @@ static int __init nvme_fc_init_module(void)return 0 ; out_destroy_device: -device_destroy (fc_class,MKDEV (0 ,0 )); +device_destroy (&fc_class,MKDEV (0 ,0 )); out_destroy_class: -class_destroy (fc_class); +class_unregister (&fc_class); out_destory_workqueue:destroy_workqueue (nvme_fc_wq);return ret;
@@ -3525,8 +3582,8 @@ static void __exit nvme_fc_exit_module(void)ida_destroy (&nvme_fc_local_port_cnt);ida_destroy (&nvme_fc_ctrl_cnt); -device_destroy (fc_class,MKDEV (0 ,0 )); -class_destroy (fc_class); +device_destroy (&fc_class,MKDEV (0 ,0 )); +class_unregister (&fc_class); }module_init (nvme_fc_init_module);
Signature · 1 line
1.8.5.6
PATCH v2 1/1 nvme/fc: add 'discovery' sysfs attribute to fc transport device
drivers/nvme/host/fc.c struct nvmet_fc_traddr { · line 3476
Quoted 7 lines · Hannes Reinecke
drivers/nvme/host/fc.c +7
-0+spin_lock_irqsave (&nvme_fc_lock, flags); +list_for_each_entry (lport, &nvme_fc_lport_list, port_list) { +list_for_each_entry (rport, &lport->endp_list, endp_list) { +if (!nvme_fc_lport_get (lport)) +continue ; +if (!nvme_fc_rport_get (rport)) +continue ;
ref counting messed up if rport_get fails - need to back out the lport get.
-- james
PATCH v2 1/1 nvme/fc: add 'discovery' sysfs attribute to fc transport device
Quoted 11 lines · James Smart
Quoted 7 lines · Hannes Reinecke
+???
spin_lock_irqsave(&nvme_fc_lock, flags);
+???list_for_each_entry(lport, &nvme_fc_lport_list, port_list){ +???????list_for_each_entry(rport, &lport->endp_list, endp_list){ +??????????? if (!nvme_fc_lport_get(lport)) +??????????????? continue;
+??????????? if (!nvme_fc_rport_get(rport)) +??????????????? continue;ref counting messed up if
rport_getfails - need to back out the lport get.
Bah. Correct.
Will be sending a new version.
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: F. Imend?rffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG N?rnberg)