Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2018-10-12 12:14:58 +0200
committerHannes Reinecke <hare@suse.de>2018-10-12 12:40:41 +0200
commit875b04ae7a89c5684bf82e807a7520426527b7ee (patch)
treec02164fc31492fcf59c4265a002e16a699972b16
parent82af7480e585c712b27d6dcba62411b32bdad8dd (diff)
scsi: qla2xxx: Fix driver hang when FC-NVMe LUNs are configured
(bsc#1108870).
-rw-r--r--patches.fixes/scsi-qla2xxx-Fix-driver-hang-when-FC-NVMe-LUNs-are-c.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.fixes/scsi-qla2xxx-Fix-driver-hang-when-FC-NVMe-LUNs-are-c.patch b/patches.fixes/scsi-qla2xxx-Fix-driver-hang-when-FC-NVMe-LUNs-are-c.patch
new file mode 100644
index 0000000000..d5f610be30
--- /dev/null
+++ b/patches.fixes/scsi-qla2xxx-Fix-driver-hang-when-FC-NVMe-LUNs-are-c.patch
@@ -0,0 +1,39 @@
+From: Himanshu Madhani <himanshu.madhani@cavium.com>
+Date: Wed, 26 Sep 2018 22:05:15 -0700
+Subject: [PATCH] scsi: qla2xxx: Fix driver hang when FC-NVMe LUNs are configured
+Git-commit: 39553065f77c297239308470ee313841f4e07db4
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+Patch-mainline: Queued in subsystem maintainer repository
+References: bsc#1108870
+
+This patch fixes multiple call for qla_nvme_unregister_remote_port() as part
+of qlt_schedule_session_for_deletion(), Do not call it again during
+qla_nvme_delete()
+
+Fixes: e473b3074104 ("scsi: qla2xxx: Add FC-NVMe abort processing")
+Cc: <stable@vger.kernel.org>
+Reviewed-by: Ewan D. Milne <emilne@redhat.com>
+Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Hannes Reinecke <hare@suse.com>
+---
+ drivers/scsi/qla2xxx/qla_nvme.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
+index ad923965be3c..7e78e7eff783 100644
+--- a/drivers/scsi/qla2xxx/qla_nvme.c
++++ b/drivers/scsi/qla2xxx/qla_nvme.c
+@@ -660,9 +660,6 @@ void qla_nvme_delete(struct scsi_qla_host *vha)
+ __func__, fcport);
+
+ nvme_fc_set_remoteport_devloss(fcport->nvme_remote_port, 0);
+- init_completion(&fcport->nvme_del_done);
+- nvme_fc_unregister_remoteport(fcport->nvme_remote_port);
+- wait_for_completion(&fcport->nvme_del_done);
+ }
+
+ if (vha->nvme_local_port) {
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 109f4df8c6..d244e3c58b 100644
--- a/series.conf
+++ b/series.conf
@@ -17925,6 +17925,7 @@
patches.fixes/scsi-qla2xxx-Fix-NVMe-Target-discovery.patch
patches.fixes/scsi-qla2xxx-Fix-duplicate-switch-database-entries.patch
patches.fixes/scsi-qla2xxx-Fix-re-using-LoopID-when-handle-is-in-u.patch
+ patches.fixes/scsi-qla2xxx-Fix-driver-hang-when-FC-NVMe-LUNs-are-c.patch
# git://git.infradead.org/nvme.git nvme-4.20
patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch