Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ccf8d1 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.1.9 : Misc Bug Fixes 



Misc Bug Fixes:
- Cap MBX_DOWN_LINK command timeout to 60 seconds
- Fix double free of ndlp object
- Don't free mbox structures on error. The completion handlers expect to do so.
- Clear host attention work items when going offline
- Fixed discovery issues in multi-initiator environments.

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 3a0c56d8

drivers/scsi/lpfc/lpfc_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ lpfc_issue_lip(struct Scsi_Host *host) 
	pmboxq->mb.mbxCommand = MBX_DOWN_LINK;

	pmboxq->mb.mbxOwner = OWN_HOST;



	mbxstatus = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);

	mbxstatus = lpfc_sli_issue_mbox_wait(phba, pmboxq, LPFC_MBOX_TMO * 2);



	if ((mbxstatus == MBX_SUCCESS) && (pmboxq->mb.mbxStatus == 0)) {

		memset((void *)pmboxq, 0, sizeof (LPFC_MBOXQ_t));

drivers/scsi/lpfc/lpfc_els.c

+12 −3
Original line number Diff line number Diff line
@@ -1848,9 +1848,12 @@ static void 
lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,

		  struct lpfc_iocbq * rspiocb)

{

	IOCB_t *irsp;

	struct lpfc_nodelist *ndlp;

	LPFC_MBOXQ_t *mbox = NULL;



	irsp = &rspiocb->iocb;



	ndlp = (struct lpfc_nodelist *) cmdiocb->context1;

	if (cmdiocb->context_un.mbox)

		mbox = cmdiocb->context_un.mbox;
@@ -1893,12 +1896,18 @@ lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb, 
			mempool_free( mbox, phba->mbox_mem_pool);

		} else {

			mempool_free( mbox, phba->mbox_mem_pool);

			/* Do not call NO_LIST for lpfc_els_abort'ed ELS cmds */

			if (!((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&

			      ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||

			       (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||

			       (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {

				if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) {

					lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);

					ndlp = NULL;

				}

			}

		}

	}

out:

	if (ndlp) {

		spin_lock_irq(phba->host->host_lock);

drivers/scsi/lpfc/lpfc_hbadisc.c

+3 −0
Original line number Diff line number Diff line
@@ -1557,6 +1557,8 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) 
			mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

		}

	}



	spin_lock_irq(phba->host->host_lock);

	list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {

		if ((mb->mb.mbxCommand == MBX_REG_LOGIN64) &&

		   (ndlp == (struct lpfc_nodelist *) mb->context2)) {
@@ -1569,6 +1571,7 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) 
			mempool_free(mb, phba->mbox_mem_pool);

		}

	}

	spin_unlock_irq(phba->host->host_lock);



	lpfc_els_abort(phba,ndlp,0);

	spin_lock_irq(phba->host->host_lock);

drivers/scsi/lpfc/lpfc_init.c

+1 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,7 @@ lpfc_offline(struct lpfc_hba * phba) 
	/* stop all timers associated with this hba */

	lpfc_stop_timer(phba);

	phba->work_hba_events = 0;

	phba->work_ha = 0;



	lpfc_printf_log(phba,

		       KERN_WARNING,

drivers/scsi/lpfc/lpfc_nportdisc.c

+21 −1
Original line number Diff line number Diff line
@@ -393,6 +393,20 @@ lpfc_rcv_plogi(struct lpfc_hba * phba, 
	mbox->context2  = ndlp;

	ndlp->nlp_flag |= (NLP_ACC_REGLOGIN | NLP_RCV_PLOGI);



	/*

	 * If there is an outstanding PLOGI issued, abort it before

	 * sending ACC rsp for received PLOGI. If pending plogi

	 * is not canceled here, the plogi will be rejected by

	 * remote port and will be retried. On a configuration with

	 * single discovery thread, this will cause a huge delay in

	 * discovery. Also this will cause multiple state machines

	 * running in parallel for this node.

	 */

	if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) {

		/* software abort outstanding PLOGI */

		lpfc_els_abort(phba, ndlp, 1);

	}



	lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox, 0);

	return 1;
@@ -1601,7 +1615,13 @@ lpfc_rcv_padisc_npr_node(struct lpfc_hba * phba, 


	lpfc_rcv_padisc(phba, ndlp, cmdiocb);



	if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {

	/*

	 * Do not start discovery if discovery is about to start

	 * or discovery in progress for this node. Starting discovery

	 * here will affect the counting of discovery threads.

	 */

	if ((!(ndlp->nlp_flag & NLP_DELAY_TMO)) &&

		(ndlp->nlp_flag & NLP_NPR_2B_DISC)){

		if (ndlp->nlp_flag & NLP_NPR_ADISC) {

			ndlp->nlp_prev_state = NLP_STE_NPR_NODE;

			ndlp->nlp_state = NLP_STE_ADISC_ISSUE;