mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-23 05:31:28 +00:00
had the wrong version of 22-lport-notify. This corrects that. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2845 d57e44dd-8a1f-0410-8b47-8ef2f437770f
168 lines
5.5 KiB
Plaintext
168 lines
5.5 KiB
Plaintext
libfc: add hook to notify providers of local port changes
|
|
|
|
When an SCST provider is registered, it needs to know what
|
|
local ports are available for configuration as targets.
|
|
|
|
Add a notifier chain that is invoked when any local port
|
|
that is added or deleted.
|
|
|
|
Maintain a global list of local ports and add an
|
|
interator function that calls a given function for
|
|
every existing local port. This is used when first
|
|
loading a provider.
|
|
|
|
Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
|
|
|
|
---
|
|
drivers/scsi/libfc/fc_libfc.c | 41 +++++++++++++++++++++++++++++++++++++++++
|
|
drivers/scsi/libfc/fc_libfc.h | 2 ++
|
|
drivers/scsi/libfc/fc_lport.c | 2 ++
|
|
include/scsi/libfc.h | 14 +++++++++++++-
|
|
4 files changed, 58 insertions(+), 1 deletions(-)
|
|
|
|
|
|
---
|
|
diff --git a/drivers/scsi/libfc/fc_libfc.c b/drivers/scsi/libfc/fc_libfc.c
|
|
index ae3abef..753b7a8 100644
|
|
--- a/drivers/scsi/libfc/fc_libfc.c
|
|
+++ b/drivers/scsi/libfc/fc_libfc.c
|
|
@@ -36,6 +36,10 @@ module_param_named(debug_logging, fc_debug_logging, int, S_IRUGO|S_IWUSR);
|
|
MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");
|
|
|
|
DEFINE_MUTEX(fc_prov_mutex);
|
|
+static LIST_HEAD(fc_local_ports);
|
|
+struct blocking_notifier_head fc_lport_notifier_head =
|
|
+ BLOCKING_NOTIFIER_INIT(fc_lport_notifier_head);
|
|
+EXPORT_SYMBOL(fc_lport_notifier_head);
|
|
|
|
/*
|
|
* Providers which primarily send requests and PRLIs.
|
|
@@ -151,6 +155,17 @@ u32 fc_copy_buffer_to_sglist(void *buf, size_t len,
|
|
return copy_len;
|
|
}
|
|
|
|
+void fc_lport_iterate(void (*notify)(struct fc_lport *, void *), void *arg)
|
|
+{
|
|
+ struct fc_lport *lport;
|
|
+
|
|
+ mutex_lock(&fc_prov_mutex);
|
|
+ list_for_each_entry(lport, &fc_local_ports, lport_list)
|
|
+ notify(lport, arg);
|
|
+ mutex_unlock(&fc_prov_mutex);
|
|
+}
|
|
+EXPORT_SYMBOL(fc_lport_iterate);
|
|
+
|
|
/**
|
|
* fc_fill_hdr() - fill FC header fields based on request
|
|
* @fp: reply frame containing header to be filled in
|
|
@@ -270,3 +285,29 @@ void fc_fc4_deregister_provider(enum fc_fh_type type, struct fc4_prov *prov)
|
|
synchronize_rcu();
|
|
}
|
|
EXPORT_SYMBOL(fc_fc4_deregister_provider);
|
|
+
|
|
+/**
|
|
+ * fc_fc4_add_lport() - add new local port to list and run notifiers.
|
|
+ * @lport: The new local port.
|
|
+ */
|
|
+void fc_fc4_add_lport(struct fc_lport *lport)
|
|
+{
|
|
+ mutex_lock(&fc_prov_mutex);
|
|
+ list_add_tail(&lport->lport_list, &fc_local_ports);
|
|
+ blocking_notifier_call_chain(&fc_lport_notifier_head,
|
|
+ FC_LPORT_EV_ADD, lport);
|
|
+ mutex_unlock(&fc_prov_mutex);
|
|
+}
|
|
+
|
|
+/**
|
|
+ * fc_fc4_del_lport() - remove local port from list and run notifiers.
|
|
+ * @lport: The new local port.
|
|
+ */
|
|
+void fc_fc4_del_lport(struct fc_lport *lport)
|
|
+{
|
|
+ mutex_lock(&fc_prov_mutex);
|
|
+ list_del(&lport->lport_list);
|
|
+ blocking_notifier_call_chain(&fc_lport_notifier_head,
|
|
+ FC_LPORT_EV_DEL, lport);
|
|
+ mutex_unlock(&fc_prov_mutex);
|
|
+}
|
|
diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h
|
|
index a01b80d..a980482 100644
|
|
--- a/drivers/scsi/libfc/fc_libfc.h
|
|
+++ b/drivers/scsi/libfc/fc_libfc.h
|
|
@@ -111,6 +111,8 @@ void fc_destroy_fcp(void);
|
|
* Internal libfc functions
|
|
*/
|
|
const char *fc_els_resp_type(struct fc_frame *);
|
|
+extern void fc_fc4_add_lport(struct fc_lport *);
|
|
+extern void fc_fc4_del_lport(struct fc_lport *);
|
|
|
|
/*
|
|
* Copies a buffer into an sg list
|
|
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
|
|
index eec9d31..e2311f0 100644
|
|
--- a/drivers/scsi/libfc/fc_lport.c
|
|
+++ b/drivers/scsi/libfc/fc_lport.c
|
|
@@ -629,6 +629,7 @@ int fc_lport_destroy(struct fc_lport *lport)
|
|
lport->tt.fcp_abort_io(lport);
|
|
lport->tt.disc_stop_final(lport);
|
|
lport->tt.exch_mgr_reset(lport, 0, 0);
|
|
+ fc_fc4_del_lport(lport);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(fc_lport_destroy);
|
|
@@ -1628,6 +1629,7 @@ int fc_lport_init(struct fc_lport *lport)
|
|
fc_host_supported_speeds(lport->host) |= FC_PORTSPEED_1GBIT;
|
|
if (lport->link_supported_speeds & FC_PORTSPEED_10GBIT)
|
|
fc_host_supported_speeds(lport->host) |= FC_PORTSPEED_10GBIT;
|
|
+ fc_fc4_add_lport(lport);
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
|
|
index 769d480..af8a6e8 100644
|
|
--- a/include/scsi/libfc.h
|
|
+++ b/include/scsi/libfc.h
|
|
@@ -765,6 +765,15 @@ struct fc_disc {
|
|
enum fc_disc_event);
|
|
};
|
|
|
|
+/*
|
|
+ * Local port notifier and events.
|
|
+ */
|
|
+extern struct blocking_notifier_head fc_lport_notifier_head;
|
|
+enum fc_lport_event {
|
|
+ FC_LPORT_EV_ADD,
|
|
+ FC_LPORT_EV_DEL,
|
|
+};
|
|
+
|
|
/**
|
|
* struct fc_lport - Local port
|
|
* @host: The SCSI host associated with a local port
|
|
@@ -805,8 +814,9 @@ struct fc_disc {
|
|
* @lso_max: The maximum large offload send size
|
|
* @fcts: FC-4 type mask
|
|
* @lp_mutex: Mutex to protect the local port
|
|
- * @list: Handle for list of local ports
|
|
+ * @list: Linkage on list of vport peers
|
|
* @retry_work: Handle to local port for delayed retry context
|
|
+ * @lport_list: Linkage on module-wide list of local ports
|
|
* @prov: Pointers available for use by passive FC-4 providers
|
|
*/
|
|
struct fc_lport {
|
|
@@ -863,6 +873,7 @@ struct fc_lport {
|
|
struct mutex lp_mutex;
|
|
struct list_head list;
|
|
struct delayed_work retry_work;
|
|
+ struct list_head lport_list;
|
|
void *prov[FC_FC4_PROV_SIZE];
|
|
};
|
|
|
|
@@ -1018,6 +1029,7 @@ struct fc_lport *libfc_vport_create(struct fc_vport *, int privsize);
|
|
struct fc_lport *fc_vport_id_lookup(struct fc_lport *, u32 port_id);
|
|
int fc_lport_bsg_request(struct fc_bsg_job *);
|
|
void fc_lport_set_local_id(struct fc_lport *, u32 port_id);
|
|
+void fc_lport_iterate(void (*func)(struct fc_lport *, void *), void *);
|
|
|
|
/*
|
|
* REMOTE PORT LAYER
|