scsi: lpfc: Handle mailbox timeouts in lpfc_get_sfp_info

The MBX_TIMEOUT return code is not handled in lpfc_get_sfp_info and the
routine unconditionally frees submitted mailbox commands regardless of
return status.  The issue is that for MBX_TIMEOUT cases, when firmware
returns SFP information at a later time, that same mailbox memory region
references previously freed memory in its cmpl routine.

Fix by adding checks for the MBX_TIMEOUT return code.  During mailbox
resource cleanup, check the mbox flag to make sure that the wait did not
timeout.  If the MBOX_WAKE flag is not set, then do not free the resources
because it will be freed when firmware completes the mailbox at a later
time in its cmpl routine.

Also, increase the timeout from 30 to 60 seconds to accommodate boot
scripts requiring longer timeouts.

Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20240628172011.25921-6-justintee8345@gmail.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index b27ebb574bfbbb72f4bdb9268cab908ebbe3f23c..929cbfc95163bfaed2460369c675d53e555333db 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -7302,13 +7302,13 @@ int lpfc_get_sfp_info_wait(struct lpfc_hba *phba,
                mbox->u.mqe.un.mem_dump_type3.addr_hi = putPaddrHigh(mp->phys);
        }
        mbox->vport = phba->pport;
-
-       rc = lpfc_sli_issue_mbox_wait(phba, mbox, 30);
+       rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_SLI4_CONFIG_TMO);
        if (rc == MBX_NOT_FINISHED) {
                rc = 1;
                goto error;
        }
-
+       if (rc == MBX_TIMEOUT)
+               goto error;
        if (phba->sli_rev == LPFC_SLI_REV4)
                mp = mbox->ctx_buf;
        else
@@ -7361,7 +7361,10 @@ int lpfc_get_sfp_info_wait(struct lpfc_hba *phba,
                mbox->u.mqe.un.mem_dump_type3.addr_hi = putPaddrHigh(mp->phys);
        }
 
-       rc = lpfc_sli_issue_mbox_wait(phba, mbox, 30);
+       rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_SLI4_CONFIG_TMO);
+
+       if (rc == MBX_TIMEOUT)
+               goto error;
        if (bf_get(lpfc_mqe_status, &mbox->u.mqe)) {
                rc = 1;
                goto error;
@@ -7372,8 +7375,10 @@ int lpfc_get_sfp_info_wait(struct lpfc_hba *phba,
                             DMP_SFF_PAGE_A2_SIZE);
 
 error:
-       mbox->ctx_buf = mpsave;
-       lpfc_mbox_rsrc_cleanup(phba, mbox, MBOX_THD_UNLOCKED);
+       if (mbox->mbox_flag & LPFC_MBX_WAKE) {
+               mbox->ctx_buf = mpsave;
+               lpfc_mbox_rsrc_cleanup(phba, mbox, MBOX_THD_UNLOCKED);
+       }
 
        return rc;