From: James Smart <jsmart2021@gmail.com>
To: linux-scsi@vger.kernel.org
Cc: Dick Kennedy <dick.kennedy@broadcom.com>,
James Smart <james.smart@broadcom.com>
Subject: [PATCH v3 16/20] lpfc: Fix bad sgl reposting after 2nd adapter reset
Date: Wed, 23 Aug 2017 16:55:45 -0700 [thread overview]
Message-ID: <20170823235549.2883-17-jsmart2021@gmail.com> (raw)
In-Reply-To: <20170823235549.2883-1-jsmart2021@gmail.com>
From: Dick Kennedy <dick.kennedy@broadcom.com>
Fix bad sgl reposting after 2nd adapter reset
port issue was fixed, the hbacmd reset would take
more than 8 minutes to complete.
There were conflicting NVME SGL posting/reposting responsibilities
between lpfc_online()/lpfc_sli4_hba_setup() and
lpfc_nvme_create_localport(). The lpfc_online() causes a REPOST
on existing NVME SGLs which is not released during the fc port reset.
However, lpfc_nvme_create_localport() wants to allocate new NVME
buffers and post them. Both cancelled out each other which had a side
effect of hosing the mailbox handling that was used to remove the sgl
lists - causing multiple 60s mbx timeouts.
Fix by preserving all SGL lists over the fc port reset.
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/lpfc/lpfc_nvme.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index 24dc69de6023..bb9ede2521b9 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -2181,8 +2181,15 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport)
vport->localport = localport;
lport->vport = vport;
vport->nvmei_support = 1;
- len = lpfc_new_nvme_buf(vport, phba->sli4_hba.nvme_xri_max);
- vport->phba->total_nvme_bufs += len;
+
+ /* Don't post more new bufs if repost already recovered
+ * the nvme sgls.
+ */
+ if (phba->sli4_hba.nvme_xri_cnt == 0) {
+ len = lpfc_new_nvme_buf(vport,
+ phba->sli4_hba.nvme_xri_max);
+ vport->phba->total_nvme_bufs += len;
+ }
}
return ret;
--
2.13.1
next prev parent reply other threads:[~2017-08-23 23:56 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 23:55 [PATCH v3 00/20] lpfc updates for 11.4.0.3 James Smart
2017-08-23 23:55 ` [PATCH v3 01/20] lpfc: Fix plogi collision that causes illegal state transition James Smart
2017-08-23 23:55 ` [PATCH v3 02/20] lpfc: Fix loop mode target discovery James Smart
2017-08-23 23:55 ` [PATCH v3 03/20] lpfc: Fix rediscovery on switch blade pull James Smart
2017-08-23 23:55 ` [PATCH v3 04/20] lpfc: Fix oops when NVME Target is discovered in a nonNVME environment James Smart
2017-08-28 10:10 ` Johannes Thumshirn
2017-08-23 23:55 ` [PATCH v3 05/20] lpfc: convert info messages to standard messages James Smart
2017-08-23 23:55 ` [PATCH v3 06/20] lpfc: Correct return error codes to align with nvme_fc transport James Smart
2017-08-23 23:55 ` [PATCH v3 07/20] lpfc: Fix handling of FCP and NVME FC4 types in Pt2Pt topology James Smart
2017-08-28 10:10 ` Johannes Thumshirn
2017-08-23 23:55 ` [PATCH v3 08/20] lpfc: Fix duplicate NVME rport entries and namespaces James Smart
2017-08-23 23:55 ` [PATCH v3 09/20] lpfc: Fix crash in lpfc nvmet when fc port is reset James Smart
2017-08-23 23:55 ` [PATCH v3 10/20] lpfc: Fix NVME PRLI handling during RSCN James Smart
2017-08-23 23:55 ` [PATCH v3 11/20] lpfc: Correct issues with FAWWN and FDISCs James Smart
2017-08-28 10:11 ` Johannes Thumshirn
2017-08-23 23:55 ` [PATCH v3 12/20] lpfc: Limit amount of work processed in IRQ James Smart
2017-08-28 10:11 ` Johannes Thumshirn
2017-08-23 23:55 ` [PATCH v3 13/20] lpfc: Fix MRQ > 1 context list handling James Smart
2017-08-28 10:11 ` Johannes Thumshirn
2017-08-23 23:55 ` [PATCH v3 14/20] lpfc: Fix relative offset error on large nvmet target ios James Smart
2017-08-23 23:55 ` [PATCH v3 15/20] lpfc: Fix nvme target failure after 2nd adapter reset James Smart
2017-08-28 10:12 ` Johannes Thumshirn
2017-08-23 23:55 ` James Smart [this message]
2017-08-23 23:55 ` [PATCH v3 17/20] lpfc: remove console log clutter James Smart
2017-08-23 23:55 ` [PATCH v3 18/20] lpfc: Add Buffer to Buffer credit recovery support James Smart
2017-08-23 23:55 ` [PATCH v3 19/20] scsi: lpfc: fix "integer constant too large" error on 32bit archs James Smart
2017-08-23 23:55 ` [PATCH v3 20/20] lpfc: lpfc version bump 11.4.0.3 James Smart
2017-08-24 3:20 ` [PATCH v3 00/20] lpfc updates for 11.4.0.3 Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170823235549.2883-17-jsmart2021@gmail.com \
--to=jsmart2021@gmail.com \
--cc=dick.kennedy@broadcom.com \
--cc=james.smart@broadcom.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox