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 10/21] lpfc: Fix crash in lpfc nvmet when fc port is reset
Date: Wed, 2 Aug 2017 16:36:37 -0700 [thread overview]
Message-ID: <20170802233648.4573-11-jsmart2021@gmail.com> (raw)
In-Reply-To: <20170802233648.4573-1-jsmart2021@gmail.com>
From: Dick Kennedy <dick.kennedy@broadcom.com>
in adapter reset tests, an oops was seen with a NULL pointer in
lpfc_free_rq_buffer+0x20/0x60
The driver is failing to properly repost the nvmet sgl list when
recovering from the reset. Thus the driver eventually trys to
walk an errant buffer list.
Corrected the sgl buffer recovery as well as strengthening the
initialization of the bufferlist.
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
---
drivers/scsi/lpfc/lpfc_init.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 491aa95eb0f6..5f32a7fe169d 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -3226,6 +3226,13 @@ lpfc_offline(struct lpfc_hba *phba)
/* stop port and all timers associated with this hba */
lpfc_stop_port(phba);
+
+ /* Tear down the local and target port registrations. The
+ * nvme transports need to cleanup.
+ */
+ lpfc_nvmet_destroy_targetport(phba);
+ lpfc_nvme_destroy_localport(phba->pport);
+
vports = lpfc_create_vport_work_array(phba);
if (vports != NULL)
for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++)
@@ -6516,6 +6523,12 @@ lpfc_free_nvmet_sgl_list(struct lpfc_hba *phba)
lpfc_nvmet_buf_free(phba, sglq_entry->virt, sglq_entry->phys);
kfree(sglq_entry);
}
+
+ /* Update the nvmet_xri_cnt to reflect no current sgls.
+ * The next initialization cycle sets the count and allocates
+ * the sgls over again.
+ */
+ phba->sli4_hba.nvmet_xri_cnt = 0;
}
/**
@@ -8301,6 +8314,9 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)
goto out_error;
}
+ /* Put list in known state in case driver load fails. */
+ INIT_LIST_HEAD(&qdesc->rqbp->rqb_buffer_list);
+
/* Create NVMET Receive Queue for data */
qdesc = lpfc_sli4_queue_alloc(phba,
phba->sli4_hba.rq_esize,
--
2.13.1
next prev parent reply other threads:[~2017-08-02 23:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-02 23:36 [PATCH 00/21] lpfc updates for 11.4.0.3 James Smart
2017-08-02 23:36 ` [PATCH 01/21] lpfc: Fix opps when ExpressLane is enabled James Smart
2017-08-03 10:43 ` Nikola Pajkovsky
2017-08-05 0:36 ` James Smart
2017-08-02 23:36 ` [PATCH 02/21] lpfc: Fix plogi collision that causes illegal state transition James Smart
2017-08-02 23:36 ` [PATCH 03/21] lpfc: Fix loop mode target discovery James Smart
2017-08-02 23:36 ` [PATCH 04/21] lpfc: Fix rediscovery on switch blade pull James Smart
2017-08-02 23:36 ` [PATCH 05/21] lpfc: Fix oops when NVME Target is discovered in a nonNVME environment James Smart
2017-08-02 23:36 ` [PATCH 06/21] lpfc: convert info messages to standard messages James Smart
2017-08-02 23:36 ` [PATCH 07/21] lpfc: Correct return error codes to align with nvme_fc transport James Smart
2017-08-02 23:36 ` [PATCH 08/21] lpfc: Fix handling of FCP and NVME FC4 types in Pt2Pt topology James Smart
2017-08-02 23:36 ` [PATCH 09/21] lpfc: Fix duplicate NVME rport entries and namespaces James Smart
2017-08-02 23:36 ` James Smart [this message]
2017-08-02 23:36 ` [PATCH 11/21] lpfc: Fix NVME PRLI handling during RSCN James Smart
2017-08-02 23:36 ` [PATCH 12/21] lpfc: Correct issues with FAWWN and FDISCs James Smart
2017-08-02 23:36 ` [PATCH 13/21] lpfc: Limit amount of work processed in IRQ James Smart
2017-08-02 23:36 ` [PATCH 14/21] lpfc: Fix MRQ > 1 context list handling James Smart
2017-08-02 23:36 ` [PATCH 15/21] lpfc: Fix relative offset error on large nvmet target ios James Smart
2017-08-02 23:36 ` [PATCH 16/21] lpfc: Fix nvme target failure after 2nd adapter reset James Smart
2017-08-02 23:36 ` [PATCH 17/21] lpfc: Fix bad sgl reposting " James Smart
2017-08-02 23:36 ` [PATCH 18/21] lpfc: remove console log clutter James Smart
2017-08-02 23:36 ` [PATCH 19/21] lpfc: Add Buffer to Buffer credit recovery support James Smart
2017-08-02 23:36 ` [PATCH 20/21] lpfc: Add new adapter type 6 support James Smart
2017-08-02 23:36 ` [PATCH 21/21] lpfc: lpfc version bump 11.4.0.3 James Smart
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=20170802233648.4573-11-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