Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a41b0e71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull target updates from Nicholas Bellinger:
 "This series contains post merge qla_target.c / tcm_qla2xxx bugfixes
  from the past weeks, including the patch to allow target-core to use
  an optional session shutdown callback to help address an active I/O
  shutdown bug in tcm_qla2xxx code (Joern).

  Also included is a target regression bugfix releated to explict ALUA
  target port group CDB emulation that is CC'ed to stable (Roland)."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  qla2xxx: Remove version.h header file inclusion
  tcm_qla2xxx: Handle malformed wwn strings properly
  tcm_qla2xxx: tcm_qla2xxx_handle_tmr() can be static
  qla2xxx: Don't leak commands we give up on in qlt_do_work()
  qla2xxx: Don't crash if we can't find cmd for failed CTIO
  tcm_qla2xxx: Don't insert nacls without sessions into the btree
  target: Return error to initiator if SET TARGET PORT GROUPS emulation fails
  tcm_qla2xxx: Clear session s_id + loop_id earlier during shutdown
  tcm_qla2xxx: Convert to TFO->put_session() usage
  target: Add TFO->put_session() caller for HW fabric session shutdown
parents 718f58ad 5134de28

drivers/scsi/qla2xxx/qla_target.c

+5 −6
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/version.h>

#include <linux/blkdev.h>

#include <linux/interrupt.h>

#include <linux/pci.h>
@@ -2477,11 +2476,9 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle, 
	}



	cmd = qlt_ctio_to_cmd(vha, handle, ctio);

	if (cmd == NULL) {

		if (status != CTIO_SUCCESS)

			qlt_term_ctio_exchange(vha, ctio, NULL, status);

	if (cmd == NULL)

		return;

	}



	se_cmd = &cmd->se_cmd;

	tfo = se_cmd->se_tfo;
@@ -2727,10 +2724,12 @@ static void qlt_do_work(struct work_struct *work) 
out_term:

	ql_dbg(ql_dbg_tgt_mgt, vha, 0xf020, "Terminating work cmd %p", cmd);

	/*

	 * cmd has not sent to target yet, so pass NULL as the second argument

	 * cmd has not sent to target yet, so pass NULL as the second

	 * argument to qlt_send_term_exchange() and free the memory here.

	 */

	spin_lock_irqsave(&ha->hardware_lock, flags);

	qlt_send_term_exchange(vha, NULL, &cmd->atio, 1);

	kmem_cache_free(qla_tgt_cmd_cachep, cmd);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);

	if (sess)

		ha->tgt.tgt_ops->put_sess(sess);

drivers/scsi/qla2xxx/qla_target.h

