scsi: lpfc: Fix error handling for mailboxes completed in MBX_POLL mode

In SLI-4, when performing a mailbox command with MBX_POLL, the driver uses
the BMBX register to send the command rather than the MQ. A flag is set
indicating the BMBX register is active and saves the mailbox job struct
(mboxq) in the mbox_active element of the adapter. The routine then waits
for completion or timeout. The mailbox job struct is not freed by the
routine. In cases of timeout, the adapter will be reset. The
lpfc_sli_mbox_sys_flush() routine will clean up the mbox in preparation for
the reset. It clears the BMBX active flag and marks the job structure as
MBX_NOT_FINISHED. But, it never frees the mboxq job structure. Expectation
in both normal completion and timeout cases is that the issuer of the mbx
command will free the structure.  Unfortunately, not all calling paths are
freeing the memory in cases of error.

All calling paths were looked at and updated, if missing, to free the mboxq
memory regardless of completion status.

Link: https://lore.kernel.org/r/20210412013127.2387-7-jsmart2021@gmail.com
Co-developed-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 59ca32d850e3171988c8246e6bb02b511a81f768..e723b716608a9468cafb38ddc864176db6f8c183 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1685,8 +1685,7 @@ lpfc_set_trunking(struct lpfc_hba *phba, char *buff_out)
                lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
                                "0071 Set trunk mode failed with status: %d",
                                rc);
-       if (rc != MBX_TIMEOUT)
-               mempool_free(mbox, phba->mbox_mem_pool);
+       mempool_free(mbox, phba->mbox_mem_pool);
 
        return 0;
 }
@@ -6791,15 +6790,19 @@ lpfc_get_stats(struct Scsi_Host *shost)
        pmboxq->ctx_buf = NULL;
        pmboxq->vport = vport;
 
-       if (vport->fc_flag & FC_OFFLINE_MODE)
+       if (vport->fc_flag & FC_OFFLINE_MODE) {
                rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);
-       else
-               rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
-
-       if (rc != MBX_SUCCESS) {
-               if (rc != MBX_TIMEOUT)
+               if (rc != MBX_SUCCESS) {
                        mempool_free(pmboxq, phba->mbox_mem_pool);
-               return NULL;
+                       return NULL;
+               }
+       } else {
+               rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
+               if (rc != MBX_SUCCESS) {
+                       if (rc != MBX_TIMEOUT)
+                               mempool_free(pmboxq, phba->mbox_mem_pool);
+                       return NULL;
+               }
        }
 
        memset(hs, 0, sizeof (struct fc_host_statistics));
@@ -6823,15 +6826,19 @@ lpfc_get_stats(struct Scsi_Host *shost)
        pmboxq->ctx_buf = NULL;
        pmboxq->vport = vport;
 
-       if (vport->fc_flag & FC_OFFLINE_MODE)
+       if (vport->fc_flag & FC_OFFLINE_MODE) {
                rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);
-       else
-               rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
-
-       if (rc != MBX_SUCCESS) {
-               if (rc != MBX_TIMEOUT)
+               if (rc != MBX_SUCCESS) {
                        mempool_free(pmboxq, phba->mbox_mem_pool);
-               return NULL;
+                       return NULL;
+               }
+       } else {
+               rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
+               if (rc != MBX_SUCCESS) {
+                       if (rc != MBX_TIMEOUT)
+                               mempool_free(pmboxq, phba->mbox_mem_pool);
+                       return NULL;
+               }
        }
 
        hs->link_failure_count = pmb->un.varRdLnk.linkFailureCnt;
@@ -6904,15 +6911,19 @@ lpfc_reset_stats(struct Scsi_Host *shost)
        pmboxq->vport = vport;
 
        if ((vport->fc_flag & FC_OFFLINE_MODE) ||
-               (!(psli->sli_flag & LPFC_SLI_ACTIVE)))
+               (!(psli->sli_flag & LPFC_SLI_ACTIVE))) {
                rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);
-       else
-               rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
-
-       if (rc != MBX_SUCCESS) {
-               if (rc != MBX_TIMEOUT)
+               if (rc != MBX_SUCCESS) {
                        mempool_free(pmboxq, phba->mbox_mem_pool);
-               return;
+                       return;
+               }
+       } else {
+               rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
+               if (rc != MBX_SUCCESS) {
+                       if (rc != MBX_TIMEOUT)
+                               mempool_free(pmboxq, phba->mbox_mem_pool);
+                       return;
+               }
        }
 
        memset(pmboxq, 0, sizeof(LPFC_MBOXQ_t));
