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

Commit 506787a2 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Nicholas Bellinger
Browse files

tcm_loop: Fix wrong I_T nexus association 



tcm_loop has the I_T nexus associated with the HBA. This causes
commands to become misdirected if the HBA has more than one
target portal group; any command is then being sent to the
first target portal group instead of the correct one.

The nexus needs to be associated with the target portal group
instead.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Cc: <stable@vger.kernel.org> # 3.0+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 4b2f57e5

drivers/target/loopback/tcm_loop.c

+23 −43
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void tcm_loop_submission_work(struct work_struct *work) 
		set_host_byte(sc, DID_TRANSPORT_DISRUPTED);

		goto out_done;

	}

	tl_nexus = tl_hba->tl_nexus;

	tl_nexus = tl_tpg->tl_nexus;

	if (!tl_nexus) {

		scmd_printk(KERN_ERR, sc, "TCM_Loop I_T Nexus"

				" does not exist\n");
@@ -270,16 +270,26 @@ static int tcm_loop_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *sc) 
 * to struct scsi_device

 */

static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg,

			      struct tcm_loop_nexus *tl_nexus,

			      int lun, int task, enum tcm_tmreq_table tmr)

{

	struct se_cmd *se_cmd = NULL;

	struct se_session *se_sess;

	struct se_portal_group *se_tpg;

	struct tcm_loop_nexus *tl_nexus;

	struct tcm_loop_cmd *tl_cmd = NULL;

	struct tcm_loop_tmr *tl_tmr = NULL;

	int ret = TMR_FUNCTION_FAILED, rc;



	/*

	 * Locate the tl_nexus and se_sess pointers

	 */

	tl_nexus = tl_tpg->tl_nexus;

	if (!tl_nexus) {

		pr_err("Unable to perform device reset without"

				" active I_T Nexus\n");

		return ret;

	}



	tl_cmd = kmem_cache_zalloc(tcm_loop_cmd_cache, GFP_KERNEL);

	if (!tl_cmd) {

		pr_err("Unable to allocate memory for tl_cmd\n");
@@ -295,7 +305,7 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg, 


	se_cmd = &tl_cmd->tl_se_cmd;

	se_tpg = &tl_tpg->tl_se_tpg;

	se_sess = tl_nexus->se_sess;

	se_sess = tl_tpg->tl_nexus->se_sess;

	/*

	 * Initialize struct se_cmd descriptor from target_core_mod infrastructure

	 */
@@ -340,7 +350,6 @@ static int tcm_loop_issue_tmr(struct tcm_loop_tpg *tl_tpg, 
static int tcm_loop_abort_task(struct scsi_cmnd *sc)

{

	struct tcm_loop_hba *tl_hba;

	struct tcm_loop_nexus *tl_nexus;

	struct tcm_loop_tpg *tl_tpg;

	int ret = FAILED;
@@ -348,21 +357,8 @@ static int tcm_loop_abort_task(struct scsi_cmnd *sc) 
	 * Locate the tcm_loop_hba_t pointer

	 */

	tl_hba = *(struct tcm_loop_hba **)shost_priv(sc->device->host);

	/*

	 * Locate the tl_nexus and se_sess pointers

	 */

	tl_nexus = tl_hba->tl_nexus;

	if (!tl_nexus) {

		pr_err("Unable to perform device reset without"

				" active I_T Nexus\n");

		return FAILED;

	}



	/*

	 * Locate the tl_tpg pointer from TargetID in sc->device->id

	 */

	tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id];

	ret = tcm_loop_issue_tmr(tl_tpg, tl_nexus, sc->device->lun,

	ret = tcm_loop_issue_tmr(tl_tpg, sc->device->lun,

				 sc->request->tag, TMR_ABORT_TASK);

	return (ret == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED;

}
@@ -374,7 +370,6 @@ static int tcm_loop_abort_task(struct scsi_cmnd *sc) 
static int tcm_loop_device_reset(struct scsi_cmnd *sc)

{

	struct tcm_loop_hba *tl_hba;

	struct tcm_loop_nexus *tl_nexus;

	struct tcm_loop_tpg *tl_tpg;

	int ret = FAILED;
@@ -382,20 +377,9 @@ static int tcm_loop_device_reset(struct scsi_cmnd *sc) 
	 * Locate the tcm_loop_hba_t pointer

	 */

	tl_hba = *(struct tcm_loop_hba **)shost_priv(sc->device->host);

	/*

	 * Locate the tl_nexus and se_sess pointers

	 */

	tl_nexus = tl_hba->tl_nexus;

	if (!tl_nexus) {

		pr_err("Unable to perform device reset without"

				" active I_T Nexus\n");

		return FAILED;

	}

	/*

	 * Locate the tl_tpg pointer from TargetID in sc->device->id

	 */

	tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id];

	ret = tcm_loop_issue_tmr(tl_tpg, tl_nexus, sc->device->lun,



	ret = tcm_loop_issue_tmr(tl_tpg, sc->device->lun,

				 0, TMR_LUN_RESET);

	return (ret == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED;

}
@@ -1005,8 +989,8 @@ static int tcm_loop_make_nexus( 
	struct tcm_loop_nexus *tl_nexus;

	int ret = -ENOMEM;



	if (tl_tpg->tl_hba->tl_nexus) {

		pr_debug("tl_tpg->tl_hba->tl_nexus already exists\n");

	if (tl_tpg->tl_nexus) {

		pr_debug("tl_tpg->tl_nexus already exists\n");

		return -EEXIST;

	}

	se_tpg = &tl_tpg->tl_se_tpg;
@@ -1041,7 +1025,7 @@ static int tcm_loop_make_nexus( 
	 */

	__transport_register_session(se_tpg, tl_nexus->se_sess->se_node_acl,

			tl_nexus->se_sess, tl_nexus);

	tl_tpg->tl_hba->tl_nexus = tl_nexus;

	tl_tpg->tl_nexus = tl_nexus;

	pr_debug("TCM_Loop_ConfigFS: Established I_T Nexus to emulated"

		" %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tl_hba),

		name);
@@ -1057,12 +1041,8 @@ static int tcm_loop_drop_nexus( 
{

	struct se_session *se_sess;

	struct tcm_loop_nexus *tl_nexus;

	struct tcm_loop_hba *tl_hba = tpg->tl_hba;



	if (!tl_hba)

		return -ENODEV;



	tl_nexus = tl_hba->tl_nexus;

	tl_nexus = tpg->tl_nexus;

	if (!tl_nexus)

		return -ENODEV;
@@ -1078,13 +1058,13 @@ static int tcm_loop_drop_nexus( 
	}



	pr_debug("TCM_Loop_ConfigFS: Removing I_T Nexus to emulated"

		" %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tl_hba),

		" %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tpg->tl_hba),

		tl_nexus->se_sess->se_node_acl->initiatorname);

	/*

	 * Release the SCSI I_T Nexus to the emulated SAS Target Port

	 */

	transport_deregister_session(tl_nexus->se_sess);

	tpg->tl_hba->tl_nexus = NULL;

	tpg->tl_nexus = NULL;

	kfree(tl_nexus);

	return 0;

}
@@ -1100,7 +1080,7 @@ static ssize_t tcm_loop_tpg_show_nexus( 
	struct tcm_loop_nexus *tl_nexus;

	ssize_t ret;



	tl_nexus = tl_tpg->tl_hba->tl_nexus;

	tl_nexus = tl_tpg->tl_nexus;

	if (!tl_nexus)

		return -ENODEV;

drivers/target/loopback/tcm_loop.h

+1 −6
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ struct tcm_loop_tmr { 
};



struct tcm_loop_nexus {

	int it_nexus_active;

	/*

	 * Pointer to Linux/SCSI HBA from linux/include/scsi_host.h

	 */

	struct scsi_host *sh;

	/*

	 * Pointer to TCM session for I_T Nexus

	 */
@@ -51,6 +46,7 @@ struct tcm_loop_tpg { 
	atomic_t tl_tpg_port_count;

	struct se_portal_group tl_se_tpg;

	struct tcm_loop_hba *tl_hba;

	struct tcm_loop_nexus *tl_nexus;

};



struct tcm_loop_hba {
@@ -59,7 +55,6 @@ struct tcm_loop_hba { 
	struct se_hba_s *se_hba;

	struct se_lun *tl_hba_lun;

	struct se_port *tl_hba_lun_sep;

	struct tcm_loop_nexus *tl_nexus;

	struct device dev;

	struct Scsi_Host *sh;

	struct tcm_loop_tpg tl_hba_tpgs[TL_TPGS_PER_HBA];