[SCSI] lpfc 8.3.17: Code Cleanup and Locking fixes

- Move Unload flag earlier in vport deletei to stop ELS traffic
- Replaced some unnecessary spin_lock_irqsave with spin_lock_irq
- Fixed circular spinlock dependency between low-level driver and SCSI midlayer
- Remove duplicate code from lpfc_els_retry routine
- Make all error values negative

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

1 files changed, 60 insertions, 40 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 23a47e536858..bbbd8ba5c1a7 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1730,10 +1730,11 @@ lpfc_sli_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
 void
 lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
+        struct lpfc_vport  *vport = pmb->vport;
         struct lpfc_dmabuf *mp;
+        struct lpfc_nodelist *ndlp;
         uint16_t rpi, vpi;
         int rc;
-        struct lpfc_vport  *vport = pmb->vport;
 
         mp = (struct lpfc_dmabuf *) (pmb->context1);
 
@@ -1774,6 +1775,12 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                         return;
         }
 
+        if (pmb->u.mb.mbxCommand == MBX_REG_LOGIN64) {
+                ndlp = (struct lpfc_nodelist *)pmb->context2;
+                lpfc_nlp_put(ndlp);
+                pmb->context2 = NULL;
+        }
+
         if (bf_get(lpfc_mqe_command, &pmb->u.mqe) == MBX_SLI4_CONFIG)
                 lpfc_sli4_mbox_cmd_free(phba, pmb);
         else
@@ -4186,7 +4193,7 @@ lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba,
  *
  * Return codes
  *      0 - successful
- *      ENOMEM - could not allocated memory.
+ *      -ENOMEM - could not allocated memory.
  **/
 static int
 lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,
@@ -9724,8 +9731,8 @@ out_fail:
  * command to finish before continuing.
  *
  * On success this function will return a zero. If unable to allocate enough
- * memory this function will return ENOMEM. If the queue create mailbox command
- * fails this function will return ENXIO.
+ * memory this function will return -ENOMEM. If the queue create mailbox command
+ * fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_eq_create(struct lpfc_hba *phba, struct lpfc_queue *eq, uint16_t imax)
@@ -9840,8 +9847,8 @@ lpfc_eq_create(struct lpfc_hba *phba, struct lpfc_queue *eq, uint16_t imax)
  * command to finish before continuing.
  *
  * On success this function will return a zero. If unable to allocate enough
