qla2xxx: Update target lookup session tables when a target session changes

It is possible for the target code to change the loop_id or s_id of a target session in reaction to an FC fabric change. However, the session structures are stored in tables that are indexed by these two keys, and if we just change the session structure but leave the pointers to it in the old places in the table, havoc can ensue. For example, a new session might come along that should go in the old slot in the table and overwrite the old session pointer. To handle this, add a new tgt_ops->update_sess() method that also updates the "by loop_id" and "by s_id" lookup tables when a session changes, so that the keys where a session pointer is stored in these tables always matches the keys in the session structure itself. (nab: Drop unnecessary double inversion with FCF_CONF_COMP_SUPPORTED usage) Signed-off-by: Roland Dreier <roland@purestorage.com> Cc: Chad Dupuis <chad.dupuis@qlogic.com> Cc: Arun Easi <arun.easi@qlogic.com> Cc: Saurav Kashyap <saurav.kashyap@qlogic.com> Cc: stable@vger.kernel.org Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
author: Roland Dreier <roland@purestorage.com> 2012-10-11 16:41:32 -0400
committer: Nicholas Bellinger <nab@linux-iscsi.org> 2012-10-26 15:29:46 -0400
commit: c8292d1da53fa60c7516ab03a9d83f7ea266d335 (patch)
tree: 0d325d1acb4b807d724ee66b7f4a1998c7f85ef5 /drivers/scsi/qla2xxx/tcm_qla2xxx.c
parent: c046aa0f0f47719a38854fc6383216392b130704 (diff)
1 files changed, 73 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index d8211ccc413a..3d74f2f39ae1 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1457,6 +1457,78 @@ static int tcm_qla2xxx_check_initiator_node_acl(
        return 0;
 }
