[SCSI] lpfc 8.2.6 : Multiple discovery fixes
Multiple Discovery Fixes: - Fix race on discovery due to link events coinciding with vport_delete. - Use NLP_FABRIC state to filter out switch-based pseudo initiators that reuse the same WWNs. - Correct erroneous setting of DID=0 in lpfc_matchdid() - Correct extra reference count that was in the lookup path for the remoteid from an unsolicited ELS. - Correct double-free bug in els abort path. - Correct FDMI server discovery logic for switch that return a WWN of 0. - Fix bugs in ndlp mgmt when a node changes address - Correct bug that did not delete RSCNs for vports upon link transitions - Fix "0216 Link event during NS query" error which pops up when vports are swapped to different switch ports. - Add sanity checks on ndlp structures - Fix devloss log message to dump WWN correctly - Hold off mgmt commands that were interferring with discovery mailbox cmds - Remove unnecessary FC_ESTABLISH_LINK logic. - Correct some race conditions in the worker thread, resulting in devloss: - Clear the work_port_events field before handling the work port events - Clear the deferred ring event before handling a deferred ring event - Hold the hba lock when waking up the work thread - Send an acc for the rscn even when we aren't going to handle it - Fix locking behavior that was not properly protecting the ACTIVE flag, thus allowing mailbox command order to shift. Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:

committed by
James Bottomley