+0 −1
Original line number Diff line number Diff line
@@ -919,7 +919,6 @@ struct qla_tgt_srr_ctio { 
#define QLA_TGT_XMIT_STATUS		2

#define QLA_TGT_XMIT_ALL		(QLA_TGT_XMIT_STATUS|QLA_TGT_XMIT_DATA)



#include <linux/version.h>



extern struct qla_tgt_data qla_target;

/*

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+58 −94
Original line number Diff line number Diff line
@@ -137,13 +137,15 @@ static char *tcm_qla2xxx_get_fabric_name(void) 
 */

static int tcm_qla2xxx_npiv_extract_wwn(const char *ns, u64 *nm)

{

	unsigned int i, j, value;

	unsigned int i, j;

	u8 wwn[8];



	memset(wwn, 0, sizeof(wwn));



	/* Validate and store the new name */

	for (i = 0, j = 0; i < 16; i++) {

		int value;



		value = hex_to_bin(*ns++);

		if (value >= 0)

			j = (j << 4) | value;
@@ -652,7 +654,7 @@ static int tcm_qla2xxx_handle_data(struct qla_tgt_cmd *cmd) 
/*

 * Called from qla_target.c:qlt_issue_task_mgmt()

 */

int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, uint32_t lun,

static int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, uint32_t lun,

	uint8_t tmr_func, uint32_t tag)

{

	struct qla_tgt_sess *sess = mcmd->sess;
@@ -762,65 +764,8 @@ static u16 tcm_qla2xxx_set_fabric_sense_len(struct se_cmd *se_cmd, 
struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;

struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;



static int tcm_qla2xxx_setup_nacl_from_rport(

	struct se_portal_group *se_tpg,

	struct se_node_acl *se_nacl,

	struct tcm_qla2xxx_lport *lport,

	struct tcm_qla2xxx_nacl *nacl,

	u64 rport_wwnn)

{

	struct scsi_qla_host *vha = lport->qla_vha;

	struct Scsi_Host *sh = vha->host;

	struct fc_host_attrs *fc_host = shost_to_fc_host(sh);

	struct fc_rport *rport;

	unsigned long flags;

	void *node;

	int rc;



	/*

	 * Scan the existing rports, and create a session for the

	 * explict NodeACL is an matching rport->node_name already

	 * exists.

	 */

	spin_lock_irqsave(sh->host_lock, flags);

	list_for_each_entry(rport, &fc_host->rports, peers) {

		if (rport_wwnn != rport->node_name)

			continue;



		pr_debug("Located existing rport_wwpn and rport->node_name: 0x%016LX, port_id: 0x%04x\n",

		    rport->node_name, rport->port_id);

		nacl->nport_id = rport->port_id;



		spin_unlock_irqrestore(sh->host_lock, flags);



		spin_lock_irqsave(&vha->hw->hardware_lock, flags);

		node = btree_lookup32(&lport->lport_fcport_map, rport->port_id);

		if (node) {

			rc = btree_update32(&lport->lport_fcport_map,

					    rport->port_id, se_nacl);

		} else {

			rc = btree_insert32(&lport->lport_fcport_map,

					    rport->port_id, se_nacl,

					    GFP_ATOMIC);

		}

		spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);



		if (rc) {

			pr_err("Unable to insert se_nacl into fcport_map");

			WARN_ON(rc > 0);

			return rc;

		}



		pr_debug("Inserted into fcport_map: %p for WWNN: 0x%016LX, port_id: 0x%08x\n",

		    se_nacl, rport_wwnn, nacl->nport_id);



		return 1;

	}

	spin_unlock_irqrestore(sh->host_lock, flags);



	return 0;

}



static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *,

			struct tcm_qla2xxx_nacl *, struct qla_tgt_sess *);

/*

 * Expected to be called with struct qla_hw_data->hardware_lock held

 */
@@ -842,11 +787,40 @@ static void tcm_qla2xxx_clear_nacl_from_fcport_map(struct qla_tgt_sess *sess) 


	pr_debug("Removed from fcport_map: %p for WWNN: 0x%016LX, port_id: 0x%06x\n",

	    se_nacl, nacl->nport_wwnn, nacl->nport_id);

	/*

	 * Now clear the se_nacl and session pointers from our HW lport lookup

	 * table mapping for this initiator's fabric S_ID and LOOP_ID entries.

	 *

	 * This is done ahead of callbacks into tcm_qla2xxx_free_session() ->

	 * target_wait_for_sess_cmds() before the session waits for outstanding

	 * I/O to complete, to avoid a race between session shutdown execution

	 * and incoming ATIOs or TMRs picking up a stale se_node_act reference.

	 */

	tcm_qla2xxx_clear_sess_lookup(lport, nacl, sess);

}



static void tcm_qla2xxx_release_session(struct kref *kref)

{

	struct se_session *se_sess = container_of(kref,

			struct se_session, sess_kref);



	qlt_unreg_sess(se_sess->fabric_sess_ptr);

}



static void tcm_qla2xxx_put_session(struct se_session *se_sess)

{

	struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;

	struct qla_hw_data *ha = sess->vha->hw;

	unsigned long flags;



	spin_lock_irqsave(&ha->hardware_lock, flags);

	kref_put(&se_sess->sess_kref, tcm_qla2xxx_release_session);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);

}



static void tcm_qla2xxx_put_sess(struct qla_tgt_sess *sess)

{

	target_put_session(sess->se_sess);

	tcm_qla2xxx_put_session(sess->se_sess);

}



static void tcm_qla2xxx_shutdown_sess(struct qla_tgt_sess *sess)
@@ -859,14 +833,10 @@ static struct se_node_acl *tcm_qla2xxx_make_nodeacl( 
	struct config_group *group,

	const char *name)

{

	struct se_wwn *se_wwn = se_tpg->se_tpg_wwn;

	struct tcm_qla2xxx_lport *lport = container_of(se_wwn,

				struct tcm_qla2xxx_lport, lport_wwn);

	struct se_node_acl *se_nacl, *se_nacl_new;

	struct tcm_qla2xxx_nacl *nacl;

	u64 wwnn;

	u32 qla2xxx_nexus_depth;

	int rc;



	if (tcm_qla2xxx_parse_wwn(name, &wwnn, 1) < 0)

		return ERR_PTR(-EINVAL);
@@ -893,16 +863,6 @@ static struct se_node_acl *tcm_qla2xxx_make_nodeacl( 
	nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);

	nacl->nport_wwnn = wwnn;

	tcm_qla2xxx_format_wwn(&nacl->nport_name[0], TCM_QLA2XXX_NAMELEN, wwnn);

	/*

	 * Setup a se_nacl handle based on an a matching struct fc_rport setup

	 * via drivers/scsi/qla2xxx/qla_init.c:qla2x00_reg_remote_port()

	 */

	rc = tcm_qla2xxx_setup_nacl_from_rport(se_tpg, se_nacl, lport,

					nacl, wwnn);

	if (rc < 0) {

		tcm_qla2xxx_release_fabric_acl(se_tpg, se_nacl_new);

		return ERR_PTR(rc);

	}



	return se_nacl;

}
@@ -1390,6 +1350,25 @@ static void tcm_qla2xxx_set_sess_by_loop_id( 
	    nacl->qla_tgt_sess, new_se_nacl, new_se_nacl->initiatorname);

}



