microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

scsi: lpfc: Fix SCSI io host reset causing kernel crash 

During SCSI error handling escalation to host reset, the SCSI io
routines were moved off the txcmplq, but the individual io's ON_CMPLQ
flag wasn't cleared.  Thus, a background thread saw the io and attempted
to access it as if on the txcmplq.

Clear the flag upon removal.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
James Smart 2018-01-30 15:58:57 -08:00 коммит произвёл Martin K. Petersen
Родитель a5ff06817e
Коммит c1dd9111b7
2 изменённых файлов: 16 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
drivers/scsi/lpfc/lpfc_init.c
Просмотреть файл

@ -958,6 +958,7 @@ lpfc_hba_clean_txcmplq(struct lpfc_hba *phba)
struct lpfc_sli_ring *pring; struct lpfc_sli_ring *pring;
LIST_HEAD(completions); LIST_HEAD(completions);
int i; int i;
struct lpfc_iocbq *piocb, *next_iocb;
if (phba->sli_rev != LPFC_SLI_REV4) { if (phba->sli_rev != LPFC_SLI_REV4) {
for (i = 0; i < psli->num_rings; i++) { for (i = 0; i < psli->num_rings; i++) {
@ -983,6 +984,9 @@ lpfc_hba_clean_txcmplq(struct lpfc_hba *phba)
if (!pring) if (!pring)
continue; continue;
spin_lock_irq(&pring->ring_lock); spin_lock_irq(&pring->ring_lock);
list_for_each_entry_safe(piocb, next_iocb,
&pring->txcmplq, list)
piocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ;
list_splice_init(&pring->txcmplq, &completions); list_splice_init(&pring->txcmplq, &completions);
pring->txcmplq_cnt = 0; pring->txcmplq_cnt = 0;
spin_unlock_irq(&pring->ring_lock); spin_unlock_irq(&pring->ring_lock);

13
drivers/scsi/lpfc/lpfc_sli.c
Просмотреть файл

@ -3778,6 +3778,7 @@ lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba)
struct lpfc_sli *psli = &phba->sli; struct lpfc_sli *psli = &phba->sli;
struct lpfc_sli_ring *pring; struct lpfc_sli_ring *pring;
uint32_t i; uint32_t i;
struct lpfc_iocbq *piocb, *next_iocb;
spin_lock_irq(&phba->hbalock); spin_lock_irq(&phba->hbalock);
/* Indicate the I/O queues are flushed */ /* Indicate the I/O queues are flushed */
@ -3792,6 +3793,9 @@ lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba)
spin_lock_irq(&pring->ring_lock); spin_lock_irq(&pring->ring_lock);
/* Retrieve everything on txq */ /* Retrieve everything on txq */
list_splice_init(&pring->txq, &txq); list_splice_init(&pring->txq, &txq);
list_for_each_entry_safe(piocb, next_iocb,
&pring->txcmplq, list)
piocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ;
/* Retrieve everything on the txcmplq */ /* Retrieve everything on the txcmplq */
list_splice_init(&pring->txcmplq, &txcmplq); list_splice_init(&pring->txcmplq, &txcmplq);
pring->txq_cnt = 0; pring->txq_cnt = 0;
@ -3813,6 +3817,9 @@ lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba)
spin_lock_irq(&phba->hbalock); spin_lock_irq(&phba->hbalock);
/* Retrieve everything on txq */ /* Retrieve everything on txq */
list_splice_init(&pring->txq, &txq); list_splice_init(&pring->txq, &txq);
list_for_each_entry_safe(piocb, next_iocb,
&pring->txcmplq, list)
piocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ;
/* Retrieve everything on the txcmplq */ /* Retrieve everything on the txcmplq */
list_splice_init(&pring->txcmplq, &txcmplq); list_splice_init(&pring->txcmplq, &txcmplq);
pring->txq_cnt = 0; pring->txq_cnt = 0;
@ -3844,6 +3851,7 @@ lpfc_sli_flush_nvme_rings(struct lpfc_hba *phba)
LIST_HEAD(txcmplq); LIST_HEAD(txcmplq);
struct lpfc_sli_ring *pring; struct lpfc_sli_ring *pring;
uint32_t i; uint32_t i;
struct lpfc_iocbq *piocb, *next_iocb;
if (phba->sli_rev < LPFC_SLI_REV4) if (phba->sli_rev < LPFC_SLI_REV4)
return; return;
@ -3860,8 +3868,11 @@ lpfc_sli_flush_nvme_rings(struct lpfc_hba *phba)
for (i = 0; i < phba->cfg_nvme_io_channel; i++) { for (i = 0; i < phba->cfg_nvme_io_channel; i++) {
pring = phba->sli4_hba.nvme_wq[i]->pring; pring = phba->sli4_hba.nvme_wq[i]->pring;
/* Retrieve everything on the txcmplq */
spin_lock_irq(&pring->ring_lock); spin_lock_irq(&pring->ring_lock);
list_for_each_entry_safe(piocb, next_iocb,
&pring->txcmplq, list)
piocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ;
/* Retrieve everything on the txcmplq */
list_splice_init(&pring->txcmplq, &txcmplq); list_splice_init(&pring->txcmplq, &txcmplq);
pring->txcmplq_cnt = 0; pring->txcmplq_cnt = 0;
spin_unlock_irq(&pring->ring_lock); spin_unlock_irq(&pring->ring_lock);