+static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id,
+                                    uint16_t loop_id, bool conf_compl_supported)
+{
+        struct qla_tgt *tgt = sess->tgt;
+        struct qla_hw_data *ha = tgt->ha;
+        struct tcm_qla2xxx_lport *lport = ha->tgt.target_lport_ptr;
+        struct se_node_acl *se_nacl = sess->se_sess->se_node_acl;
+        struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
+                        struct tcm_qla2xxx_nacl, se_node_acl);
+        u32 key;
+        if (sess->loop_id != loop_id || sess->s_id.b24 != s_id.b24)
+                pr_info("Updating session %p from port %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x loop_id %d -> %d s_id %x:%x:%x -> %x:%x:%x\n",
+                        sess,
+                        sess->port_name[0], sess->port_name[1],
+                        sess->port_name[2], sess->port_name[3],
+                        sess->port_name[4], sess->port_name[5],
+                        sess->port_name[6], sess->port_name[7],
+                        sess->loop_id, loop_id,
+                        sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa,
+                        s_id.b.domain, s_id.b.area, s_id.b.al_pa);
+        if (sess->loop_id != loop_id) {
+                /*
+                 * Because we can shuffle loop IDs around and we
+                 * update different sessions non-atomically, we might
+                 * have overwritten this session's old loop ID
+                 * already, and we might end up overwriting some other
+                 * session that will be updated later.  So we have to
+                 * be extra careful and we can't warn about those things...
+                 */
+                if (lport->lport_loopid_map[sess->loop_id].se_nacl == se_nacl)
+                        lport->lport_loopid_map[sess->loop_id].se_nacl = NULL;
+                lport->lport_loopid_map[loop_id].se_nacl = se_nacl;
+                sess->loop_id = loop_id;
+        }
+        if (sess->s_id.b24 != s_id.b24) {
+                key = (((u32) sess->s_id.b.domain << 16) |
+                       ((u32) sess->s_id.b.area   <<  8) |
+                       ((u32) sess->s_id.b.al_pa));
+                if (btree_lookup32(&lport->lport_fcport_map, key))
+                        WARN(btree_remove32(&lport->lport_fcport_map, key) != se_nacl,
+                             "Found wrong se_nacl when updating s_id %x:%x:%x\n",
+                             sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
+                else
+                        WARN(1, "No lport_fcport_map entry for s_id %x:%x:%x\n",
+                             sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
+                key = (((u32) s_id.b.domain << 16) |
+                       ((u32) s_id.b.area   <<  8) |
+                       ((u32) s_id.b.al_pa));
+                if (btree_lookup32(&lport->lport_fcport_map, key)) {
+                        WARN(1, "Already have lport_fcport_map entry for s_id %x:%x:%x\n",
+                             s_id.b.domain, s_id.b.area, s_id.b.al_pa);
+                        btree_update32(&lport->lport_fcport_map, key, se_nacl);
+                } else {
+                        btree_insert32(&lport->lport_fcport_map, key, se_nacl, GFP_ATOMIC);
+                }
+                sess->s_id = s_id;
+                nacl->nport_id = key;
+        }
+        sess->conf_compl_supported = conf_compl_supported;
+}
 /*
 * Calls into tcm_qla2xxx used by qla2xxx LLD I/O path.
 */
@@ -1467,6 +1539,7 @@ static struct qla_tgt_func_tmpl tcm_qla2xxx_template = {
        .free_cmd               = tcm_qla2xxx_free_cmd,
        .free_mcmd              = tcm_qla2xxx_free_mcmd,
        .free_session           = tcm_qla2xxx_free_session,
+        .update_sess            = tcm_qla2xxx_update_sess,
        .check_initiator_node_acl = tcm_qla2xxx_check_initiator_node_acl,
        .find_sess_by_s_id      = tcm_qla2xxx_find_sess_by_s_id,
        .find_sess_by_loop_id   = tcm_qla2xxx_find_sess_by_loop_id,
author	Roland Dreier <roland@purestorage.com>	2012-10-11 16:41:32 -0400
committer	Nicholas Bellinger <nab@linux-iscsi.org>	2012-10-26 15:29:46 -0400
commit	c8292d1da53fa60c7516ab03a9d83f7ea266d335 (patch)
tree	0d325d1acb4b807d724ee66b7f4a1998c7f85ef5 /drivers/scsi/qla2xxx/tcm_qla2xxx.c
parent	c046aa0f0f47719a38854fc6383216392b130704 (diff)

diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index d8211ccc413a..3d74f2f39ae1 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1457,6 +1457,78 @@ static int tcm_qla2xxx_check_initiator_node_acl(
1457	return 0;	1457	return 0;
1458	}	1458	}
1459		1459
		1460	static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id,
		1461	uint16_t loop_id, bool conf_compl_supported)
		1462	{
		1463	struct qla_tgt *tgt = sess->tgt;
		1464	struct qla_hw_data *ha = tgt->ha;
		1465	struct tcm_qla2xxx_lport *lport = ha->tgt.target_lport_ptr;
		1466	struct se_node_acl *se_nacl = sess->se_sess->se_node_acl;
		1467	struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
		1468	struct tcm_qla2xxx_nacl, se_node_acl);
		1469	u32 key;
		1470
		1471
		1472	if (sess->loop_id != loop_id \|\| sess->s_id.b24 != s_id.b24)
		1473	pr_info("Updating session %p from port %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x loop_id %d -> %d s_id %x:%x:%x -> %x:%x:%x\n",
		1474	sess,
		1475	sess->port_name[0], sess->port_name[1],
		1476	sess->port_name[2], sess->port_name[3],
		1477	sess->port_name[4], sess->port_name[5],
		1478	sess->port_name[6], sess->port_name[7],
		1479	sess->loop_id, loop_id,
		1480	sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa,
		1481	s_id.b.domain, s_id.b.area, s_id.b.al_pa);
		1482
		1483	if (sess->loop_id != loop_id) {
		1484	/*
		1485	* Because we can shuffle loop IDs around and we
		1486	* update different sessions non-atomically, we might
		1487	* have overwritten this session's old loop ID
		1488	* already, and we might end up overwriting some other
		1489	* session that will be updated later. So we have to
		1490	* be extra careful and we can't warn about those things...
		1491	*/
		1492	if (lport->lport_loopid_map[sess->loop_id].se_nacl == se_nacl)
		1493	lport->lport_loopid_map[sess->loop_id].se_nacl = NULL;
		1494
		1495	lport->lport_loopid_map[loop_id].se_nacl = se_nacl;
		1496
		1497	sess->loop_id = loop_id;
		1498	}
		1499
		1500	if (sess->s_id.b24 != s_id.b24) {
		1501	key = (((u32) sess->s_id.b.domain << 16) \|
		1502	((u32) sess->s_id.b.area << 8) \|
		1503	((u32) sess->s_id.b.al_pa));
		1504
		1505	if (btree_lookup32(&lport->lport_fcport_map, key))
		1506	WARN(btree_remove32(&lport->lport_fcport_map, key) != se_nacl,
		1507	"Found wrong se_nacl when updating s_id %x:%x:%x\n",
		1508	sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
		1509	else
		1510	WARN(1, "No lport_fcport_map entry for s_id %x:%x:%x\n",
		1511	sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
		1512
		1513	key = (((u32) s_id.b.domain << 16) \|
		1514	((u32) s_id.b.area << 8) \|
		1515	((u32) s_id.b.al_pa));
		1516
		1517	if (btree_lookup32(&lport->lport_fcport_map, key)) {
		1518	WARN(1, "Already have lport_fcport_map entry for s_id %x:%x:%x\n",
		1519	s_id.b.domain, s_id.b.area, s_id.b.al_pa);
		1520	btree_update32(&lport->lport_fcport_map, key, se_nacl);
		1521	} else {
		1522	btree_insert32(&lport->lport_fcport_map, key, se_nacl, GFP_ATOMIC);
		1523	}
		1524
		1525	sess->s_id = s_id;
		1526	nacl->nport_id = key;
		1527	}
		1528
		1529	sess->conf_compl_supported = conf_compl_supported;
		1530	}
		1531
1460	/*	1532	/*
1461	* Calls into tcm_qla2xxx used by qla2xxx LLD I/O path.	1533	* Calls into tcm_qla2xxx used by qla2xxx LLD I/O path.
1462	*/	1534	*/
@@ -1467,6 +1539,7 @@ static struct qla_tgt_func_tmpl tcm_qla2xxx_template = {
1467	.free_cmd = tcm_qla2xxx_free_cmd,	1539	.free_cmd = tcm_qla2xxx_free_cmd,
1468	.free_mcmd = tcm_qla2xxx_free_mcmd,	1540	.free_mcmd = tcm_qla2xxx_free_mcmd,
1469	.free_session = tcm_qla2xxx_free_session,	1541	.free_session = tcm_qla2xxx_free_session,
		1542	.update_sess = tcm_qla2xxx_update_sess,
1470	.check_initiator_node_acl = tcm_qla2xxx_check_initiator_node_acl,	1543	.check_initiator_node_acl = tcm_qla2xxx_check_initiator_node_acl,
1471	.find_sess_by_s_id = tcm_qla2xxx_find_sess_by_s_id,	1544	.find_sess_by_s_id = tcm_qla2xxx_find_sess_by_s_id,
1472	.find_sess_by_loop_id = tcm_qla2xxx_find_sess_by_loop_id,	1545	.find_sess_by_loop_id = tcm_qla2xxx_find_sess_by_loop_id,