parent
b35c07d007
commit
58da1ffb2b
@@ -2648,7 +2648,6 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
|
||||
spin_unlock_irq(&phba->pport->work_port_lock);
|
||||
spin_lock_irq(&phba->hbalock);
|
||||
phba->link_state = LPFC_LINK_UNKNOWN;
|
||||
phba->pport->fc_flag |= FC_ESTABLISH_LINK;
|
||||
psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
|
||||
spin_unlock_irq(&phba->hbalock);
|
||||
|
||||
@@ -2669,8 +2668,7 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
|
||||
lpfc_offline_prep(phba);
|
||||
lpfc_offline(phba);
|
||||
lpfc_sli_brdrestart(phba);
|
||||
if (lpfc_online(phba) == 0) /* Initialize the HBA */
|
||||
mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
|
||||
lpfc_online(phba);
|
||||
lpfc_unblock_mgmt_io(phba);
|
||||
return;
|
||||
}
|
||||
@@ -2687,28 +2685,41 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
|
||||
unsigned long drvr_flag = 0;
|
||||
volatile uint32_t word0, ldata;
|
||||
void __iomem *to_slim;
|
||||
int processing_queue = 0;
|
||||
|
||||
spin_lock_irqsave(&phba->hbalock, drvr_flag);
|
||||
if (!pmbox) {
|
||||
/* processing mbox queue from intr_handler */
|
||||
processing_queue = 1;
|
||||
phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
|
||||
pmbox = lpfc_mbox_get(phba);
|
||||
if (!pmbox) {
|
||||
spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
|
||||
return MBX_SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
if (pmbox->mbox_cmpl && pmbox->mbox_cmpl != lpfc_sli_def_mbox_cmpl &&
|
||||
pmbox->mbox_cmpl != lpfc_sli_wake_mbox_wait) {
|
||||
if(!pmbox->vport) {
|
||||
spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
|
||||
lpfc_printf_log(phba, KERN_ERR,
|
||||
LOG_MBOX | LOG_VPORT,
|
||||
"1806 Mbox x%x failed. No vport\n",
|
||||
pmbox->mb.mbxCommand);
|
||||
dump_stack();
|
||||
return MBX_NOT_FINISHED;
|
||||
goto out_not_finished;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* If the PCI channel is in offline state, do not post mbox. */
|
||||
if (unlikely(pci_channel_offline(phba->pcidev)))
|
||||
return MBX_NOT_FINISHED;
|
||||
if (unlikely(pci_channel_offline(phba->pcidev))) {
|
||||
spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
|
||||
goto out_not_finished;
|
||||
}
|
||||
|
||||
spin_lock_irqsave(&phba->hbalock, drvr_flag);
|
||||
psli = &phba->sli;
|
||||
|
||||
|
||||
mb = &pmbox->mb;
|
||||
status = MBX_SUCCESS;
|
||||
|
||||
@@ -2717,14 +2728,14 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
|
||||
|
||||
/* Mbox command <mbxCommand> cannot issue */
|
||||
LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
|
||||
return MBX_NOT_FINISHED;
|
||||
goto out_not_finished;
|
||||
}
|
||||
|
||||
if (mb->mbxCommand != MBX_KILL_BOARD && flag & MBX_NOWAIT &&
|
||||
!(readl(phba->HCregaddr) & HC_MBINT_ENA)) {
|
||||
spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
|
||||
LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
|
||||
return MBX_NOT_FINISHED;
|
||||
goto out_not_finished;
|
||||
}
|
||||
|
||||
if (psli->sli_flag & LPFC_SLI_MBOX_ACTIVE) {
|
||||
@@ -2738,14 +2749,14 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
|
||||
|
||||
/* Mbox command <mbxCommand> cannot issue */
|
||||
LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
|
||||
return MBX_NOT_FINISHED;
|
||||
goto out_not_finished;
|
||||
}
|
||||
|
||||
if (!(psli->sli_flag & LPFC_SLI2_ACTIVE)) {
|
||||
spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
|
||||
/* Mbox command <mbxCommand> cannot issue */
|
||||
LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
|
||||
return MBX_NOT_FINISHED;
|
||||
goto out_not_finished;
|
||||
}
|
||||
|
||||
/* Another mailbox command is still being processed, queue this
|
||||
@@ -2792,7 +2803,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
|
||||
spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
|
||||
/* Mbox command <mbxCommand> cannot issue */
|
||||
LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
|
||||
return MBX_NOT_FINISHED;
|
||||
goto out_not_finished;
|
||||
}
|
||||
/* timeout active mbox command */
|
||||
mod_timer(&psli->mbox_tmo, (jiffies +
|
||||
@@ -2900,7 +2911,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
|
||||
psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
|
||||
spin_unlock_irqrestore(&phba->hbalock,
|
||||
drvr_flag);
|
||||
return MBX_NOT_FINISHED;
|
||||
goto out_not_finished;
|
||||
}
|
||||
|
||||
/* Check if we took a mbox interrupt while we were
|
||||
@@ -2967,6 +2978,13 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
|
||||
|
||||
spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
|
||||
return status;
|
||||
|
||||
out_not_finished:
|
||||
if (processing_queue) {
|
||||
pmbox->mb.mbxStatus = MBX_NOT_FINISHED;
|
||||
lpfc_mbox_cmpl_put(phba, pmbox);
|
||||
}
|
||||
return MBX_NOT_FINISHED;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -3612,6 +3630,16 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
|
||||
abort_iocb, abort_iotag, abort_context,
|
||||
irsp->ulpStatus, irsp->un.ulpWord[4]);
|
||||
|
||||
/*
|
||||
* If the iocb is not found in Firmware queue the iocb
|
||||
* might have completed already. Do not free it again.
|
||||
*/
|
||||
if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
|
||||
(irsp->un.ulpWord[4] == IOERR_NO_XRI)) {
|
||||
spin_unlock_irq(&phba->hbalock);
|
||||
lpfc_sli_release_iocbq(phba, cmdiocb);
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* make sure we have the right iocbq before taking it
|
||||
* off the txcmplq and try to call completion routine.
|
||||
@@ -4237,10 +4265,15 @@ lpfc_intr_handler(int irq, void *dev_id)
|
||||
pmb->context1 = mp;
|
||||
pmb->context2 = ndlp;
|
||||
pmb->vport = vport;
|
||||
spin_lock(&phba->hbalock);
|
||||
phba->sli.sli_flag &=
|
||||
~LPFC_SLI_MBOX_ACTIVE;
|
||||
spin_unlock(&phba->hbalock);
|
||||
rc = lpfc_sli_issue_mbox(phba,
|
||||
pmb,
|
||||
MBX_NOWAIT);
|
||||
if (rc != MBX_BUSY)
|
||||
lpfc_printf_log(phba,
|
||||
KERN_ERR,
|
||||
LOG_MBOX | LOG_SLI,
|
||||
"0306 rc should have"
|
||||
"been MBX_BUSY");
|
||||
goto send_current_mbox;
|
||||
}
|
||||
}
|
||||
@@ -4253,22 +4286,16 @@ lpfc_intr_handler(int irq, void *dev_id)
|
||||
}
|
||||
if ((work_ha_copy & HA_MBATT) &&
|
||||
(phba->sli.mbox_active == NULL)) {
|
||||
send_next_mbox:
|
||||
spin_lock(&phba->hbalock);
|
||||
phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
|
||||
pmb = lpfc_mbox_get(phba);
|
||||
spin_unlock(&phba->hbalock);
|
||||
send_current_mbox:
|
||||
/* Process next mailbox command if there is one */
|
||||
if (pmb != NULL) {
|
||||
rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
|
||||
if (rc == MBX_NOT_FINISHED) {
|
||||
pmb->mb.mbxStatus = MBX_NOT_FINISHED;
|
||||
lpfc_mbox_cmpl_put(phba, pmb);
|
||||
goto send_next_mbox;
|
||||
}
|
||||
}
|
||||
|
||||
do {
|
||||
rc = lpfc_sli_issue_mbox(phba, NULL,
|
||||
MBX_NOWAIT);
|
||||
} while (rc == MBX_NOT_FINISHED);
|
||||
if (rc != MBX_SUCCESS)
|
||||
lpfc_printf_log(phba, KERN_ERR, LOG_MBOX |
|
||||
LOG_SLI, "0349 rc should be "
|
||||
"MBX_SUCCESS");
|
||||
}
|
||||
|
||||
spin_lock(&phba->hbalock);
|
||||
|
Reference in New Issue
Block a user