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

Commit 06e97b48 authored by Steve Hodgson's avatar Steve Hodgson Committed by Nicholas Bellinger
Browse files

qla2xxx: Look up LUN for abort requests 



Search through the list of pending commands on the session list to find
the command the initiator is actually aborting, so that we can pass the
correct LUN to the core TMR handling code.

(nab: Allow abort requests to work to LUN=0 with mainline target code)

Signed-off-by: default avatarSteve Hodgson <steve@purestorage.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNicholas Bellinger <nab@risingtidesystems.com>
parent fd9a11d7

drivers/scsi/qla2xxx/qla_target.c

+20 −1
Original line number Diff line number Diff line
@@ -1264,8 +1264,27 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, 
	struct abts_recv_from_24xx *abts, struct qla_tgt_sess *sess)

{

	struct qla_hw_data *ha = vha->hw;

	struct se_session *se_sess = sess->se_sess;

	struct qla_tgt_mgmt_cmd *mcmd;

	struct se_cmd *se_cmd;

	u32 lun = 0;

	int rc;

	bool found_lun = false;



	spin_lock(&se_sess->sess_cmd_lock);

	list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {

		struct qla_tgt_cmd *cmd =

			container_of(se_cmd, struct qla_tgt_cmd, se_cmd);

		if (cmd->tag == abts->exchange_addr_to_abort) {

			lun = cmd->unpacked_lun;

			found_lun = true;

			break;

		}

	}

	spin_unlock(&se_sess->sess_cmd_lock);



	if (!found_lun)

		return -ENOENT;



	ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00f,

	    "qla_target(%d): task abort (tag=%d)\n",
@@ -1283,7 +1302,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, 
	mcmd->sess = sess;

	memcpy(&mcmd->orig_iocb.abts, abts, sizeof(mcmd->orig_iocb.abts));



	rc = ha->tgt.tgt_ops->handle_tmr(mcmd, 0, TMR_ABORT_TASK,

	rc = ha->tgt.tgt_ops->handle_tmr(mcmd, lun, TMR_ABORT_TASK,

	    abts->exchange_addr_to_abort);

	if (rc != 0) {

		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052,