scsi: lpfc: Reinitialize internal VMID data structures after FLOGI completion

After enabling VMID, an issue LIP test was erasing fabric switch VMID
information.

Introduce a lpfc_reinit_vmid() routine, which reinitializes all VMID data
structures upon FLOGI completion in fabric topology.

Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 6f63e0a..e72a250 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -683,6 +683,7 @@ int lpfc_vmid_get_appid(struct lpfc_vport *vport, char *uuid,
                        union lpfc_vmid_io_tag *tag);
 void lpfc_vmid_vport_cleanup(struct lpfc_vport *vport);
 int lpfc_issue_els_qfpa(struct lpfc_vport *vport);
+void lpfc_reinit_vmid(struct lpfc_vport *vport);
 
 void lpfc_sli_rpi_release(struct lpfc_vport *vport,
                          struct lpfc_nodelist *ndlp);

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 4d3b8f2..264a3db 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1123,6 +1123,9 @@ stop_rr_fcf_flogi:
        if (sp->cmn.priority_tagging)
                vport->phba->pport->vmid_flag |= (LPFC_VMID_ISSUE_QFPA |
                                                  LPFC_VMID_TYPE_PRIO);
+       /* reinitialize the VMID datastructure before returning */
+       if (lpfc_is_vmid_enabled(phba))
+               lpfc_reinit_vmid(vport);
 
        /*
         * Address a timing race with dev_loss.  If dev_loss is active on

diff --git a/drivers/scsi/lpfc/lpfc_vmid.c b/drivers/scsi/lpfc/lpfc_vmid.c
index ed1d7f7..9175982 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_vmid.c
+++ b/drivers/scsi/lpfc/lpfc_vmid.c
@@ -284,3 +284,42 @@ int lpfc_vmid_get_appid(struct lpfc_vport *vport, char *uuid,
        }
        return rc;
 }
+
+/*
+ * lpfc_reinit_vmid - reinitializes the vmid data structure
+ * @vport: pointer to vport data structure
+ *
+ * This routine reinitializes the vmid post flogi completion
+ *
+ * Return codes
+ *     None
+ */
+void
+lpfc_reinit_vmid(struct lpfc_vport *vport)
+{
+       u32 bucket, i, cpu;
+       struct lpfc_vmid *cur;
+       struct lpfc_vmid *vmp = NULL;
+       struct hlist_node *tmp;
+
+       write_lock(&vport->vmid_lock);
+       vport->cur_vmid_cnt = 0;
+
+       for (i = 0; i < vport->max_vmid; i++) {
+               vmp = &vport->vmid[i];
+               vmp->flag = LPFC_VMID_SLOT_FREE;
+               memset(vmp->host_vmid, 0, sizeof(vmp->host_vmid));
+               vmp->io_rd_cnt = 0;
+               vmp->io_wr_cnt = 0;
+
+               if (vmp->last_io_time)
+                       for_each_possible_cpu(cpu)
+                               *per_cpu_ptr(vmp->last_io_time, cpu) = 0;
+       }
+
+       /* for all elements in the hash table */
+       if (!hash_empty(vport->hash_table))
+               hash_for_each_safe(vport->hash_table, bucket, tmp, cur, hnode)
+                       hash_del(&cur->hnode);
+       write_unlock(&vport->vmid_lock);
+}