3 files changed, 32 insertions, 4 deletions

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index a66c4fbc7690..729d343861f4 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -297,6 +297,13 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr,
         len = snprintf(buf, PAGE_SIZE, "NVME Initiator Enabled\n");
 
         spin_lock_irq(shost->host_lock);
+        len += snprintf(buf + len, PAGE_SIZE - len,
+                        "XRI Dist lpfc%d Total %d NVME %d SCSI %d ELS %d\n",
+                        phba->brd_no,
+                        phba->sli4_hba.max_cfg_param.max_xri,
+                        phba->sli4_hba.nvme_xri_max,
+                        phba->sli4_hba.scsi_xri_max,
+                        lpfc_sli4_get_els_iocb_cnt(phba));
 
         /* Port state is only one of two values for now. */
         if (localport->port_id)
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index e790c0bc64fc..1a803975bcbc 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1982,6 +1982,12 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                         if (bf_get_be32(prli_disc, nvpr))
                                 ndlp->nlp_type |= NLP_NVME_DISCOVERY;
 
+                        /* This node is an NVME target.  Adjust the command
+                         * queue depth on this node to not exceed the available
+                         * xris.
+                         */
+                        ndlp->cmd_qdepth = phba->sli4_hba.nvme_xri_max;
+
                         /*
                          * If prli_fba is set, the Target supports FirstBurst.
                          * If prli_fb_sz is 0, the FirstBurst size is unlimited,
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index f5f90d19b215..288dd3caff8a 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -973,9 +973,22 @@ lpfc_nvme_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn,
 
         /* Sanity check on return of outstanding command */
         if (!lpfc_ncmd || !lpfc_ncmd->nvmeCmd || !lpfc_ncmd->nrport) {
+                if (!lpfc_ncmd) {
+                        lpfc_printf_vlog(vport, KERN_ERR,
+                                         LOG_NODE | LOG_NVME_IOERR,
+                                         "6071 Null lpfc_ncmd pointer. No "
+                                         "release, skip completion\n");
+                        return;
+                }
+
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE | LOG_NVME_IOERR,
-                                 "6071 Completion pointers bad on wqe %p.\n",
-                                 wcqe);
+                                 "6066 Missing cmpl ptrs: lpfc_ncmd %p, "
+                                 "nvmeCmd %p nrport %p\n",
+                                 lpfc_ncmd, lpfc_ncmd->nvmeCmd,
+                                 lpfc_ncmd->nrport);
+
+                /* Release the lpfc_ncmd regardless of the missing elements. */
+                lpfc_release_nvme_buf(phba, lpfc_ncmd);
                 return;
         }
         nCmd = lpfc_ncmd->nvmeCmd;
@@ -1537,8 +1550,10 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
             !expedite) {
                 lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_IOERR,
                                  "6174 Fail IO, ndlp qdepth exceeded: "
-                                 "idx %d DID %x\n",
-                                 lpfc_queue_info->index, ndlp->nlp_DID);
+                                 "idx %d DID %x pend %d qdepth %d\n",
+                                 lpfc_queue_info->index, ndlp->nlp_DID,
+                                 atomic_read(&ndlp->cmd_pending),
+                                 ndlp->cmd_qdepth);
                 atomic_inc(&lport->xmt_fcp_qdepth);
                 ret = -EBUSY;
                 goto out_fail;