lpfc 8.3.41: Fixed freeing of iocb when internal loopback times out
Subsystems (2)
PATCH 1/13 lpfc 8.3.41: Fixed freeing of iocb when internal loopback times out
Fixed freeing of iocb when internal loopback times out
Signed-off-by James Smart <[email protected]>
---
lpfc_bsg.c | 8 +++++--- lpfc_scsi.c | 2 +- lpfc_sli.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ lpfc_sli.h | 5 ++++- 4 files changed, 55 insertions(+), 11 deletions(-)
drivers/scsi/lpfc/lpfc_bsg.c +5 -3
@@ -2498,7 +2498,7 @@ static int lpfcdiag_loop_get_xri(structstruct lpfc_sli_ct_request *ctreq =NULL ;int ret_val =0 ;int time_left; -int iocb_stat =0 ; +int iocb_stat =IOCB_SUCCESS ;unsigned long flags; *txxri =0 ;
@@ -2574,6 +2574,7 @@ static int lpfcdiag_loop_get_xri(struct cmdiocbq->iocb_flag |=LPFC_IO_LIBDFC ; cmdiocbq->vport = phba->pport; + cmdiocbq->iocb_cmpl =NULL ; iocb_stat = lpfc_sli_issue_iocb_wait(phba, LPFC_ELS_RING, cmdiocbq, rspiocbq,
@@ -2963,7 +2964,7 @@ lpfc_bsg_diag_loopback_run(struct fc_bsguint8_t *ptr =NULL , *rx_databuf =NULL ;int rc =0 ;int time_left; -int iocb_stat; +int iocb_stat =IOCB_SUCCESS ;unsigned long flags;void *dataout =NULL ;uint32_t total_mem;
@@ -3149,6 +3150,7 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg } cmdiocbq->iocb_flag |=LPFC_IO_LIBDFC ; cmdiocbq->vport = phba->pport; + cmdiocbq->iocb_cmpl =NULL ; iocb_stat =lpfc_sli_issue_iocb_wait (phba,LPFC_ELS_RING , cmdiocbq, rspiocbq, (phba->fc_ratov *2 ) +LPFC_DRVR_TIMEOUT );
@@ -3209,7 +3211,7 @@ err_loopback_test_exit:lpfc_bsg_event_unref (evt);/* delete */ spin_unlock_irqrestore (&phba->ct_ev_lock, flags); -if (cmdiocbq !=NULL ) +if ((cmdiocbq !=NULL ) && (iocb_stat !=IOCB_TIMEDOUT ))lpfc_sli_release_iocbq (phba, cmdiocbq);if (rspiocbq !=NULL )
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
@@ -5022,6 +5022,7 @@ lpfc_send_taskmgmt(struct lpfc_vport *vplpfc_release_scsi_buf (phba, lpfc_cmd);return FAILED ; } + iocbq->iocb_cmpl = lpfc_tskmgmt_def_cmpl;lpfc_printf_vlog (vport,KERN_INFO ,LOG_FCP , "0702 Issue %s to TGT %d LUN %d "
@@ -5034,7 +5035,6 @@ lpfc_send_taskmgmt(struct lpfc_vport *vp iocbq, iocbqrsp, lpfc_cmd->timeout);if (status !=IOCB_SUCCESS ) {if (status ==IOCB_TIMEDOUT ) { - iocbq->iocb_cmpl = lpfc_tskmgmt_def_cmpl; ret =TIMEOUT_ERROR ; }else ret =FAILED ;
drivers/scsi/lpfc/lpfc_sli.c +45 -6
84 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.h +4 -1
@@ -60,7 +60,8 @@ struct lpfc_iocbq {uint8_t retry;/* retry counter for IOCB cmd - if needed */ uint16_t iocb_flag;#define LPFC_IO_LIBDFC 1/* libdfc iocb */ -#define LPFC_IO_WAKE 2/* High Priority Queue signal flag */ +#define LPFC_IO_WAKE 2/* Synchronous I/O completed */ +#define LPFC_IO_WAKE_TMO LPFC_IO_WAKE/* Synchronous I/O timed out */ #define LPFC_IO_FCP 4/* FCP command -- iocbq in scsi_buf */ #define LPFC_DRIVER_ABORTED 8/* driver aborted this request */ #define LPFC_IO_FABRIC 0x10/* Iocb send using fabric scheduler */
@@ -93,6 +94,8 @@ struct lpfc_iocbq {void (*fabric_iocb_cmpl) (struct lpfc_hba *,struct lpfc_iocbq *,struct lpfc_iocbq *); +void (*wait_iocb_cmpl) (struct lpfc_hba *,struct lpfc_iocbq *, +struct lpfc_iocbq *);void (*iocb_cmpl) (struct lpfc_hba *,struct lpfc_iocbq *,struct lpfc_iocbq *); };