@@ -6922,15 +6933,19 @@ lpfc_reset_stats(struct Scsi_Host *shost)
        pmboxq->vport = vport;
 
        if ((vport->fc_flag & FC_OFFLINE_MODE) ||
-           (!(psli->sli_flag & LPFC_SLI_ACTIVE)))
+           (!(psli->sli_flag & LPFC_SLI_ACTIVE))) {
                rc = lpfc_sli_issue_mbox(phba, pmboxq, MBX_POLL);
-       else
+               if (rc != MBX_SUCCESS) {
+                       mempool_free(pmboxq, phba->mbox_mem_pool);
+                       return;
+               }
+       } else {
                rc = lpfc_sli_issue_mbox_wait(phba, pmboxq, phba->fc_ratov * 2);
-
-       if (rc != MBX_SUCCESS) {
-               if (rc != MBX_TIMEOUT)
-                       mempool_free( pmboxq, phba->mbox_mem_pool);
-               return;
+               if (rc != MBX_SUCCESS) {
+                       if (rc != MBX_TIMEOUT)
+                               mempool_free(pmboxq, phba->mbox_mem_pool);
+                       return;
+               }
        }
 
        lso->link_failure_count = pmb->un.varRdLnk.linkFailureCnt;

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 631f22baf45f67ae50e2c5fa9f1607fcb1ff7ba9..be13a5e20efa6363e71462b77771f810ba26b475 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -9654,8 +9654,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)
                                "3250 QUERY_FW_CFG mailbox failed with status "
                                "x%x add_status x%x, mbx status x%x\n",
                                shdr_status, shdr_add_status, rc);
-               if (rc != MBX_TIMEOUT)
-                       mempool_free(mboxq, phba->mbox_mem_pool);
+               mempool_free(mboxq, phba->mbox_mem_pool);
                rc = -ENXIO;
                goto out_error;
        }
@@ -9671,8 +9670,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba)
                        "ulp1_mode:x%x\n", phba->sli4_hba.fw_func_mode,
                        phba->sli4_hba.ulp0_mode, phba->sli4_hba.ulp1_mode);
 
