s390: zfcp act enhancements.
Subsystems (2)
PATCH 10/10 s390: zfcp act enhancements.
[patch 10/10] s390: zfcp act enhancements.
From: Andreas Herrmann <[email protected]>
From: Maxim Shchetynin <[email protected]>
zfcp host adapter changes:
- Add access control enhancements.
- Add event callbacks.
Signed-off-by Martin Schwidefsky <[email protected]>
diffstat:
drivers/s390/scsi/zfcp_aux.c | 179 +++++++++++++++++++++++++++++++++--- drivers/s390/scsi/zfcp_def.h | 40 ++++++-- drivers/s390/scsi/zfcp_erp.c | 154 ++++++++++++++++++++++++++---- drivers/s390/scsi/zfcp_ext.h | 26 +++++ drivers/s390/scsi/zfcp_fsf.c | 110 ++++++++++++++++------ drivers/s390/scsi/zfcp_fsf.h | 6 - drivers/s390/scsi/zfcp_scsi.c | 5 - drivers/s390/scsi/zfcp_sysfs_port.c | 4 drivers/s390/scsi/zfcp_sysfs_unit.c | 8 - 9 files changed, 454 insertions(+), 78 deletions(-)
drivers/s390/scsi/zfcp_aux.c +167 -12
@@ -45,14 +45,6 @@static void zfcp_ns_gid_pn_handler (unsigned long );/* miscellaneous */ - -static inline int zfcp_sg_list_alloc (struct zfcp_sg_list *,size_t ); -static inline void zfcp_sg_list_free (struct zfcp_sg_list *); -static inline int zfcp_sg_list_copy_from_user (struct zfcp_sg_list *, -void __user *,size_t ); -static inline int zfcp_sg_list_copy_to_user (void __user *, -struct zfcp_sg_list *,size_t ); -static int zfcp_cfdc_dev_ioctl (struct inode *,struct file *,unsigned int ,unsigned long );
@@ -345,8 +337,11 @@if (zfcp_device_setup (device))zfcp_init_device_configure (); +init_waitqueue_head (&zfcp_callbacks.wq); + goto out; + out_ccw_register:misc_deregister (&zfcp_cfdc_misc); out_misc_register:
@@ -564,7 +559,7 @@* elements of the scatter-gather list. The maximum size of a single element * in the scatter-gather list is PAGE_SIZE. */ -static inline int +int zfcp_sg_list_alloc (struct zfcp_sg_list *sg_list,size_t size) {struct scatterlist *sg;
@@ -612,7 +607,7 @@* Memory for each element in the scatter-gather list is freed. * Finally sg_list->sg is freed itself and sg_list->count is reset. */ -static inline void +void zfcp_sg_list_free (struct zfcp_sg_list *sg_list) {struct scatterlist *sg;
@@ -657,7 +652,7 @@* @size: number of bytes to be copied * Return: 0 on success, -EFAULT if copy_from_user fails. */ -static inline int +int zfcp_sg_list_copy_from_user (struct zfcp_sg_list *sg_list,void __user *user_buffer,size_t size)
@@ -695,7 +690,7 @@* @size: number of bytes to be copied * Return: 0 on success, -EFAULT if copy_to_user fails */ -static inline int +int zfcp_sg_list_copy_to_user (void __user *user_buffer,struct zfcp_sg_list *sg_list,size_t size)
@@ -1423,6 +1418,8 @@zfcp_adapter_get (adapter); +zfcp_cb_port_add (port); +return port; }
@@ -1650,6 +1647,7 @@else zfcp_fsf_incoming_els_unknown (adapter, status_buffer); +zfcp_cb_incoming_els (adapter, status_buffer->payload); }
@@ -1976,4 +1974,161 @@return ret; } + +#undef ZFCP_LOG_AREA + +/****************************************************************/ +/******* HBA API Support related Functions *********************/ +/****************************************************************/ +#define ZFCP_LOG_AREA ZFCP_LOG_AREA_FC + +struct zfcp_callbacks zfcp_callbacks = { }; + +/** +* zfcp_register_callbacks - register callbacks for event handling in HBA API +* @callbacks: set of callback functions to be registered +*/ +void +zfcp_register_callbacks (struct zfcp_callbacks *callbacks) +{ + zfcp_callbacks.incoming_els = callbacks->incoming_els; + zfcp_callbacks.link_down = callbacks->link_down; + zfcp_callbacks.link_up = callbacks->link_up; + zfcp_callbacks.adapter_add = callbacks->adapter_add; + zfcp_callbacks.port_add = callbacks->port_add; + zfcp_callbacks.unit_add = callbacks->unit_add; +} + +/** +* zfcp_unregister_callbacks - deregister callbacks for event handling +*/ +void +zfcp_unregister_callbacks (void ) +{ + zfcp_callbacks.incoming_els =NULL ; + zfcp_callbacks.link_down =NULL ; + zfcp_callbacks.link_up =NULL ; + zfcp_callbacks.adapter_add =NULL ; + zfcp_callbacks.port_add =NULL ; + zfcp_callbacks.unit_add =NULL ; + +/* wait until all callbacks returned */ +wait_event (zfcp_callbacks.wq, +atomic_read (&zfcp_callbacks.refcount) ==0 ); +} + +/** +* zfcp_cb_incoming_els - make callback for incoming els +* @adpater: adapter where ELS was received +* @payload: received ELS payload +*/ +void +zfcp_cb_incoming_els (struct zfcp_adapter *adapter,void *payload) +{ +zfcp_cb_incoming_els_t cb; + +atomic_inc (&zfcp_callbacks.refcount); + cb = zfcp_callbacks.incoming_els; +if (cb) +cb (adapter, payload); +if (atomic_dec_return (&zfcp_callbacks.refcount) ==0 ) +wake_up (&zfcp_callbacks.wq); +} + +/** +* zfcp_cb_link_down - make callback for link down event +* @adapter: adapter where link down occurred +*/ +void +zfcp_cb_link_down (struct zfcp_adapter *adapter) +{ +zfcp_cb_link_down_t cb; +atomic_inc (&zfcp_callbacks.refcount); + cb = zfcp_callbacks.link_down; +if (cb) +cb (adapter); +if (atomic_dec_return (&zfcp_callbacks.refcount) ==0 ) +wake_up (&zfcp_callbacks.wq); +} + +/** +* zfcp_cb_link_up - make callback for link up event +* @adapter: adapter where link up occurred +*/ +void +zfcp_cb_link_up (struct zfcp_adapter *adapter) +{ +zfcp_cb_link_up_t cb; +atomic_inc (&zfcp_callbacks.refcount); + cb = zfcp_callbacks.link_up; +if (cb) +cb (adapter); +if (atomic_dec_return (&zfcp_callbacks.refcount) ==0 ) +wake_up (&zfcp_callbacks.wq); +} + +/** +* zfcp_cb_adapter_add - make callback for adapter add event +* @adapter: adapter which was added/activated +*/ +void +zfcp_cb_adapter_add (struct zfcp_adapter *adapter) +{ +zfcp_cb_adapter_add_t cb; +atomic_inc (&zfcp_callbacks.refcount); + cb = zfcp_callbacks.adapter_add; +if (cb) +cb (adapter); +if (atomic_dec_return (&zfcp_callbacks.refcount) ==0 ) +wake_up (&zfcp_callbacks.wq); +} + +/** +* zfcp_cb_port_add - make callback for port add event +* @port: port which was added +*/ +void +zfcp_cb_port_add (struct zfcp_port *port) +{ +zfcp_cb_port_add_t cb; +atomic_inc (&zfcp_callbacks.refcount); + cb = zfcp_callbacks.port_add; +if (cb) +cb (port); +if (atomic_dec_return (&zfcp_callbacks.refcount) ==0 ) +wake_up (&zfcp_callbacks.wq); +} + +/** +* zfcp_cb_unit_add - make callback for unit add event +* @unit: unit which was added +*/ +void +zfcp_cb_unit_add (struct zfcp_unit *unit) +{ +zfcp_cb_unit_add_t cb; +atomic_inc (&zfcp_callbacks.refcount); + cb = zfcp_callbacks.unit_add; +if (cb) +cb (unit); +if (atomic_dec_return (&zfcp_callbacks.refcount) ==0 ) +wake_up (&zfcp_callbacks.wq); +} +#undef ZFCP_LOG_AREA + +EXPORT_SYMBOL (zfcp_sg_list_alloc); +EXPORT_SYMBOL (zfcp_sg_list_free); +EXPORT_SYMBOL (zfcp_sg_size); +EXPORT_SYMBOL (zfcp_sg_list_copy_from_user); +EXPORT_SYMBOL (zfcp_sg_list_copy_to_user); +EXPORT_SYMBOL (zfcp_get_unit_by_lun); +EXPORT_SYMBOL (zfcp_get_port_by_wwpn); +EXPORT_SYMBOL (zfcp_get_port_by_did); +EXPORT_SYMBOL (zfcp_get_adapter_by_busid); +EXPORT_SYMBOL (zfcp_register_callbacks); +EXPORT_SYMBOL (zfcp_unregister_callbacks); +EXPORT_SYMBOL (zfcp_port_enqueue); +EXPORT_SYMBOL (zfcp_unit_enqueue); +EXPORT_SYMBOL (zfcp_unit_dequeue); +EXPORT_SYMBOL (zfcp_check_ct_response);
drivers/s390/scsi/zfcp_def.h +32 -8
@@ -490,8 +490,8 @@* Note, the leftmost status byte is common among adapter, port * and unit */ -#define ZFCP_COMMON_FLAGS 0xff000000 -#define ZFCP_SPECIFIC_FLAGS 0x00ffffff +#define ZFCP_COMMON_FLAGS 0xfff00000 +#define ZFCP_SPECIFIC_FLAGS 0x000fffff/* common status bits */ #define ZFCP_STATUS_COMMON_REMOVE 0x80000000
@@ -502,6 +502,7 @@#define ZFCP_STATUS_COMMON_OPEN 0x04000000#define ZFCP_STATUS_COMMON_CLOSING 0x02000000#define ZFCP_STATUS_COMMON_ERP_INUSE 0x01000000 +#define ZFCP_STATUS_COMMON_ACCESS_DENIED 0x00800000/* adapter status */ #define ZFCP_STATUS_ADAPTER_QDIOUP 0x00000002
@@ -540,12 +541,10 @@ ZFCP_STATUS_PORT_NO_SCSI_ID)/* logical unit status */ -#define ZFCP_STATUS_UNIT_NOTSUPPUNITRESET 0x00000001 -#define ZFCP_STATUS_UNIT_ACCESS_DENIED 0x00000002 -#define ZFCP_STATUS_UNIT_ACCESS_SHARED 0x00000004 -#define ZFCP_STATUS_UNIT_ACCESS_READONLY 0x00000008 -#define ZFCP_STATUS_UNIT_TEMPORARY 0x00000010 - +#define ZFCP_STATUS_UNIT_NOTSUPPUNITRESET 0x00000001 +#define ZFCP_STATUS_UNIT_TEMPORARY 0x00000002 +#define ZFCP_STATUS_UNIT_SHARED 0x00000004 +#define ZFCP_STATUS_UNIT_READONLY 0x00000008/* FSF request status (this does not have a common part) */ #define ZFCP_STATUS_FSFREQ_NOT_INIT 0x00000000
@@ -1119,4 +1118,29 @@ wait_event(adapter->remove_wq, atomic_read(&adapter->refcount) == 0); } + +/* +* stuff needed for callback handling +*/ + +typedef void (*zfcp_cb_incoming_els_t ) (struct zfcp_adapter *,void *); +typedef void (*zfcp_cb_link_down_t ) (struct zfcp_adapter *); +typedef void (*zfcp_cb_link_up_t ) (struct zfcp_adapter *); +typedef void (*zfcp_cb_adapter_add_t ) (struct zfcp_adapter *); +typedef void (*zfcp_cb_port_add_t ) (struct zfcp_port *); +typedef void (*zfcp_cb_unit_add_t ) (struct zfcp_unit *); + +struct zfcp_callbacks { +atomic_t refcount; +wait_queue_head_t wq; +zfcp_cb_incoming_els_t incoming_els; +zfcp_cb_link_down_t link_down; +zfcp_cb_link_up_t link_up; +zfcp_cb_adapter_add_t adapter_add; +zfcp_cb_port_add_t port_add; +zfcp_cb_unit_add_t unit_add; +}; + +extern struct zfcp_callbacks zfcp_callbacks; +#endif /* ZFCP_DEF_H */
drivers/s390/scsi/zfcp_erp.c +134 -20
207 lines not on this page · raw message
drivers/s390/scsi/zfcp_ext.h +25 -1
@@ -32,7 +32,7 @@#ifndef ZFCP_EXT_H #define ZFCP_EXT_H /* this drivers version (do not edit !!! generated and updated by cvs) */ -#define ZFCP_EXT_REVISION "$Revision: 1.58 $" +#define ZFCP_EXT_REVISION "$Revision: 1.60 $"#include "zfcp_def.h"
@@ -171,10 +171,34 @@extern int zfcp_test_link (struct zfcp_port *); +extern void zfcp_erp_port_access_denied (struct zfcp_port *); +extern void zfcp_erp_unit_access_denied (struct zfcp_unit *); +extern void zfcp_erp_adapter_access_changed (struct zfcp_adapter *); +extern void zfcp_erp_port_access_changed (struct zfcp_port *); +extern void zfcp_erp_unit_access_changed (struct zfcp_unit *); +/******************************** AUX ****************************************/ extern void zfcp_cmd_dbf_event_fsf (const char *,struct zfcp_fsf_req *,void *,int );extern void zfcp_cmd_dbf_event_scsi (const char *,struct scsi_cmnd *);extern void zfcp_in_els_dbf_event (struct zfcp_adapter *,const char *,struct fsf_status_read_buffer *,int ); +extern int zfcp_sg_list_alloc (struct zfcp_sg_list *,size_t ); +extern void zfcp_sg_list_free (struct zfcp_sg_list *); +extern int zfcp_sg_list_copy_from_user (struct zfcp_sg_list *,void __user *, +size_t ); +extern int zfcp_sg_list_copy_to_user (void __user *,struct zfcp_sg_list *, +size_t ); +extern size_t zfcp_sg_size (struct scatterlist *,unsigned int ); + +void zfcp_register_callbacks (struct zfcp_callbacks *); +void zfcp_unregister_callbacks (void ); + +extern void zfcp_cb_incoming_els (struct zfcp_adapter *,void *); +extern void zfcp_cb_link_down (struct zfcp_adapter *); +extern void zfcp_cb_link_up (struct zfcp_adapter *); +extern void zfcp_cb_adapter_add (struct zfcp_adapter *); +extern void zfcp_cb_port_add (struct zfcp_port *); +extern void zfcp_cb_unit_add (struct zfcp_unit *); +#endif /* ZFCP_EXT_H */
drivers/s390/scsi/zfcp_fsf.c +83 -27
228 lines not on this page · raw message
drivers/s390/scsi/zfcp_fsf.h +3 -3
@@ -233,9 +233,9 @@#define FSF_IOSTAT_LS_RJT 0x00000009/* open LUN access flags*/ -#define FSF_UNIT_ACCESS_OPEN_LUN_ALLOWED 0x01000000 -#define FSF_UNIT_ACCESS_EXCLUSIVE_ACCESS 0x02000000 -#define FSF_UNIT_ACCESS_OUTBOUND_TRANSFER 0x10000000 +#define FSF_UNIT_ACCESS_OPEN_LUN_ALLOWED 0x01000000 +#define FSF_UNIT_ACCESS_EXCLUSIVE 0x02000000 +#define FSF_UNIT_ACCESS_OUTBOUND_TRANSFER 0x10000000struct fsf_queue_designator ;struct fsf_status_read_buffer ;
drivers/s390/scsi/zfcp_scsi.c +4 -1
@@ -32,7 +32,7 @@#define ZFCP_LOG_AREA ZFCP_LOG_AREA_SCSI/* this drivers version (do not edit !!! generated and updated by cvs) */ -#define ZFCP_SCSI_REVISION "$Revision: 1.71 $" +#define ZFCP_SCSI_REVISION "$Revision: 1.72 $"#include "zfcp_ext.h"
@@ -948,3 +948,6 @@ };#undef ZFCP_LOG_AREA + +EXPORT_SYMBOL (zfcp_data); +EXPORT_SYMBOL (zfcp_scsi_command_sync);
drivers/s390/scsi/zfcp_sysfs_port.c +2 -2
@@ -28,7 +28,7 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define ZFCP_SYSFS_PORT_C_REVISION "$Revision: 1.46 $" +#define ZFCP_SYSFS_PORT_C_REVISION "$Revision: 1.47 $"#include "zfcp_ext.h"
@@ -71,7 +71,7 @@ZFCP_DEFINE_PORT_ATTR (in_recovery,"%d\n" ,atomic_test_mask (ZFCP_STATUS_COMMON_ERP_INUSE , &port->status));ZFCP_DEFINE_PORT_ATTR (access_denied,"%d\n" ,atomic_test_mask - (ZFCP_STATUS_PORT_ACCESS_DENIED , &port->status)); + (ZFCP_STATUS_COMMON_ACCESS_DENIED , &port->status));/** * zfcp_sysfs_unit_add_store - add a unit to sysfs tree
drivers/s390/scsi/zfcp_sysfs_unit.c +4 -4
@@ -28,7 +28,7 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define ZFCP_SYSFS_UNIT_C_REVISION "$Revision: 1.29 $" +#define ZFCP_SYSFS_UNIT_C_REVISION "$Revision: 1.30 $"#include "zfcp_ext.h"
@@ -69,11 +69,11 @@ZFCP_DEFINE_UNIT_ATTR (in_recovery,"%d\n" ,atomic_test_mask (ZFCP_STATUS_COMMON_ERP_INUSE , &unit->status));ZFCP_DEFINE_UNIT_ATTR (access_denied,"%d\n" ,atomic_test_mask - (ZFCP_STATUS_UNIT_ACCESS_DENIED , &unit->status)); + (ZFCP_STATUS_COMMON_ACCESS_DENIED , &unit->status));ZFCP_DEFINE_UNIT_ATTR (access_shared,"%d\n" ,atomic_test_mask - (ZFCP_STATUS_UNIT_ACCESS_SHARED , &unit->status)); + (ZFCP_STATUS_UNIT_SHARED , &unit->status));ZFCP_DEFINE_UNIT_ATTR (access_readonly,"%d\n" ,atomic_test_mask - (ZFCP_STATUS_UNIT_ACCESS_READONLY , &unit->status)); + (ZFCP_STATUS_UNIT_READONLY , &unit->status));/** * zfcp_sysfs_unit_failed_store - failed state of unit