This is a note to let you know that I've just added the patch titled
scsi: lpfc: Fix FCP hba_wqidx assignment
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
scsi-lpfc-fix-fcp-hba_wqidx-assignment.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 8e036a9497c5d565baafda4c648f2f372999a547 Mon Sep 17 00:00:00 2001
From: Dick Kennedy <dick.kennedy@xxxxxxxxxxxx>
Date: Fri, 29 Sep 2017 17:34:35 -0700
Subject: scsi: lpfc: Fix FCP hba_wqidx assignment
From: Dick Kennedy <dick.kennedy@xxxxxxxxxxxx>
commit 8e036a9497c5d565baafda4c648f2f372999a547 upstream.
The driver is encountering oops in lpfc_sli_calc_ring.
The driver is setting hba_wqidx for FCP based on the policy in use for
NVME. The two may not be the same. Change to set the wqidx based on the
FCP policy.
Signed-off-by: Dick Kennedy <dick.kennedy@xxxxxxxxxxxx>
Signed-off-by: James Smart <james.smart@xxxxxxxxxxxx>
Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx>
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 2893d4fb9654..8c37885f4851 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -9396,10 +9396,13 @@ lpfc_sli4_calc_ring(struct lpfc_hba *phba, struct lpfc_iocbq *piocb)
* for abort iocb hba_wqidx should already
* be setup based on what work queue we used.
*/
- if (!(piocb->iocb_flag & LPFC_USE_FCPWQIDX))
+ if (!(piocb->iocb_flag & LPFC_USE_FCPWQIDX)) {
piocb->hba_wqidx =
lpfc_sli4_scmd_to_wqidx_distr(phba,
piocb->context1);
+ piocb->hba_wqidx = piocb->hba_wqidx %
+ phba->cfg_fcp_io_channel;
+ }
return phba->sli4_hba.fcp_wq[piocb->hba_wqidx]->pring;
} else {
if (unlikely(!phba->sli4_hba.oas_wq))
Patches currently in stable-queue which might be from dick.kennedy@xxxxxxxxxxxx are
queue-4.14/scsi-lpfc-fix-crash-receiving-els-while-detaching-driver.patch
queue-4.14/scsi-lpfc-fix-pci-hot-plug-crash-in-list_add-call.patch
queue-4.14/scsi-lpfc-fix-pci-hot-plug-crash-in-timer-management-routines.patch
queue-4.14/scsi-lpfc-fix-fcp-hba_wqidx-assignment.patch
queue-4.14/scsi-lpfc-fix-oops-if-nvmet_fc_register_targetport-fails.patch