From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756685Ab0CNJS5 (ORCPT ); Sun, 14 Mar 2010 05:18:57 -0400 Received: from smtp103.sbc.mail.gq1.yahoo.com ([67.195.15.62]:45212 "HELO smtp103.sbc.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756356Ab0CNJSr (ORCPT ); Sun, 14 Mar 2010 05:18:47 -0400 X-Greylist: delayed 401 seconds by postgrey-1.27 at vger.kernel.org; Sun, 14 Mar 2010 05:18:47 EDT X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: _MnKlKAVM1n9LMBzCf.J4unUWsMY8HbCe3IPQStzUSHCptsyI7KPBYV7bVWzvw9CKpFIWvzoYfIvaUHgqtrISi1ZlMM0Tmbu8ZuqDIf5EzLAkRpCoSsvwLu9CQ0jmLJ4IjJnefdk19mOIKD6_iMs_0Krdy10ToN1mEIgjlHsmZe8DySN7VAhh3feLrvNPtOv_txEhvOQdBPhsu3uLEmUBa8qgCSSKvxrpXqmI01PyIuyrdthtON9yf4mJxNxmGArtlY0PrEzd6TXOvi3CIcZ8ViCt_rqGWCLA.zQFa7Lx6cokK_o8d3pm2xre4djYAf.Ct3PmaXlAPkpS3y5h8q2qrv2SEP0JS_q5nb.Js7OJoyVtw-- X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: linux-kernel , linux-scsi , LIO-Target devel , Douglas Gilbert , "Martin K. Petersen" , FUJITA Tomonori , Mike Christie , Hannes Reinecke , Joe Eykholt , James Bottomley Cc: Nicholas Bellinger Subject: [PATCH 1/3] [TCM/PR]: Add TPG, NodeACL and MappedLUN wrappers for configfs_[un]depend_item() Date: Sun, 14 Mar 2010 01:17:45 -0800 Message-Id: <1268558265-10761-1-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.5.6.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicholas Bellinger This patch adds TPG, NodeACL and MappedLUN wrappers for configfs_depend_item() and configfs_undepend_item() to properly handler the reference counting of *pr_ref_count during multi-fabric SPEC_I_PT=1 TransportID and REGISTER_AND_MOVE processing. For the NodeACL and MappedLUN wrappers, there is also logic to handle the NAF_DYNAMIC_NODE_ACL case so that demo-mode (eg: no explict node ACLs) works for SPEC_I_PT=1 TransportID and REGISTER_AND_MOVE as well. Signed-off-by: Nicholas A. Bellinger --- drivers/target/target_core_pr.c | 85 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 5b23767..03f40e3 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -54,6 +54,7 @@ struct pr_transport_id_holder { int dest_local_nexus; struct t10_pr_registration_s *dest_pr_reg; + struct se_portal_group_s *dest_tpg; struct se_node_acl_s *dest_node_acl; struct se_dev_entry_s *dest_se_deve; struct list_head dest_list; @@ -1035,6 +1036,90 @@ void core_scsi3_free_all_registrations( spin_unlock(&pr_tmpl->aptpl_reg_lock); } +static int core_scsi3_tpg_depend_item(se_portal_group_t *tpg) +{ + return configfs_depend_item(TPG_TFO(tpg)->tf_subsys, + &tpg->tpg_group.cg_item); +} + +static void core_scsi3_tpg_undepend_item(se_portal_group_t *tpg) +{ + configfs_undepend_item(TPG_TFO(tpg)->tf_subsys, + &tpg->tpg_group.cg_item); + + atomic_dec(&tpg->tpg_pr_ref_count); + smp_mb__after_atomic_dec(); +} + +static int core_scsi3_nodeacl_depend_item(se_node_acl_t *nacl) +{ + se_portal_group_t *tpg = nacl->se_tpg; + + if (nacl->nodeacl_flags & NAF_DYNAMIC_NODE_ACL) + return 0; + + return configfs_depend_item(TPG_TFO(tpg)->tf_subsys, + &nacl->acl_group.cg_item); +} + +static void core_scsi3_nodeacl_undepend_item(se_node_acl_t *nacl) +{ + se_portal_group_t *tpg = nacl->se_tpg; + + if (nacl->nodeacl_flags & NAF_DYNAMIC_NODE_ACL) { + atomic_dec(&nacl->acl_pr_ref_count); + smp_mb__after_atomic_dec(); + return; + } + + configfs_undepend_item(TPG_TFO(tpg)->tf_subsys, + &nacl->acl_group.cg_item); + + atomic_dec(&nacl->acl_pr_ref_count); + smp_mb__after_atomic_dec(); +} + +static int core_scsi3_lunacl_depend_item(se_dev_entry_t *se_deve) +{ + se_lun_acl_t *lun_acl = se_deve->se_lun_acl; + se_node_acl_t *nacl; + se_portal_group_t *tpg; + /* + * For nacl->nodeacl_flags & NAF_DYNAMIC_NODE_ACL) + */ + if (!(lun_acl)) + return 0; + + nacl = lun_acl->se_lun_nacl; + tpg = nacl->se_tpg; + + return configfs_depend_item(TPG_TFO(tpg)->tf_subsys, + &lun_acl->se_lun_group.cg_item); +} + +static void core_scsi3_lunacl_undepend_item(se_dev_entry_t *se_deve) +{ + se_lun_acl_t *lun_acl = se_deve->se_lun_acl; + se_node_acl_t *nacl; + se_portal_group_t *tpg; + /* + * For nacl->nodeacl_flags & NAF_DYNAMIC_NODE_ACL) + */ + if (!(lun_acl)) { + atomic_dec(&se_deve->pr_ref_count); + smp_mb__after_atomic_dec(); + return; + } + nacl = lun_acl->se_lun_nacl; + tpg = nacl->se_tpg; + + configfs_undepend_item(TPG_TFO(tpg)->tf_subsys, + &lun_acl->se_lun_group.cg_item); + + atomic_dec(&se_deve->pr_ref_count); + smp_mb__after_atomic_dec(); +} + static int core_scsi3_decode_spec_i_port( se_cmd_t *cmd, se_portal_group_t *tpg, -- 1.5.6.5