lpfc 8.3.42: Fix driver's abort loop functionality to skip IOs already getting aborted
Subsystems (2)
PATCH 15/18 lpfc 8.3.42: Fix driver's abort loop functionality to skip IOs already getting aborted
Fix driver's abort loop functionality to skip IOs already getting aborted
Signed-off-by James Smart <[email protected]>
---
lpfc_scsi.c | 3 +++ lpfc_sli.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_scsi.c +3 -0
@@ -4886,6 +4886,9 @@ lpfc_abort_handler(struct scsi_cmnd *cmn goto out_unlock; } +/* Indicate the IO is being aborted by the driver. */ + iocb->iocb_flag |=LPFC_DRIVER_ABORTED ; +/* * The scsi command can not be in txq and it is in flight because the * pCmd is still pointig at the SCSI command we have to abort. There
drivers/scsi/lpfc/lpfc_sli.c +11 -1
@@ -9831,6 +9831,13 @@ lpfc_sli_abort_iocb(struct lpfc_vport *v abort_cmd) != 0)continue ; +/* +* If the iocbq is already being aborted, don't take a second +* action, but do count it. +*/ +if (iocbq->iocb_flag &LPFC_DRIVER_ABORTED ) +continue ; +/* issue ABTS for this IOCB based on iotag */ abtsiocb =lpfc_sli_get_iocbq (phba);if (abtsiocb ==NULL ) {
@@ -9838,6 +9845,9 @@ lpfc_sli_abort_iocb(struct lpfc_vport *vcontinue ; } +/* indicate the IO is being aborted by the driver. */ + iocbq->iocb_flag |=LPFC_DRIVER_ABORTED ; + cmd = &iocbq->iocb; abtsiocb->iocb.un.acxri.abortType =ABORT_TYPE_ABTS ; abtsiocb->iocb.un.acxri.abortContextTag = cmd->ulpContext;
@@ -9847,7 +9857,7 @@ lpfc_sli_abort_iocb(struct lpfc_vport *v abtsiocb->iocb.un.acxri.abortIoTag = cmd->ulpIoTag; abtsiocb->iocb.ulpLe =1 ; abtsiocb->iocb.ulpClass = cmd->ulpClass; - abtsiocb->vport = phba->pport; + abtsiocb->vport = vport;/* ABTS WQE must go to the same WQ as the WQE to be aborted */ abtsiocb->fcp_wqidx = iocbq->fcp_wqidx;