- * memory this function will return ENOMEM. If the queue create mailbox command
- * fails this function will return ENXIO.
+ * memory this function will return -ENOMEM. If the queue create mailbox command
+ * fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_cq_create(struct lpfc_hba *phba, struct lpfc_queue *cq,
@@ -10011,8 +10018,8 @@ lpfc_mq_create_fb_init(struct lpfc_hba *phba, struct lpfc_queue *mq,
  * command to finish before continuing.
  *
  * On success this function will return a zero. If unable to allocate enough
- * memory this function will return ENOMEM. If the queue create mailbox command
- * fails this function will return ENXIO.
+ * memory this function will return -ENOMEM. If the queue create mailbox command
+ * fails this function will return -ENXIO.
  **/
 int32_t
 lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq,
@@ -10146,8 +10153,8 @@ out:
  * command to finish before continuing.
  *
  * On success this function will return a zero. If unable to allocate enough
- * memory this function will return ENOMEM. If the queue create mailbox command
- * fails this function will return ENXIO.
+ * memory this function will return -ENOMEM. If the queue create mailbox command
+ * fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,
@@ -10234,8 +10241,8 @@ out:
  * mailbox command to finish before continuing.
  *
  * On success this function will return a zero. If unable to allocate enough
- * memory this function will return ENOMEM. If the queue create mailbox command
- * fails this function will return ENXIO.
+ * memory this function will return -ENOMEM. If the queue create mailbox command
+ * fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq,
@@ -10403,7 +10410,7 @@ out:
  * The @eq struct is used to get the queue ID of the queue to destroy.
  *
  * On success this function will return a zero. If the queue destroy mailbox
- * command fails this function will return ENXIO.
+ * command fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_eq_destroy(struct lpfc_hba *phba, struct lpfc_queue *eq)
@@ -10458,7 +10465,7 @@ lpfc_eq_destroy(struct lpfc_hba *phba, struct lpfc_queue *eq)
  * The @cq struct is used to get the queue ID of the queue to destroy.
  *
  * On success this function will return a zero. If the queue destroy mailbox
- * command fails this function will return ENXIO.
+ * command fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_cq_destroy(struct lpfc_hba *phba, struct lpfc_queue *cq)
@@ -10511,7 +10518,7 @@ lpfc_cq_destroy(struct lpfc_hba *phba, struct lpfc_queue *cq)
  * The @mq struct is used to get the queue ID of the queue to destroy.
  *
  * On success this function will return a zero. If the queue destroy mailbox
- * command fails this function will return ENXIO.
+ * command fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_mq_destroy(struct lpfc_hba *phba, struct lpfc_queue *mq)
@@ -10564,7 +10571,7 @@ lpfc_mq_destroy(struct lpfc_hba *phba, struct lpfc_queue *mq)
  * The @wq struct is used to get the queue ID of the queue to destroy.
  *
  * On success this function will return a zero. If the queue destroy mailbox
- * command fails this function will return ENXIO.
+ * command fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_wq_destroy(struct lpfc_hba *phba, struct lpfc_queue *wq)
@@ -10616,7 +10623,7 @@ lpfc_wq_destroy(struct lpfc_hba *phba, struct lpfc_queue *wq)
  * The @rq struct is used to get the queue ID of the queue to destroy.
  *
  * On success this function will return a zero. If the queue destroy mailbox
- * command fails this function will return ENXIO.
+ * command fails this function will return -ENXIO.
  **/
 uint32_t
 lpfc_rq_destroy(struct lpfc_hba *phba, struct lpfc_queue *hrq,
@@ -11819,7 +11826,7 @@ lpfc_sli4_handle_received_buffer(struct lpfc_hba *phba,
  *
  * Return codes
  *      0 - successful
- *      EIO - The mailbox failed to complete successfully.
+ *      -EIO - The mailbox failed to complete successfully.
  *      When this error occurs, the driver is not guaranteed
  *      to have any rpi regions posted to the device and
  *      must either attempt to repost the regions or take a
@@ -11857,8 +11864,8 @@ lpfc_sli4_post_all_rpi_hdrs(struct lpfc_hba *phba)
  *
  * Return codes
  *      0 - successful
- *      ENOMEM - No available memory
- *      EIO - The mailbox failed to complete successfully.
+ *      -ENOMEM - No available memory
+ *      -EIO - The mailbox failed to complete successfully.
  **/
 int
 lpfc_sli4_post_rpi_hdr(struct lpfc_hba *phba, struct lpfc_rpi_hdr *rpi_page)
@@ -12805,8 +12812,11 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport)
         LPFC_MBOXQ_t *mb, *nextmb;
         struct lpfc_dmabuf *mp;
         struct lpfc_nodelist *ndlp;
+        struct lpfc_nodelist *act_mbx_ndlp = NULL;
         struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+        LIST_HEAD(mbox_cmd_list);
 
+        /* Clean up internally queued mailbox commands with the vport */
         spin_lock_irq(&phba->hbalock);
         list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {
                 if (mb->vport != vport)
@@ -12816,6 +12826,28 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport)
                         (mb->u.mb.mbxCommand != MBX_REG_VPI))
                         continue;
 
+                list_del(&mb->list);
+                list_add_tail(&mb->list, &mbox_cmd_list);
+        }
+        /* Clean up active mailbox command with the vport */
+        mb = phba->sli.mbox_active;
+        if (mb && (mb->vport == vport)) {
+                if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) ||
+                        (mb->u.mb.mbxCommand == MBX_REG_VPI))
+                        mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                if (mb->u.mb.mbxCommand == MBX_REG_LOGIN64) {
+                        act_mbx_ndlp = (struct lpfc_nodelist *)mb->context2;
+                        /* Put reference count for delayed processing */
+                        act_mbx_ndlp = lpfc_nlp_get(act_mbx_ndlp);
+                        /* Unregister the RPI when mailbox complete */
+                        mb->mbox_flag |= LPFC_MBX_IMED_UNREG;
+                }
+        }
+        spin_unlock_irq(&phba->hbalock);
+
+        /* Release the cleaned-up mailbox commands */
+        while (!list_empty(&mbox_cmd_list)) {
+                list_remove_head(&mbox_cmd_list, mb, LPFC_MBOXQ_t, list);
                 if (mb->u.mb.mbxCommand == MBX_REG_LOGIN64) {
                         if (phba->sli_rev == LPFC_SLI_REV4)
                                 __lpfc_sli4_free_rpi(phba,
@@ -12826,36 +12858,24 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport)
                                 kfree(mp);
                         }
                         ndlp = (struct lpfc_nodelist *) mb->context2;
+                        mb->context2 = NULL;
                         if (ndlp) {
                                 spin_lock(shost->host_lock);
                                 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
                                 spin_unlock(shost->host_lock);
                                 lpfc_nlp_put(ndlp);
-                                mb->context2 = NULL;
                         }
                 }
-                list_del(&mb->list);
                 mempool_free(mb, phba->mbox_mem_pool);
         }
-        mb = phba->sli.mbox_active;
-        if (mb && (mb->vport == vport)) {
-                if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) ||
-                        (mb->u.mb.mbxCommand == MBX_REG_VPI))
-                        mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
-                if (mb->u.mb.mbxCommand == MBX_REG_LOGIN64) {
-                        ndlp = (struct lpfc_nodelist *) mb->context2;
-                        if (ndlp) {
-                                spin_lock(shost->host_lock);
-                                ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
-                                spin_unlock(shost->host_lock);
-                                lpfc_nlp_put(ndlp);
-                                mb->context2 = NULL;
-                        }
-                        /* Unregister the RPI when mailbox complete */
-                        mb->mbox_flag |= LPFC_MBX_IMED_UNREG;
-                }
+
+        /* Release the ndlp with the cleaned-up active mailbox command */
+        if (act_mbx_ndlp) {
+                spin_lock(shost->host_lock);
+                act_mbx_ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
+                spin_unlock(shost->host_lock);
+                lpfc_nlp_put(act_mbx_ndlp);
         }
-        spin_unlock_irq(&phba->hbalock);
 }
 
 /**