lpfc 8.3.31: Fixed system panic due to midlayer abort and driver complete race on SCSI cmd
Subsystems (2)
PATCH 6/20 lpfc 8.3.31: Fixed system panic due to midlayer abort and driver complete race on SCSI cmd
Fixed system panic due to midlayer abort and driver complete race on SCSI cmd
Signed-off-by Alex Iannicelli <[email protected]>
Signed-off-by James Smart <[email protected]>
---
lpfc.h | 1 + lpfc_crtn.h | 1 + lpfc_scsi.c | 48 +++++++++++++++++++++++++++++++++++++----------- lpfc_sli.c | 23 ++++++++++++++--------- lpfc_sli.h | 2 +- 5 files changed, 54 insertions(+), 21 deletions(-)
drivers/scsi/lpfc/lpfc_crtn.h +1 -0
@@ -254,6 +254,7 @@ int lpfc_sli_handle_fast_ring_event(struct lpfc_hba *, struct lpfc_sli_ring *, uint32_t); +struct lpfc_iocbq *__lpfc_sli_get_iocbq (struct lpfc_hba *);struct lpfc_iocbq *lpfc_sli_get_iocbq (struct lpfc_hba *);void lpfc_sli_release_iocbq (struct lpfc_hba *,struct lpfc_iocbq *);uint16_t lpfc_sli_next_iotag (struct lpfc_hba *,struct lpfc_iocbq *);
drivers/scsi/lpfc/lpfc.h +1 -0
@@ -620,6 +620,7 @@ struct lpfc_hba {#define HBA_AER_ENABLED 0x1000/* AER enabled with HBA */ #define HBA_DEVLOSS_TMO 0x2000/* HBA in devloss timeout */ #define HBA_RRQ_ACTIVE 0x4000/* process the rrq active list */ +#define HBA_FCP_IOQ_FLUSH 0x8000/* FCP I/O queues being flushed */ uint32_t fcp_ring_in_use;/* When polling test if intr-hndlr active*/ struct lpfc_dmabuf slim2p;
drivers/scsi/lpfc/lpfc_scsi.c +37 -11
92 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +14 -9
@@ -502,7 +502,7 @@ lpfc_resp_iocb(struct lpfc_hba *phba, st* allocation is successful, it returns pointer to the newly * allocated iocb object else it returns NULL. **/ -static struct lpfc_iocbq * +struct lpfc_iocbq *__lpfc_sli_get_iocbq (struct lpfc_hba *phba) {struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list;
@@ -1259,7 +1259,7 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba struct lpfc_iocbq *piocb) {list_add_tail (&piocb->list, &pring->txcmplq); - piocb->iocb_flag |=LPFC_IO_ON_Q ; + piocb->iocb_flag |=LPFC_IO_ON_TXCMPLQ ; pring->txcmplq_cnt++;if (pring->txcmplq_cnt > pring->txcmplq_max) pring->txcmplq_max = pring->txcmplq_cnt;
@@ -2558,9 +2558,9 @@ lpfc_sli_iocbq_lookup(struct lpfc_hba *pif (iotag !=0 && iotag <= phba->sli.last_iotag) { cmd_iocb = phba->sli.iocbq_lookup[iotag];list_del_init (&cmd_iocb->list); -if (cmd_iocb->iocb_flag &LPFC_IO_ON_Q ) { +if (cmd_iocb->iocb_flag &LPFC_IO_ON_TXCMPLQ ) { pring->txcmplq_cnt--; - cmd_iocb->iocb_flag &= ~LPFC_IO_ON_Q ; + cmd_iocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ ; }return cmd_iocb; }
@@ -2593,14 +2593,14 @@ lpfc_sli_iocbq_lookup_by_tag(struct lpfcif (iotag !=0 && iotag <= phba->sli.last_iotag) { cmd_iocb = phba->sli.iocbq_lookup[iotag]; -list_del_init (&cmd_iocb->list); -if (cmd_iocb->iocb_flag &LPFC_IO_ON_Q ) { - cmd_iocb->iocb_flag &= ~LPFC_IO_ON_Q ; +if (cmd_iocb->iocb_flag &LPFC_IO_ON_TXCMPLQ ) { +/* remove from txcmpl queue list */ +list_del_init (&cmd_iocb->list); + cmd_iocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ ; pring->txcmplq_cnt--; +return cmd_iocb; } -return cmd_iocb; } -lpfc_printf_log (phba,KERN_ERR ,LOG_SLI ,"0372 iotag x%x is out off range: max iotag (x%x)\n" , iotag, phba->sli.last_iotag);
@@ -3468,6 +3468,9 @@ lpfc_sli_flush_fcp_rings(struct lpfc_hba/* Retrieve everything on the txcmplq */ list_splice_init (&pring->txcmplq, &txcmplq); pring->txcmplq_cnt =0 ; + +/* Indicate the I/O queues are flushed */ + phba->hba_flag |=HBA_FCP_IOQ_FLUSH ;spin_unlock_irq (&phba->hbalock);/* Flush the txq */
@@ -6069,6 +6072,8 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phbelse phba->hba_flag &= ~HBA_FIP_SUPPORT ; + phba->hba_flag &= ~HBA_FCP_IOQ_FLUSH ; +if (phba->sli_rev !=LPFC_SLI_REV4 ) {lpfc_printf_log (phba,KERN_ERR ,LOG_MBOX |LOG_SLI , "0376 READ_REV Error. SLI Level %d "
drivers/scsi/lpfc/lpfc_sli.h +1 -1
@@ -68,7 +68,7 @@ struct lpfc_iocbq {#define LPFC_EXCHANGE_BUSY 0x40/* SLI4 hba reported XB in response */ #define LPFC_USE_FCPWQIDX 0x80/* Submit to specified FCPWQ index */ #define DSS_SECURITY_OP 0x100/* security IO */ -#define LPFC_IO_ON_Q 0x200/* The IO is still on the TXCMPLQ */ +#define LPFC_IO_ON_TXCMPLQ 0x200/* The IO is still on the TXCMPLQ */ #define LPFC_IO_DIF 0x400/* T10 DIF IO */ #define LPFC_FIP_ELS_ID_MASK 0xc000/* ELS_ID range 0-3, non-shifted mask */