Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2019-02-18 15:53:06 +0100
committerJohannes Thumshirn <jthumshirn@suse.de>2019-02-18 15:53:06 +0100
commit30657522105687f03a442fb7bd4d92a6dba5092d (patch)
treebf82cf55dd8e2980deab9bf1322803d1d378d56d
parent991021fd328b1f8d2d0e1af9c3d2d3aae7adcec4 (diff)
scsi: lpfc: Correct MDS diag and nvmet configuration
(bsc#1125796).
-rw-r--r--patches.fixes/scsi-lpfc-correct-mds-diag-and-nvmet-configuration.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.fixes/scsi-lpfc-correct-mds-diag-and-nvmet-configuration.patch b/patches.fixes/scsi-lpfc-correct-mds-diag-and-nvmet-configuration.patch
new file mode 100644
index 0000000000..be4e339491
--- /dev/null
+++ b/patches.fixes/scsi-lpfc-correct-mds-diag-and-nvmet-configuration.patch
@@ -0,0 +1,42 @@
+From: James Smart <jsmart2021@gmail.com>
+Date: Thu, 16 Aug 2018 16:04:05 -0700
+Subject: scsi: lpfc: Correct MDS diag and nvmet configuration
+Git-commit: 53e13ee087a80e8d4fc95436318436e5c2c1f8c2
+Patch-mainline: v4.19-rc3
+References: bsc#1125796
+
+A recent change added some MDS processing in the lpfc_drain_txq routine
+that relies on the fcp_wq being allocated. For nvmet operation the fcp_wq
+is not allocated because it can only be an nvme-target. When the original
+MDS support was added LS_MDS_LOOPBACK was defined wrong, (0x16) it should
+have been 0x10 (decimal value used for hex setting). This incorrect value
+allowed MDS_LOOPBACK to be set simultaneously with LS_NPIV_FAB_SUPPORTED,
+causing the driver to crash when it accesses the non-existent fcp_wq.
+
+Correct the bad value setting for LS_MDS_LOOPBACK.
+
+Fixes: ae9e28f36a6c ("lpfc: Add MDS Diagnostic support.")
+Cc: <stable@vger.kernel.org> # v4.12+
+Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
+Signed-off-by: James Smart <james.smart@broadcom.com>
+Tested-by: Ewan D. Milne <emilne@redhat.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
+---
+ drivers/scsi/lpfc/lpfc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
+index e0d0da5f43d6..43732e8d1347 100644
+--- a/drivers/scsi/lpfc/lpfc.h
++++ b/drivers/scsi/lpfc/lpfc.h
+@@ -672,7 +672,7 @@ struct lpfc_hba {
+ #define LS_NPIV_FAB_SUPPORTED 0x2 /* Fabric supports NPIV */
+ #define LS_IGNORE_ERATT 0x4 /* intr handler should ignore ERATT */
+ #define LS_MDS_LINK_DOWN 0x8 /* MDS Diagnostics Link Down */
+-#define LS_MDS_LOOPBACK 0x16 /* MDS Diagnostics Link Up (Loopback) */
++#define LS_MDS_LOOPBACK 0x10 /* MDS Diagnostics Link Up (Loopback) */
+
+ uint32_t hba_flag; /* hba generic flags */
+ #define HBA_ERATT_HANDLED 0x1 /* This flag is set when eratt handled */
+
diff --git a/series.conf b/series.conf
index 43aaf8469a..32832a7ba7 100644
--- a/series.conf
+++ b/series.conf
@@ -24042,6 +24042,7 @@
patches.drivers/net-hns-add-netif_carrier_off-before-change-speed-an.patch
patches.drivers/ibmvnic-Include-missing-return-code-checks-in-reset-.patch
patches.fixes/mm-hugetlb-filter-out-hugetlb-pages-if-hugepage-migration-is-not-supported.patch
+ patches.fixes/scsi-lpfc-correct-mds-diag-and-nvmet-configuration.patch
patches.fixes/scsi-hpsa-limit-transfer-length-to-1mb-not-512kb.patch
patches.fixes/cifs-connect-to-servername-instead-of-IP-for-IPC-share.patch
patches.fixes/ceph-avoid-a-use-after-free-in-ceph_destroy_options.patch