From patchwork Sat Sep 30 00:34:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9978891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C3A1460380 for ; Sat, 30 Sep 2017 00:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B673E298D4 for ; Sat, 30 Sep 2017 00:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB4F0298D6; Sat, 30 Sep 2017 00:35:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CCEA298D4 for ; Sat, 30 Sep 2017 00:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752639AbdI3AfK (ORCPT ); Fri, 29 Sep 2017 20:35:10 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:35179 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616AbdI3AfE (ORCPT ); Fri, 29 Sep 2017 20:35:04 -0400 Received: by mail-qk0-f196.google.com with SMTP id o77so782740qke.2; Fri, 29 Sep 2017 17:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1w+WsSIP7O0Lli0jk6FRrxnPkerXjIxRDh5EW/iV05w=; b=EKbT/MNLvQDQH05IyOfxJOSWFl9mcYJaqoS0jGOkuDQH4lYu30fnsEwS8ID6m4UQKE 0XcIwx0lZrv2Ua9b08o8FhWUffwZlKhRNW6Reoaw4pLt+/2jnplDd6Hi/j0YgVVRaj72 xOSX4rc0DOFf/uhObKQGfXWQmWtEardn7UeZfDHp61Eh29EYz6xYrhOp9RiBLmZ/ctq7 UCz53uP9YAVgaLJbiZ1R5EV4B8dp219ynnX/bMM9W4kt00YfZcilli77J4ZjArcXynvk LLWZ1A8nmNoJ8LRMScXgbZiDj7L1idEoBQXKa/Bi/uHu5GhgDcdxCjl9aKvmng4keuxd ekDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1w+WsSIP7O0Lli0jk6FRrxnPkerXjIxRDh5EW/iV05w=; b=rRFzSDvzpbVOSjtiJKofLxoc0qJeuayHEEfetPbwFfuCL4aSsSB0dH8chHqBZXUEZm LmvsKPlzbjxtJlXj009QKGhtEhkV4I8tTE95mIBpwAo9f+LjT9oZ0Oz2PQot9aNQ7yCz GM/vVuebhVgQhb6ruBGWsT0Av6o7lKZ36blRv/klxJPKOrb0ZDganoVBzvDdc8x0byK/ NE64PBrmKrc2GNPHAE1IX76bXR2LX3Fw7bcBDVIHMcd+CnVJvrCvmxLa+H03MZDgD14U LKccQa5gUV7eZvIPWnwayUrLNtHdCrA0eYap0Qu4plHe/XrTr9dvKjwga98RWppC0Ay9 xJaQ== X-Gm-Message-State: AMCzsaV6Ele3s3rlcunJq46ZJGLn52HIGLdk3jxNAQCAyCMlwrxJff3n BzYTgl4OiO+yMmBdN/5tTBk5Ag== X-Google-Smtp-Source: AOwi7QBf4MQL3sZEPSzecwqwbPXZyLFYP7nTk7HrhIDGLUSNYn71u+jF/bnpsveyQdoDG7Dn6Dluyg== X-Received: by 10.55.17.211 with SMTP id 80mr5803807qkr.270.1506731703941; Fri, 29 Sep 2017 17:35:03 -0700 (PDT) Received: from pallmd1.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id u32sm3596918qte.25.2017.09.29.17.35.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Sep 2017 17:35:03 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: Dick Kennedy , stable@vger.kernel.org, James Smart Subject: [PATCH v2 09/21] lpfc: Fix FCP hba_wqidx assignment Date: Fri, 29 Sep 2017 17:34:35 -0700 Message-Id: <20170930003447.10747-10-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170930003447.10747-1-jsmart2021@gmail.com> References: <20170930003447.10747-1-jsmart2021@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dick Kennedy 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. Cc: # 4.12+ Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Johannes Thumshirn --- drivers/scsi/lpfc/lpfc_sli.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index a69332f0abcd..e50f1c1e484d 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))