[SCSI] lpfc 8.3.29: Locking fix and Memory leak Fixes

Locking fix and Memory leak Fixes

- Fix Locking code raises IRQ twice (NA)
- Fix mailbox and vpi memory leaks (126818)

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 2cadb8271f10bf7bc694988ac9a1dd1a6f562ba3..343d87ba4df8f2e58cb2685c02bd86909d64e793 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -2977,9 +2977,9 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
                                "topology\n");
                                /* Get Loop Map information */
                if (bf_get(lpfc_mbx_read_top_il, la)) {
-                       spin_lock_irq(shost->host_lock);
+                       spin_lock(shost->host_lock);
                        vport->fc_flag |= FC_LBIT;
-                       spin_unlock_irq(shost->host_lock);
+                       spin_unlock(shost->host_lock);
                }
 
                vport->fc_myDID = bf_get(lpfc_mbx_read_top_alpa_granted, la);
@@ -3029,9 +3029,9 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
                                phba->sli3_options |= LPFC_SLI3_NPIV_ENABLED;
                }
                vport->fc_myDID = phba->fc_pref_DID;
-               spin_lock_irq(shost->host_lock);
+               spin_lock(shost->host_lock);
                vport->fc_flag |= FC_LBIT;
-               spin_unlock_irq(shost->host_lock);
+               spin_unlock(shost->host_lock);
        }
        spin_unlock_irq(&phba->hbalock);
 

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index a91914968cbbd0bdb13f16632371595f754fcebb..b38f99f3be32b9e6e8bff87809b52d704e766070 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8178,6 +8178,9 @@ lpfc_unset_hba(struct lpfc_hba *phba)
        vport->load_flag |= FC_UNLOADING;
        spin_unlock_irq(shost->host_lock);
 
+       kfree(phba->vpi_bmask);
+       kfree(phba->vpi_ids);
+
        lpfc_stop_hba_timers(phba);
 
        phba->pport->work_port_events = 0;
@@ -8710,6 +8713,9 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev)
        /* Final cleanup of txcmplq and reset the HBA */
        lpfc_sli_brdrestart(phba);
 
+       kfree(phba->vpi_bmask);
+       kfree(phba->vpi_ids);
+
        lpfc_stop_hba_timers(phba);
        spin_lock_irq(&phba->hbalock);
        list_del_init(&vport->listentry);

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 32b6d72cd98da8ac98355c9a7de1a526d12660de..7b6b2aa5795aba306e54830c0224a5fd3c8048be 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -481,6 +481,7 @@ lpfc_mbx_cmpl_resume_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                        ndlp, NULL);
        }
        kfree(elsiocb);
+       mempool_free(mboxq, phba->mbox_mem_pool);
 }
 
 static int

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 73da1c039b9d5cb05790d16a3be80c3014d493ba..e5d22b10ff2f84617eb1cfc544b4c2ee3fbf9250 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -14840,7 +14840,8 @@ lpfc_sli4_resume_rpi(struct lpfc_nodelist *ndlp,
                mboxq->mbox_cmpl = cmpl;
                mboxq->context1 = arg;
                mboxq->context2 = ndlp;
-       }
+       } else
+               mboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
        mboxq->vport = ndlp->vport;
        rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_NOWAIT);
        if (rc == MBX_NOT_FINISHED) {