-       if (rc != MBX_TIMEOUT)
-               mempool_free(mboxq, phba->mbox_mem_pool);
+       mempool_free(mboxq, phba->mbox_mem_pool);
 
        /*
         * Set up HBA Event Queues (EQs)
@@ -10270,8 +10268,7 @@ lpfc_pci_function_reset(struct lpfc_hba *phba)
                shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
                shdr_add_status = bf_get(lpfc_mbox_hdr_add_status,
                                         &shdr->response);
-               if (rc != MBX_TIMEOUT)
-                       mempool_free(mboxq, phba->mbox_mem_pool);
+               mempool_free(mboxq, phba->mbox_mem_pool);
                if (shdr_status || shdr_add_status || rc) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
                                        "0495 SLI_FUNCTION_RESET mailbox "

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index cd9943f91effb8045a5cdcd870d45a54354bf84d..3b48e3e88e67c173a46bbaef4c0576e6f12b47e5 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -5680,12 +5680,10 @@ lpfc_sli4_get_ctl_attr(struct lpfc_hba *phba)
                        phba->sli4_hba.lnk_info.lnk_no,
                        phba->BIOSVersion);
 out_free_mboxq:
-       if (rc != MBX_TIMEOUT) {
-               if (bf_get(lpfc_mqe_command, &mboxq->u.mqe) == MBX_SLI4_CONFIG)
-                       lpfc_sli4_mbox_cmd_free(phba, mboxq);
-               else
-                       mempool_free(mboxq, phba->mbox_mem_pool);
-       }
+       if (bf_get(lpfc_mqe_command, &mboxq->u.mqe) == MBX_SLI4_CONFIG)
+               lpfc_sli4_mbox_cmd_free(phba, mboxq);
+       else
+               mempool_free(mboxq, phba->mbox_mem_pool);
        return rc;
 }
 
@@ -5786,12 +5784,10 @@ retrieve_ppname:
        }
 
 out_free_mboxq:
-       if (rc != MBX_TIMEOUT) {
-               if (bf_get(lpfc_mqe_command, &mboxq->u.mqe) == MBX_SLI4_CONFIG)
-                       lpfc_sli4_mbox_cmd_free(phba, mboxq);
-               else
-                       mempool_free(mboxq, phba->mbox_mem_pool);
-       }
+       if (bf_get(lpfc_mqe_command, &mboxq->u.mqe) == MBX_SLI4_CONFIG)
+               lpfc_sli4_mbox_cmd_free(phba, mboxq);
+       else
+               mempool_free(mboxq, phba->mbox_mem_pool);
        return rc;
 }
 
@@ -17079,8 +17075,7 @@ lpfc_rq_destroy(struct lpfc_hba *phba, struct lpfc_queue *hrq,
                                "2509 RQ_DESTROY mailbox failed with "
                                "status x%x add_status x%x, mbx status x%x\n",
                                shdr_status, shdr_add_status, rc);
-               if (rc != MBX_TIMEOUT)
-                       mempool_free(mbox, hrq->phba->mbox_mem_pool);
+               mempool_free(mbox, hrq->phba->mbox_mem_pool);
                return -ENXIO;
        }
        bf_set(lpfc_mbx_rq_destroy_q_id, &mbox->u.mqe.un.rq_destroy.u.request,
@@ -17177,7 +17172,9 @@ lpfc_sli4_post_sgl(struct lpfc_hba *phba,
        shdr = (union lpfc_sli4_cfg_shdr *) &post_sgl_pages->header.cfg_shdr;
        shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
        shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
-       if (rc != MBX_TIMEOUT)
+       if (!phba->sli4_hba.intr_enable)
+               mempool_free(mbox, phba->mbox_mem_pool);
+       else if (rc != MBX_TIMEOUT)
                mempool_free(mbox, phba->mbox_mem_pool);
        if (shdr_status || shdr_add_status || rc) {
                lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
@@ -17374,7 +17371,9 @@ lpfc_sli4_post_sgl_list(struct lpfc_hba *phba,
        shdr = (union lpfc_sli4_cfg_shdr *) &sgl->cfg_shdr;
        shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
        shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
-       if (rc != MBX_TIMEOUT)
+       if (!phba->sli4_hba.intr_enable)
+               lpfc_sli4_mbox_cmd_free(phba, mbox);
+       else if (rc != MBX_TIMEOUT)
                lpfc_sli4_mbox_cmd_free(phba, mbox);
        if (shdr_status || shdr_add_status || rc) {
                lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
@@ -17487,7 +17486,9 @@ lpfc_sli4_post_io_sgl_block(struct lpfc_hba *phba, struct list_head *nblist,
        shdr = (union lpfc_sli4_cfg_shdr *)&sgl->cfg_shdr;
        shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
        shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
-       if (rc != MBX_TIMEOUT)
+       if (!phba->sli4_hba.intr_enable)
+               lpfc_sli4_mbox_cmd_free(phba, mbox);
+       else if (rc != MBX_TIMEOUT)
                lpfc_sli4_mbox_cmd_free(phba, mbox);
        if (shdr_status || shdr_add_status || rc) {
                lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
@@ -18837,8 +18838,7 @@ lpfc_sli4_post_rpi_hdr(struct lpfc_hba *phba, struct lpfc_rpi_hdr *rpi_page)
        shdr = (union lpfc_sli4_cfg_shdr *) &hdr_tmpl->header.cfg_shdr;
        shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
        shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
-       if (rc != MBX_TIMEOUT)
-               mempool_free(mboxq, phba->mbox_mem_pool);
+       mempool_free(mboxq, phba->mbox_mem_pool);
        if (shdr_status || shdr_add_status || rc) {
                lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
                                "2514 POST_RPI_HDR mailbox failed with "
@@ -20082,7 +20082,9 @@ lpfc_wr_object(struct lpfc_hba *phba, struct list_head *dmabuf_list,
                        break;
                }
        }
-       if (rc != MBX_TIMEOUT)
+       if (!phba->sli4_hba.intr_enable)
+               mempool_free(mbox, phba->mbox_mem_pool);
+       else if (rc != MBX_TIMEOUT)
                mempool_free(mbox, phba->mbox_mem_pool);
        if (shdr_status || shdr_add_status || rc) {
                lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,