lpfc: Fix mailbox command failure during driver initialization
Subsystems (2)
PATCH 1/1 lpfc: Fix mailbox command failure during driver initialization
Contention for the mailbox interface may occur during driver initialization (immediately after a function reset), between mailbox commands initiated via ioctl (bsg) and those driver requested by the driver.
After setting SLI_ACTIVE flag for a port, there is a window in which the driver will allow an ioctl to be initiated while the adapter is initializing and issuing mailbox commands via polling. The polling logic then gets confused.
Correct by having thread setting SLI_ACTIVE spot an active mailbox command and allow it complete before proceeding.
--- drivers/scsi/lpfc/lpfc_sli.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +13 -2
@@ -8158,6 +8158,7 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)struct lpfc_vport *vport = phba->pport;struct lpfc_dmabuf *mp;struct lpfc_rqb *rqbp; +u32 flg;/* Perform a PCI function reset to start from clean */ rc =lpfc_pci_function_reset (phba);
@@ -8171,7 +8172,17 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)else {spin_lock_irq (&phba->hbalock); phba->sli.sli_flag |=LPFC_SLI_ACTIVE ; + flg = phba->sli.sli_flag;spin_unlock_irq (&phba->hbalock); +/* Allow a little time after setting SLI_ACTIVE for any polled +* MBX commands to complete via BSG. +*/ +for (i =0 ; i <50 && (flg &LPFC_SLI_MBOX_ACTIVE ); i++) { +msleep (20 ); +spin_lock_irq (&phba->hbalock); + flg = phba->sli.sli_flag; +spin_unlock_irq (&phba->hbalock); + } }lpfc_sli4_dip (phba);
@@ -9755,7 +9766,7 @@ lpfc_sli_issue_mbox_s4(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,"(%d):2541 Mailbox command x%x " "(x%x/x%x) failure: " "mqe_sta: x%x mcqe_sta: x%x/x%x " -"Data: x%x x%x\n," , +"Data: x%x x%x\n" , mboxq->vport ? mboxq->vport->vpi :0 , mboxq->u.mb.mbxCommand, lpfc_sli_config_mbox_subsys_get(phba,
@@ -9789,7 +9800,7 @@ lpfc_sli_issue_mbox_s4(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,"(%d):2597 Sync Mailbox command " "x%x (x%x/x%x) failure: " "mqe_sta: x%x mcqe_sta: x%x/x%x " -"Data: x%x x%x\n," , +"Data: x%x x%x\n" , mboxq->vport ? mboxq->vport->vpi :0 , mboxq->u.mb.mbxCommand, lpfc_sli_config_mbox_subsys_get(phba,
Signature · 1 line
2.26.2
Martin K. Petersen
AppliedQuoted 11 lines · James Smart
Contention for the mailbox interface may occur during driver initialization (immediately after a function reset), between mailbox commands initiated via ioctl (bsg) and those driver requested by the driver.
After setting
SLI_ACTIVEflag for a port, there is a window in which the driver will allow an ioctl to be initiated while the adapter is initializing and issuing mailbox commands via polling. The polling logic then gets confused.[...]
Applied to 5.16/scsi-queue, thanks!
[1/1] lpfc: Fix mailbox command failure during driver initialization
https://git.kernel.org/mkp/scsi/c/efe1dc571a5b
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering