| Message ID | 20180816230405.14272-1-jsmart2021@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | lpfc: Correct MDS diag and nvmet configuration | expand |
On Thu, 2018-08-16 at 16:04 -0700, James Smart wrote: > 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> # 4.12 > Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> > Signed-off-by: James Smart <james.smart@broadcom.com> > --- > 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 */ Fixes driver crash when lpfc_enable_nvmet used. Tested-by: Ewan D. Milne <emilne@redhat.com>
James, > 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. Applied to 4.19/scsi-fixes, thanks!
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 */
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> # 4.12 Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> Signed-off-by: James Smart <james.smart@broadcom.com> --- drivers/scsi/lpfc/lpfc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)