Commit 0dcec41a authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Make sure that aborted commands are freed 



The LIO core requires that the target driver callback functions
.queue_data_in() and .queue_status() call target_put_sess_cmd() or
transport_generic_free_cmd(). These calls may happen synchronously or
asynchronously. Make sure that one of these LIO functions is called in case
a command has been aborted. This patch avoids that the code for removing a
session hangs due to commands that do not make progress.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Fixes: 694833ee ("scsi: tcm_qla2xxx: Do not allow aborted cmd to advance.") # v4.13.
Fixes: a07100e0 ("qla2xxx: Fix TMR ABORT interaction issue between qla2xxx and TCM") # v4.5.
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bcc85657

drivers/scsi/qla2xxx/qla_target.c

+8 −5
Original line number Diff line number Diff line
@@ -3206,7 +3206,8 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, 
	if (!qpair->fw_started || (cmd->reset_count != qpair->chip_reset) ||

	    (cmd->sess && cmd->sess->deleted)) {

		cmd->state = QLA_TGT_STATE_PROCESSED;

		return 0;

		res = 0;

		goto free;

	}



	ql_dbg_qp(ql_dbg_tgt, qpair, 0xe018,
@@ -3217,9 +3218,8 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, 


	res = qlt_pre_xmit_response(cmd, &prm, xmit_type, scsi_status,

	    &full_req_cnt);

	if (unlikely(res != 0)) {

		return res;

	}

	if (unlikely(res != 0))

		goto free;



	spin_lock_irqsave(qpair->qp_lock_ptr, flags);
@@ -3239,7 +3239,8 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, 
			vha->flags.online, qla2x00_reset_active(vha),

			cmd->reset_count, qpair->chip_reset);

		spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);

		return 0;

		res = 0;

		goto free;

	}



	/* Does F/W have an IOCBs for this request */
@@ -3342,6 +3343,8 @@ out_unmap_unlock: 
	qlt_unmap_sg(vha, cmd);

	spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);



free:

	vha->hw->tgt.tgt_ops->free_cmd(cmd);

	return res;

}

EXPORT_SYMBOL(qlt_xmit_response);

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+4 −0
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd) 
{

	struct qla_tgt_cmd *cmd = container_of(se_cmd,

				struct qla_tgt_cmd, se_cmd);

	struct scsi_qla_host *vha = cmd->vha;



	if (cmd->aborted) {

		/* Cmd can loop during Q-full.  tcm_qla2xxx_aborted_task
@@ -632,6 +633,7 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd) 
			cmd->se_cmd.transport_state,

			cmd->se_cmd.t_state,

			cmd->se_cmd.se_cmd_flags);

		vha->hw->tgt.tgt_ops->free_cmd(cmd);

		return 0;

	}
@@ -659,6 +661,7 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd) 
{

	struct qla_tgt_cmd *cmd = container_of(se_cmd,

				struct qla_tgt_cmd, se_cmd);

	struct scsi_qla_host *vha = cmd->vha;

	int xmit_type = QLA_TGT_XMIT_STATUS;



	if (cmd->aborted) {
@@ -672,6 +675,7 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd) 
		    cmd, kref_read(&cmd->se_cmd.cmd_kref),

		    cmd->se_cmd.transport_state, cmd->se_cmd.t_state,

		    cmd->se_cmd.se_cmd_flags);

		vha->hw->tgt.tgt_ops->free_cmd(cmd);

		return 0;

	}

	cmd->bufflen = se_cmd->data_length;

CRA Git | Maintained and supported by SUSTech CRA and CCSE