: Convert layout to use generic configfs struct config_item_types WIP
Subsystems (3)
PATCH 2/3 : Convert layout to use generic configfs struct config_item_types WIP
From: Nicholas Bellinger <[email protected]>
This patch converts the iSCSI target fabric module configfs code in iscsi_target_configfs.c to use the new generic configfs infrastructure provied in target_core_fabric_configfs.c. With this patch iscsi_target_configfs.c no longer defines it's own static struct config_item_type's, and uses the generic 'cits' hanging off struct target_fabric_configfs->tf_cit_tmpl. The following changes in iscsi_target_register_configfs() shows the adapted fabric API functions, and how local static attribute structures are setup to hang off the generic fabric cits.
/*
* Setup function pointers for generic logic in target_core_fabric_configfs.c
*/
fabric->tf_ops.fabric_make_wwn = &lio_target_call_coreaddtiqn;
fabric->tf_ops.fabric_drop_wwn = &lio_target_call_coredeltiqn;
fabric->tf_ops.fabric_make_tpg = &lio_target_tiqn_addtpg;
fabric->tf_ops.fabric_drop_tpg = &lio_target_tiqn_deltpg;
fabric->tf_ops.fabric_post_link = NULL;
fabric->tf_ops.fabric_pre_unlink = NULL;
fabric->tf_ops.fabric_make_np = &lio_target_call_addnptotpg;
fabric->tf_ops.fabric_drop_np = &lio_target_call_delnpfromtpg;
/*
* Setup default attribute lists for various fabric->tf_cit_tmpl
* sturct config_item_type's
*/
TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = lio_target_wwn_attrs;
TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = lio_target_tpg_attrs;
TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = lio_target_tpg_attrib_attrs;
TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = lio_target_tpg_param_attrs;
TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = lio_target_portal_attrs;So far with iscsi_target_mod, everything aside from /sys/kernel/config/target/iscsi/$TIQN/tpgt_$TPGT/acls/ has been converted to use struct target_fabric_configfs->tf_cit_tmpl and generic attribute CONFIGFS_EATTR() macros from include/target/target_core_fabric_configfs.h.
The remaining code for NodeACL and MappedLUN struct config_item_type's in iscsi_target_configfs.c will be made generic and moved to target_core_fabric_configfs.c.
--- drivers/target/lio-target/iscsi_target.c | 4 +- drivers/target/lio-target/iscsi_target_configfs.c | 1010 +++------------------ drivers/target/lio-target/iscsi_target_core.h | 15 +- drivers/target/lio-target/iscsi_target_erl0.c | 4 +- drivers/target/lio-target/iscsi_target_login.c | 10 +- drivers/target/lio-target/iscsi_target_nego.c | 2 +- drivers/target/lio-target/iscsi_target_tpg.c | 39 +- drivers/target/lio-target/iscsi_target_version.h | 2 +- 8 files changed, 166 insertions(+), 920 deletions(-)
drivers/target/lio-target/iscsi_target.c +2 -2
@@ -5123,7 +5123,7 @@ int iscsi_close_connection(int iscsi_close_session (iscsi_session_t *sess) {iscsi_portal_group_t *tpg =ISCSI_TPG_S (sess); -se_portal_group_t *se_tpg = tpg->tpg_se_tpg; +se_portal_group_t *se_tpg = &tpg->tpg_se_tpg;if (atomic_read (&sess->nconn)) { printk(KERN_ERR "%d connection(s) still exist for iSCSI session"
@@ -5435,7 +5435,7 @@ void iscsi_stop_session(int iscsi_release_sessions_for_tpg (iscsi_portal_group_t *tpg,int force) {iscsi_session_t *sess; -se_portal_group_t *se_tpg = tpg->tpg_se_tpg; +se_portal_group_t *se_tpg = &tpg->tpg_se_tpg;se_session_t *se_sess, *se_sess_tmp;int session_count =0 ;
drivers/target/lio-target/iscsi_target_configfs.c +133 -877
1,336 lines not on this page · raw message
drivers/target/lio-target/iscsi_target_core.h +6 -9
@@ -8,6 +8,8 @@#include <iscsi_linux_defs.h> #include <iscsi_target_version.h> /* get version definition */ +#include <target/target_core_base.h> +#define SHUTDOWN_SIGS (sigmask(SIGKILL)|sigmask(SIGINT)|sigmask(SIGABRT))#define ISCSI_MISC_IOVECS 5#define ISCSI_MAX_DATASN_MISSING_COUNT 16
@@ -771,7 +773,6 @@ typedef struct iscsi_tpg_attrib_s {u32 prod_mode_write_protect;u32 cache_core_nps;struct iscsi_portal_group_s *tpg; -struct config_group tpg_attrib_group; }____cacheline_aligned iscsi_tpg_attrib_t; typedef struct iscsi_np_ex_s {
@@ -822,7 +823,7 @@ typedef struct iscsi_tpg_np_s {struct list_head tpg_np_list;struct list_head tpg_np_child_list;struct list_head tpg_np_parent_list; -struct config_group tpg_np_group; +struct se_tpg_np_s se_tpg_np;spinlock_t tpg_np_parent_lock; }____cacheline_aligned iscsi_tpg_np_t;
@@ -850,11 +851,7 @@ typedef struct iscsi_portal_group_s {/* Spinlock for adding/removing Network Portals */ spinlock_t tpg_np_lock;spinlock_t tpg_state_lock; -struct se_portal_group_s *tpg_se_tpg; -struct config_group tpg_np_group; -struct config_group tpg_lun_group; -struct config_group tpg_acl_group; -struct config_group tpg_param_group; +struct se_portal_group_s tpg_se_tpg;struct semaphore tpg_access_sem;struct semaphore np_login_sem;iscsi_tpg_attrib_t tpg_attrib;
@@ -873,7 +870,7 @@ typedef struct iscsi_portal_group_s {#define ISCSI_TPG_LUN (c, l) ((iscsi_tpg_list_t *)(c)->tpg->tpg_lun_list_t[l])#define ISCSI_TPG_S (s) ((iscsi_portal_group_t *)(s)->tpg)#define ISCSI_TPG_ATTRIB (t) (&(t)->tpg_attrib) -#define SE_TPG (tpg) ((struct se_portal_group_s *)(tpg)->tpg_se_tpg) +#define SE_TPG (tpg) (&(tpg)->tpg_se_tpg) typedef struct iscsi_tiqn_s { unsigned char tiqn[ISCSI_TIQN_LEN];
@@ -887,7 +884,7 @@ typedef struct iscsi_tiqn_s {atomic_t tiqn_access_count;spinlock_t tiqn_state_lock;spinlock_t tiqn_tpg_lock; -struct config_group tiqn_group; +struct se_wwn_s tiqn_wwn;#ifdef SNMP_SUPPORT u32 tiqn_index;iscsi_sess_err_stats_t sess_err_stats;
drivers/target/lio-target/iscsi_target_erl0.c +2 -2
@@ -818,7 +818,7 @@ static void iscsi_handle_time2retain_timeout(unsigned long data) {iscsi_session_t *sess = (iscsi_session_t *) data;iscsi_portal_group_t *tpg =ISCSI_TPG_S (sess); -se_portal_group_t *se_tpg = tpg->tpg_se_tpg; +se_portal_group_t *se_tpg = &tpg->tpg_se_tpg;spin_lock_bh (&se_tpg->session_lock);if (sess->time2retain_timer_flags &T2R_TF_STOP ) {
@@ -898,7 +898,7 @@ extern void iscsi_start_time2retain_handler (iscsi_session_t *sess)extern int iscsi_stop_time2retain_timer (iscsi_session_t *sess) {iscsi_portal_group_t *tpg =ISCSI_TPG_S (sess); -se_portal_group_t *se_tpg = tpg->tpg_se_tpg; +se_portal_group_t *se_tpg = &tpg->tpg_se_tpg;if (sess->time2retain_timer_flags &T2R_TF_EXPIRED )return -1 ;
drivers/target/lio-target/iscsi_target_login.c +5 -5
@@ -117,7 +117,7 @@ int iscsi_check_for_session_reinstatement(iscsi_conn_t *conn)iscsi_param_t *initiatorname_param =NULL , *sessiontype_param =NULL ;iscsi_portal_group_t *tpg = conn->tpg;iscsi_session_t *sess =NULL , *sess_p =NULL ; -se_portal_group_t *se_tpg = tpg->tpg_se_tpg; +se_portal_group_t *se_tpg = &tpg->tpg_se_tpg;se_session_t *se_sess, *se_sess_tmp; initiatorname_param = iscsi_find_param_from_key(
@@ -412,7 +412,7 @@ static int iscsi_login_non_zero_tsih_s2( {iscsi_portal_group_t *tpg = conn->tpg;iscsi_session_t *sess =NULL , *sess_p =NULL ; -se_portal_group_t *se_tpg = tpg->tpg_se_tpg; +se_portal_group_t *se_tpg = &tpg->tpg_se_tpg;se_session_t *se_sess, *se_sess_tmp;struct iscsi_init_login_cmnd *pdu = (struct iscsi_init_login_cmnd *)buf;
@@ -591,7 +591,7 @@ static int iscsi_post_login_handler(iscsi_session_t *sess =SESS (conn);se_session_t *se_sess = sess->se_sess;iscsi_portal_group_t *tpg =ISCSI_TPG_S (sess); -se_portal_group_t *se_tpg = tpg->tpg_se_tpg; +se_portal_group_t *se_tpg = &tpg->tpg_se_tpg;se_thread_set_t *ts;iscsi_inc_conn_usage_count (conn);
@@ -668,7 +668,7 @@ static int iscsi_post_login_handler(iscsi_determine_maxcmdsn (sess);spin_lock_bh (&se_tpg->session_lock); -__transport_register_session (sess->tpg->tpg_se_tpg, +__transport_register_session (&sess->tpg->tpg_se_tpg, se_sess->se_node_acl, se_sess, (void *)sess);TRACE (TRACE_STATE ,"Moving to TARG_SESS_STATE_LOGGED_IN.\n" ); sess->session_state =TARG_SESS_STATE_LOGGED_IN ;
@@ -1285,7 +1285,7 @@ old_sess_out:spin_lock_bh (&SESS (conn)->conn_lock);if (SESS (conn)->session_state ==TARG_SESS_STATE_FAILED ) {se_portal_group_t *se_tpg = -ISCSI_TPG_C (conn)->tpg_se_tpg; + &ISCSI_TPG_C (conn)->tpg_se_tpg;atomic_set (&SESS (conn)->session_continuation,0 );spin_unlock_bh (&SESS (conn)->conn_lock);
drivers/target/lio-target/iscsi_target_nego.c +1 -1
@@ -845,7 +845,7 @@ get_target:* Locate incoming Initiator IQN reference from Storage Node. */ sess->se_sess->se_node_acl =core_tpg_check_initiator_node_acl ( - conn->tpg->tpg_se_tpg, i_buf); + &conn->tpg->tpg_se_tpg, i_buf);if (!(sess->se_sess->se_node_acl)) { printk(KERN_ERR "iSCSI Initiator Node: %s is not authorized to" " access iSCSI target portal group: %hu.\n",
drivers/target/lio-target/iscsi_target_tpg.c +16 -23
@@ -465,7 +465,6 @@ iscsi_portal_group_t *core_alloc_portal_group(iscsi_tiqn_t *tiqn, u16 tpgt)init_MUTEX (&tpg->np_login_sem);spin_lock_init (&tpg->tpg_state_lock);spin_lock_init (&tpg->tpg_np_lock); - tpg->sid =1 ;/* First Assigned LIO-Target Session ID */ return tpg; }
@@ -476,6 +475,7 @@ int core_load_discovery_tpg(void) {iscsi_param_t *param;iscsi_portal_group_t *tpg; +int ret; tpg =core_alloc_portal_group (NULL ,1 );if (!(tpg)) {
@@ -483,23 +483,16 @@ int core_load_discovery_tpg(void)return -1 ; } - tpg->tpg_se_tpg =core_tpg_register ( - &lio_target_fabric_configfs->tf_ops, (void *)tpg, + ret =core_tpg_register ( + &lio_target_fabric_configfs->tf_ops, +NULL , &tpg->tpg_se_tpg, (void *)tpg,TRANSPORT_TPG_TYPE_DISCOVERY ); -if (IS_ERR (tpg->tpg_se_tpg)) { +if (ret <0 ) {kfree (tpg);return -1 ; } - tpg->sid =1 ;/* First Assigned LIO Session ID */ -INIT_LIST_HEAD (&tpg->tpg_gnp_list); -INIT_LIST_HEAD (&tpg->g_tpg_list); -INIT_LIST_HEAD (&tpg->tpg_list); -init_MUTEX (&tpg->tpg_access_sem); -init_MUTEX (&tpg->np_login_sem); -spin_lock_init (&tpg->tpg_state_lock); -spin_lock_init (&tpg->tpg_np_lock); - + tpg->sid =1 ;/* First Assigned LIO Session ID */ iscsi_set_default_tpg_attribs (tpg);if (iscsi_create_default_params (&tpg->param_list) <0 )
@@ -528,8 +521,8 @@ int core_load_discovery_tpg(void)return 0 ; out: -if (tpg->tpg_se_tpg) -core_tpg_deregister (tpg->tpg_se_tpg); +if (tpg->sid ==1 ) +core_tpg_deregister (&tpg->tpg_se_tpg);kfree (tpg);return -1 ; }
@@ -541,7 +534,7 @@ void core_release_discovery_tpg(void)if (!(tpg))return ; -core_tpg_deregister (tpg->tpg_se_tpg); +core_tpg_deregister (&tpg->tpg_se_tpg);kmem_cache_free (lio_tpg_cache, tpg); iscsi_global->discovery_tpg =NULL ;
@@ -774,9 +767,9 @@ int iscsi_tpg_del_portal_group(return -EPERM ; } -core_tpg_clear_object_luns (tpg->tpg_se_tpg); +core_tpg_clear_object_luns (&tpg->tpg_se_tpg);iscsi_tpg_free_network_portals (tpg); -core_tpg_free_node_acls (tpg->tpg_se_tpg); +core_tpg_free_node_acls (&tpg->tpg_se_tpg);spin_lock_bh (&iscsi_global->g_tpg_lock);list_del (&tpg->g_tpg_list);
@@ -787,8 +780,8 @@ int iscsi_tpg_del_portal_group( tpg->param_list =NULL ; } -core_tpg_deregister (tpg->tpg_se_tpg); - tpg->tpg_se_tpg =NULL ; +core_tpg_deregister (&tpg->tpg_se_tpg); +// tpg->tpg_se_tpg = NULL; spin_lock (&tpg->tpg_state_lock); tpg->tpg_state =TPG_STATE_FREE ;
@@ -908,7 +901,7 @@ iscsi_node_acl_t *iscsi_tpg_add_initiator_node_acl( {se_node_acl_t *se_nacl; - se_nacl =core_tpg_add_initiator_node_acl (tpg->tpg_se_tpg, + se_nacl =core_tpg_add_initiator_node_acl (&tpg->tpg_se_tpg, initiatorname, queue_depth);if ((IS_ERR (se_nacl)) || !(se_nacl))return NULL ;
@@ -927,7 +920,7 @@ void iscsi_tpg_del_initiator_node_acl(/* * TPG_TFO(tpg)->tpg_release_acl() will kfree the iscsi_node_acl_t.. */ -core_tpg_del_initiator_node_acl (tpg->tpg_se_tpg, se_nacl,1 ); +core_tpg_del_initiator_node_acl (&tpg->tpg_se_tpg, se_nacl,1 ); } iscsi_node_attrib_t *iscsi_tpg_get_node_attrib(
@@ -1151,7 +1144,7 @@ int iscsi_tpg_set_initiator_node_queue_depth( u32 queue_depth, int force) { -return core_tpg_set_initiator_node_queue_depth (tpg->tpg_se_tpg, +return core_tpg_set_initiator_node_queue_depth (&tpg->tpg_se_tpg, initiatorname, queue_depth, force); }
drivers/target/lio-target/iscsi_target_version.h +1 -1
@@ -1,6 +1,6 @@#ifndef ISCSI_TARGET_VERSION_H #define ISCSI_TARGET_VERSION_H -#define PYX_ISCSI_VERSION "v3.2.2" +#define PYX_ISCSI_VERSION "v3.9.8"#endif /*** ISCSI_TARGET_VERSION_H ***/
Signature · 1 line
1.5.6.5