/*

 * Should always be called with qla_hw_data->hardware_lock held.

 */

static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *lport,

		struct tcm_qla2xxx_nacl *nacl, struct qla_tgt_sess *sess)

{

	struct se_session *se_sess = sess->se_sess;

	unsigned char be_sid[3];



	be_sid[0] = sess->s_id.b.domain;

	be_sid[1] = sess->s_id.b.area;

	be_sid[2] = sess->s_id.b.al_pa;



	tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess,

				sess, be_sid);

	tcm_qla2xxx_set_sess_by_loop_id(lport, NULL, nacl, se_sess,

				sess, sess->loop_id);

}



static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)

{

	struct qla_tgt *tgt = sess->tgt;
@@ -1398,8 +1377,6 @@ static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess) 
	struct se_node_acl *se_nacl;

	struct tcm_qla2xxx_lport *lport;

	struct tcm_qla2xxx_nacl *nacl;

	unsigned char be_sid[3];

	unsigned long flags;



	BUG_ON(in_interrupt());
@@ -1419,21 +1396,6 @@ static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess) 
		return;

	}

	target_wait_for_sess_cmds(se_sess, 0);

	/*

	 * And now clear the se_nacl and session pointers from our HW lport

	 * mappings for fabric S_ID and LOOP_ID.

	 */

	memset(&be_sid, 0, 3);

	be_sid[0] = sess->s_id.b.domain;

	be_sid[1] = sess->s_id.b.area;

	be_sid[2] = sess->s_id.b.al_pa;



	spin_lock_irqsave(&ha->hardware_lock, flags);

	tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess,

			sess, be_sid);

	tcm_qla2xxx_set_sess_by_loop_id(lport, NULL, nacl, se_sess,

			sess, sess->loop_id);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	transport_deregister_session_configfs(sess->se_sess);

	transport_deregister_session(sess->se_sess);
@@ -1731,6 +1693,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = { 
	.new_cmd_map			= NULL,

	.check_stop_free		= tcm_qla2xxx_check_stop_free,

	.release_cmd			= tcm_qla2xxx_release_cmd,

	.put_session			= tcm_qla2xxx_put_session,

	.shutdown_session		= tcm_qla2xxx_shutdown_session,

	.close_session			= tcm_qla2xxx_close_session,

	.sess_get_index			= tcm_qla2xxx_sess_get_index,
@@ -1779,6 +1742,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = { 
	.tpg_release_fabric_acl		= tcm_qla2xxx_release_fabric_acl,

	.tpg_get_inst_index		= tcm_qla2xxx_tpg_get_inst_index,

	.release_cmd			= tcm_qla2xxx_release_cmd,

	.put_session			= tcm_qla2xxx_put_session,

	.shutdown_session		= tcm_qla2xxx_shutdown_session,

	.close_session			= tcm_qla2xxx_close_session,

	.sess_get_index			= tcm_qla2xxx_sess_get_index,

drivers/target/target_core_alua.c

+3 −2
Original line number Diff line number Diff line
@@ -374,8 +374,9 @@ int target_emulate_set_target_port_groups(struct se_cmd *cmd) 


out:

	transport_kunmap_data_sg(cmd);

	if (!rc)

		target_complete_cmd(cmd, GOOD);

	return 0;

	return rc;

}



static inline int core_alua_state_nonoptimized(

drivers/target/target_core_transport.c

+7 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ void transport_register_session( 
}

EXPORT_SYMBOL(transport_register_session);



static void target_release_session(struct kref *kref)

void target_release_session(struct kref *kref)

{

	struct se_session *se_sess = container_of(kref,

			struct se_session, sess_kref);
@@ -332,6 +332,12 @@ EXPORT_SYMBOL(target_get_session); 


void target_put_session(struct se_session *se_sess)

{

	struct se_portal_group *tpg = se_sess->se_tpg;



	if (tpg->se_tpg_tfo->put_session != NULL) {

		tpg->se_tpg_tfo->put_session(se_sess);

		return;

	}

	kref_put(&se_sess->sess_kref, target_release_session);

}

EXPORT_SYMBOL(target_put_session);