From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hannes Reinecke Subject: Re: [PATCH 11/20] qla2xxx: Add TAS detection for kernel 3.15 n newer Date: Wed, 9 Dec 2015 08:02:08 +0100 Message-ID: <5667D1F0.2000703@suse.de> References: <1449535747-2850-1-git-send-email-himanshu.madhani@qlogic.com> <1449535747-2850-12-git-send-email-himanshu.madhani@qlogic.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1449535747-2850-12-git-send-email-himanshu.madhani@qlogic.com> Sender: target-devel-owner@vger.kernel.org To: Himanshu Madhani , target-devel@vger.kernel.org, nab@linux-iscsi.org Cc: giridhar.malavali@qlogic.com, linux-scsi@vger.kernel.org List-Id: linux-scsi@vger.kernel.org On 12/08/2015 01:48 AM, Himanshu Madhani wrote: > From: Quinn Tran >=20 > For kernel 3.15 and newer with TCM API change, add detection > for TCM support of TAS. Instead of default command terminate > for LUN/TARGET reset error handling, allow SCSI status to go > out if we know sequece Initiative is own by FW (cmd_sent_to_fw=3D0) >=20 > Signed-off-by: Quinn Tran > Signed-off-by: Himanshu Madhani > --- > drivers/scsi/qla2xxx/qla_target.c | 36 +++++++++++++++++---------= ---------- > drivers/scsi/qla2xxx/tcm_qla2xxx.c | 20 ++++++++++++++++++++ > 2 files changed, 37 insertions(+), 19 deletions(-) >=20 > diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx= /qla_target.c > index 4d42b79..5fca846 100644 > --- a/drivers/scsi/qla2xxx/qla_target.c > +++ b/drivers/scsi/qla2xxx/qla_target.c > @@ -3239,36 +3239,34 @@ int qlt_abort_cmd(struct qla_tgt_cmd *cmd) > struct qla_tgt *tgt =3D cmd->tgt; > struct scsi_qla_host *vha =3D tgt->vha; > struct se_cmd *se_cmd =3D &cmd->se_cmd; > - unsigned long flags,refcount; > + unsigned long flags, refcount; > =20 > ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014, > "qla_target(%d): terminating exchange for aborted cmd=3D%p " > "(se_cmd=3D%p, tag=3D%llu)", vha->vp_idx, cmd, &cmd->se_cmd, > se_cmd->tag); > =20 > - spin_lock_irqsave(&cmd->cmd_lock, flags); > - if (cmd->aborted) { > - spin_unlock_irqrestore(&cmd->cmd_lock, flags); > + spin_lock_irqsave(&cmd->cmd_lock, flags); > =20 > - /* It's normal to see 2 calls in this path: > - * 1) XFER Rdy completion + CMD_T_ABORT > - * 2) TCM TMR - drain_state_list > - */ > - refcount =3D atomic_read(&cmd->se_cmd.cmd_kref.refcount); > - ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff, > - "multiple abort. %p refcount %lx" > - "transport_state %x, t_state %x, se_cmd_flags %x \n", > - cmd, refcount,cmd->se_cmd.transport_state, > - cmd->se_cmd.t_state,cmd->se_cmd.se_cmd_flags); > + if (cmd->aborted) { > + spin_unlock_irqrestore(&cmd->cmd_lock, flags); > + /* It's normal to see 2 calls in this path: > + * 1) XFER Rdy completion + CMD_T_ABORT > + * 2) TCM TMR - drain_state_list > + */ > + refcount =3D atomic_read(&cmd->se_cmd.cmd_kref.refcount); > + ql_dbg(ql_dbg_tgt_mgt, vha, 0xffff, > + "multiple abort. %p refcount %lx" > + "transport_state %x, t_state %x, se_cmd_flags %x \n", > + cmd, refcount, cmd->se_cmd.transport_state, > + cmd->se_cmd.t_state, cmd->se_cmd.se_cmd_flags); > =20 > - return EIO; > - } > + return EIO; > + } > =20 > cmd->aborted =3D 1; > cmd->cmd_flags |=3D BIT_6; > - spin_unlock_irqrestore(&cmd->cmd_lock, flags); > - > - qlt_send_term_exchange(vha, cmd, &cmd->atio, 0, 1); > + spin_unlock_irqrestore(&cmd->cmd_lock, flags); > =20 > return 0; > } > diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xx= x/tcm_qla2xxx.c > index 842fcca..2e9c194 100644 > --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c > +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c > @@ -617,6 +617,26 @@ static int tcm_qla2xxx_queue_status(struct se_cm= d *se_cmd) > struct qla_tgt_cmd, se_cmd); > int xmit_type =3D QLA_TGT_XMIT_STATUS; > =20 > + if (se_cmd->transport_state & CMD_T_ABORTED) { > + /* For TCM TAS support n kernel >=3D 3.15: > + * This cmd is attempting to respond with "Task Aborted Status". > + */ > + if (cmd->aborted) { > + return 0; > + } else if ((cmd->state =3D=3D QLA_TGT_STATE_NEED_DATA) && > + cmd->cmd_sent_to_fw) { > + qlt_abort_cmd(cmd); > + return 0; > + } else if (cmd->state =3D=3D QLA_TGT_STATE_PROCESSED) { > + if (cmd->cmd_sent_to_fw) { > + qlt_abort_cmd(cmd); > + return 0; > + } else { /* about to be free */ > + return 0; > + } > + } > + } > + > cmd->bufflen =3D se_cmd->data_length; > cmd->sg =3D NULL; > cmd->sg_cnt =3D 0; >=20 Reviewed-by: Hannes Reinecke Cheers, Hannes --=20 Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg GF: J. Hawn, J. Guild, F. Imend=F6rffer, HRB 16746 (AG N=FCrnberg)