From patchwork Fri Jun 3 17:43:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578841 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 882E9C433EF for ; Fri, 3 Jun 2022 17:47:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343667AbiFCRrX (ORCPT ); Fri, 3 Jun 2022 13:47:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345179AbiFCRqg (ORCPT ); Fri, 3 Jun 2022 13:46:36 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D48456C27 for ; Fri, 3 Jun 2022 10:43:36 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id n10so7841410pjh.5 for ; Fri, 03 Jun 2022 10:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4nZIuQJPDMQCsvaW3k+YIxjD0cXeaFIyXLH6YB7a3Fo=; b=hKqk2+7FZ2aHmuRwCwb5g3ll5upGms0dKlppe6boYM/72EYwcGGgk8cc4VnJSsOpLq lM2+IiDOHNPiHT3ajOxS+OWl1bnjVsAfYrBkpYmcWx9VuDdQr4AfAtyt+WdPECKVs/xB XXD5oDDZMYA5FS7rmxoELPjDQqOXs2EbWNlQ1TlipzRUVrjs2Frda6NX9ZO53rJqMygC iht+qMBKHGeTaRJlEJx2NuNSGybF6B4sWoGyuCUmKZ4sKBAu2a6nAWCO00wzz5ciYszb JKej+bs1KP/o7Hs0Vxg//GPj6JGv8da6BKjHC8s6Nf533nkmnOlzgZUe18Hfjd6E/LCN G6oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4nZIuQJPDMQCsvaW3k+YIxjD0cXeaFIyXLH6YB7a3Fo=; b=aaiUZagwfnxo0dpL6i8+b3PAmxx8NFuTC74yXr3wMo7vW5QhLG107vUDOiSWcb75jo HR+KKavihtzIYtV3z9UR1i4PV7ujGsma7pRQehZ+Br7NYzRS6H9a70YnqiJrbWFodKev QFHKmX4UHLkY5vSdutk1QPH9Vhxi1/LIJ4sQgRGPzan08KJqRmrxeETUGp7y2Skfgi6m t5VnKxZKrf1de1nmKbcEFJKj7pP6kkyfCvB+vFDbamyOCaKU1InZkiXsO3WGI23c83G+ /1fBn24pRAXm9cBdZbP6aOF2+ujRkLoHWNvAEY7vID7QmYW6V5H+fPho+h0kzTQ9dww0 dQNw== X-Gm-Message-State: AOAM530cA+zmwjxrU5aCSK2p068TqFjCPi/z+Y/+jQ6t2/QDs9HPgeB9 BSz6X78+XDWZVD5Wu+yksZuZWPrtfhc= X-Google-Smtp-Source: ABdhPJy+ixQSMuzWGPlt1IYQx4UTWfV2vGlq53RGEAFNJ/4jRn9y6L36lFg2SZm1tMHfGEJNDl1nvw== X-Received: by 2002:a17:902:cecb:b0:163:fc74:b6a8 with SMTP id d11-20020a170902cecb00b00163fc74b6a8mr11050034plg.82.1654278215853; Fri, 03 Jun 2022 10:43:35 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:35 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Justin Tee Subject: [PATCH 1/9] lpfc: Correct BDE type for XMIT_SEQ64_WQE in ct_reject_event Date: Fri, 3 Jun 2022 10:43:21 -0700 Message-Id: <20220603174329.63777-2-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org A previous commit assumed all XMIT_SEQ64_WQEs are prepped with the correct BDE type in word 0-2. However, ct_reject_event routine was missed and is still filling out the incorrect BDE type. Fix in ct_reject_event routine so that type BUFF_TYPE_BDE_64 is set instead of BUFF_TYPE_BLP_64. Fixes: 596fc8adb171 ("scsi: lpfc: Fix dmabuf ptr assignment in lpfc_ct_reject_event()") Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_ct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 9d36b20fb878..13dfe285493d 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -197,7 +197,7 @@ lpfc_ct_reject_event(struct lpfc_nodelist *ndlp, memset(bpl, 0, sizeof(struct ulp_bde64)); bpl->addrHigh = le32_to_cpu(putPaddrHigh(mp->phys)); bpl->addrLow = le32_to_cpu(putPaddrLow(mp->phys)); - bpl->tus.f.bdeFlags = BUFF_TYPE_BLP_64; + bpl->tus.f.bdeFlags = BUFF_TYPE_BDE_64; bpl->tus.f.bdeSize = (LPFC_CT_PREAMBLE - 4); bpl->tus.w = le32_to_cpu(bpl->tus.w); From patchwork Fri Jun 3 17:43:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD17EC433EF for ; Fri, 3 Jun 2022 17:47:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344437AbiFCRrF (ORCPT ); Fri, 3 Jun 2022 13:47:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345329AbiFCRqg (ORCPT ); Fri, 3 Jun 2022 13:46:36 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA15356C2C; Fri, 3 Jun 2022 10:43:37 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id 3-20020a17090a174300b001e426a02ac5so9456384pjm.2; Fri, 03 Jun 2022 10:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SFmo1YtzIJ9rmtpE/GhXgq77Pr76QMO7iRfjafIiLu0=; b=DOaMjOtD7xGK0cNLL5ZRRrHaBowV+EmnbJRuvIZOQnRjfBK35/MHWGGcgGI+ugA4Yc aeBIErNDmUc8+C6/HtbbsCk9Z1NljkrlVnthWrgBpKGm4jYXNILCqQUXBTiTpeqNMzR/ XUfnlYjf8ZGcFA+kyPcRPQgftWRiuKjFmaKksyM3ja4FGDnbBXR4nulbkIR1bklPJszu r9vYqDeVoFEqZNXsuxo1tc1A7c/YM6h9hMf/pUMiH5c6KEfCquRmcsxjzXhBTb6IdlaT qxyU7pa1ibPn5ork30bJkoBX0fYwafqEvmeySvX1CFDsZJjVT80dPzJPzP5QbpM40Tmf 7hiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SFmo1YtzIJ9rmtpE/GhXgq77Pr76QMO7iRfjafIiLu0=; b=EbmjM3kr593DsHCoqogbhrsk10galw3n8dMCgdx8qsaz0nlyS77hUwOj57PdgIUI+C W+BdAiwb5EOY7hqhLubMxMuagM45Z/nnVN0ZyCoZu/FnrFLJfY4MUC9ndQ0ouNOjmv7o duuKZ/U6WXd8CZ8M7nQiHIwJR5o6MxN3Vzq6Fo10twxKtub3A5pqWCduw8LbuxY5pipS 8fYQIFuUQ7oFHuedf1CxUhF67B8MEZSObBqzy/63ctPBc4yu35VyfXND5E3ZQ2pehxij V8HV8wttMth3uw4w5SilsS45Dkh1Q64Vny5o62AOR0GVFmYi+0UPxPbrnpK5jAns7wlV cb1g== X-Gm-Message-State: AOAM530FanN9cEqy9rDNWvsKFeRyez2OLlDmiiwkSu+frbb9rrz03xXO 9SpnRqEr3aOqF9Eorm4V+3B4f/0KICs= X-Google-Smtp-Source: ABdhPJw+XqpqJ8OB9TZASqA/8JeEhe8fyUMlPzwLT5FkwqeSDQAN1uyG8C1Kf16l2HiTGKm9QjDwhg== X-Received: by 2002:a17:90b:4c52:b0:1e8:2af5:901e with SMTP id np18-20020a17090b4c5200b001e82af5901emr5568640pjb.180.1654278216714; Fri, 03 Jun 2022 10:43:36 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:36 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , stable@vger.kernel.org, Justin Tee Subject: [PATCH 2/9] lpfc: Resolve some cleanup issues following abort path refactoring Date: Fri, 3 Jun 2022 10:43:22 -0700 Message-Id: <20220603174329.63777-3-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Following refactoring and consolidation of abort paths, - lpfc_sli4_abort_fcp_cmpl and lpfc_sli_abort_fcp_cmpl are combined into a single generic lpfc_sli_abort_fcp_cmpl routine. Thus, remove extraneous lpfc_sli4_abort_fcp_cmpl prototype declaration. - lpfc_nvme_abort_fcreq_cmpl abort completion routine is called with a mismatched argument type. This may result in misleading log message content. Update to the correct argument type of lpfc_iocbq instead of lpfc_wcqe_complete. The lpfc_wcqe_complete should be derived from the lpfc_iocbq structure. Fixes: 31a59f75702f ("scsi: lpfc: SLI path split: Refactor Abort paths") Cc: # v5.18 Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_crtn.h | 4 +--- drivers/scsi/lpfc/lpfc_nvme.c | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h index b1be0dd0337a..f5d74958b664 100644 --- a/drivers/scsi/lpfc/lpfc_crtn.h +++ b/drivers/scsi/lpfc/lpfc_crtn.h @@ -420,8 +420,6 @@ int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, uint32_t, uint32_t); void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *, struct lpfc_iocbq *, struct lpfc_iocbq *); -void lpfc_sli4_abort_fcp_cmpl(struct lpfc_hba *h, struct lpfc_iocbq *i, - struct lpfc_wcqe_complete *w); void lpfc_sli_free_hbq(struct lpfc_hba *, struct hbq_dmabuf *); @@ -630,7 +628,7 @@ void lpfc_nvmet_invalidate_host(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp); void lpfc_nvme_abort_fcreq_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, - struct lpfc_wcqe_complete *abts_cmpl); + struct lpfc_iocbq *rspiocb); void lpfc_create_multixri_pools(struct lpfc_hba *phba); void lpfc_create_destroy_pools(struct lpfc_hba *phba); void lpfc_move_xri_pvt_to_pbl(struct lpfc_hba *phba, u32 hwqid); diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index 335e90633933..88fa630ab93a 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -1787,7 +1787,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, * lpfc_nvme_abort_fcreq_cmpl - Complete an NVME FCP abort request. * @phba: Pointer to HBA context object * @cmdiocb: Pointer to command iocb object. - * @abts_cmpl: Pointer to wcqe complete object. + * @rspiocb: Pointer to response iocb object. * * This is the callback function for any NVME FCP IO that was aborted. * @@ -1796,8 +1796,10 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, **/ void lpfc_nvme_abort_fcreq_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, - struct lpfc_wcqe_complete *abts_cmpl) + struct lpfc_iocbq *rspiocb) { + struct lpfc_wcqe_complete *abts_cmpl = &rspiocb->wcqe_cmpl; + lpfc_printf_log(phba, KERN_INFO, LOG_NVME, "6145 ABORT_XRI_CN completing on rpi x%x " "original iotag x%x, abort cmd iotag x%x " From patchwork Fri Jun 3 17:43:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578842 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58036C43334 for ; Fri, 3 Jun 2022 17:47:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345191AbiFCRrT (ORCPT ); Fri, 3 Jun 2022 13:47:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345193AbiFCRqh (ORCPT ); Fri, 3 Jun 2022 13:46:37 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CB9E546BF; Fri, 3 Jun 2022 10:43:38 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 129so7751304pgc.2; Fri, 03 Jun 2022 10:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K+OvXl8F3WzCqNf70UpmJS6odKLeTjrU7uwEIJKRwK0=; b=frX5HQa6TXSTqO34GUZuEz30tI4uNyWkXHnrxaZC3hh2uswcYnaHz9agEfCuDggXsR iDbfxgkWN1pGOEdYFcAV8bvJ3vZLjB06OBFxGXijQkDGjhyoKVaYGZEz0/102HL7AxzO raf6D6bvuWj/Xlq+LMZoki3pOjXUlxnTtBPL+Q8k5N+AHaDi4whLw55ovSwimld2Dwdc XIKSQvAXcEZLk2qeKh9mCoVG8CiOR0SxXwRRJVTxc+wnKG/yAFndWp5QqivyBJW9GBAV O/78WK304DmljtS+5IkTw4NlJIQtDe0ycDwhDQa1R2sa7bBeszDwWoPUFgWlc3PzRnQP SOqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K+OvXl8F3WzCqNf70UpmJS6odKLeTjrU7uwEIJKRwK0=; b=RMZfz03oUjCXGQVsG9m+rsz1l2HmwQLReMV9XpK5P1afTysyfsTdv/9RtzfNQbpkAz XsFB5O5vINrbefKaU7CoB5YPU0S5IxCvolCo/82/Krryh/NV+Xu62OzENHzYHDDP85tA Br6+wT/EewgHZIJA4qs5V+g7OZDj5uESAscelD/3s+8zU375HoJdCQWSQuTGrPyYRsjV 6u+jPIXqHUdSPnL1W/loYf9FM+LSu+3XVNIGcjIUNGHHUkX+RwD+Fcmjd6y+NA/3YP7F nwhXU6ePjl4jtAi2Fi86ndOpk0MoVjKcJRS2QyQb+VwB7vot3JQRo8bb1mERiuNO6Q6g c7PA== X-Gm-Message-State: AOAM532n+zBh4IEoBz8An3Q1OfdZANJfAyM4fOgxEFWER+ZdJBJIJqtM WYvd8HS7yhyyJzmwXT89lp1OYh4MIWo= X-Google-Smtp-Source: ABdhPJxF3sLPkMdM96wtx7S4Geocn/u6mIKTbkb/TK8amcDOpiy432kP+l6u/u6rKV+5JKIwmutKDA== X-Received: by 2002:a63:8642:0:b0:3fc:a5ee:678 with SMTP id x63-20020a638642000000b003fca5ee0678mr9832639pgd.178.1654278217584; Fri, 03 Jun 2022 10:43:37 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:37 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , stable@vger.kernel.org, Justin Tee Subject: [PATCH 3/9] lpfc: Resolve some cleanup issues following SLI path refactoring Date: Fri, 3 Jun 2022 10:43:23 -0700 Message-Id: <20220603174329.63777-4-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Following refactoring and consolidation in SLI processing, fixup some minor issues related to SLI path. - Correct the setting of LPFC_EXCHANGE_BUSY flag in response iocb. - Fix some typographical errors. - Fix duplicate log messages. Fixes: 1b64aa9eae28 ("scsi: lpfc: SLI path split: Refactor fast and slow paths to native SLI4") Cc: # v5.18 Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 93b94c64518d..750dd1e9f2cc 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -12188,7 +12188,7 @@ lpfc_sli_enable_msi(struct lpfc_hba *phba) rc = pci_enable_msi(phba->pcidev); if (!rc) lpfc_printf_log(phba, KERN_INFO, LOG_INIT, - "0462 PCI enable MSI mode success.\n"); + "0012 PCI enable MSI mode success.\n"); else { lpfc_printf_log(phba, KERN_INFO, LOG_INIT, "0471 PCI enable MSI mode failed (%d)\n", rc); diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 79d2ef5f0f05..dd96fc09105d 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -1930,7 +1930,7 @@ lpfc_issue_cmf_sync_wqe(struct lpfc_hba *phba, u32 ms, u64 total) sync_buf = __lpfc_sli_get_iocbq(phba); if (!sync_buf) { lpfc_printf_log(phba, KERN_ERR, LOG_CGN_MGMT, - "6213 No available WQEs for CMF_SYNC_WQE\n"); + "6244 No available WQEs for CMF_SYNC_WQE\n"); ret_val = ENOMEM; goto out_unlock; } @@ -3805,7 +3805,7 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, set_job_ulpword4(cmdiocbp, IOERR_ABORT_REQUESTED); /* - * For SLI4, irsiocb contains + * For SLI4, irspiocb contains * NO_XRI in sli_xritag, it * shall not affect releasing * sgl (xri) process. @@ -3823,7 +3823,7 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, } } } - (cmdiocbp->cmd_cmpl) (phba, cmdiocbp, saveq); + cmdiocbp->cmd_cmpl(phba, cmdiocbp, saveq); } else lpfc_sli_release_iocbq(phba, cmdiocbp); } else { @@ -4063,8 +4063,7 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba, cmdiocbq->cmd_flag &= ~LPFC_DRIVER_ABORTED; if (cmdiocbq->cmd_cmpl) { spin_unlock_irqrestore(&phba->hbalock, iflag); - (cmdiocbq->cmd_cmpl)(phba, cmdiocbq, - &rspiocbq); + cmdiocbq->cmd_cmpl(phba, cmdiocbq, &rspiocbq); spin_lock_irqsave(&phba->hbalock, iflag); } break; @@ -10288,7 +10287,7 @@ __lpfc_sli_issue_iocb_s3(struct lpfc_hba *phba, uint32_t ring_number, * @flag: Flag indicating if this command can be put into txq. * * __lpfc_sli_issue_fcp_io_s3 is wrapper function to invoke lockless func to - * send an iocb command to an HBA with SLI-4 interface spec. + * send an iocb command to an HBA with SLI-3 interface spec. * * This function takes the hbalock before invoking the lockless version. * The function will return success after it successfully submit the wqe to @@ -12740,7 +12739,7 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba, cmdiocbq->cmd_cmpl = cmdiocbq->wait_cmd_cmpl; cmdiocbq->wait_cmd_cmpl = NULL; if (cmdiocbq->cmd_cmpl) - (cmdiocbq->cmd_cmpl)(phba, cmdiocbq, NULL); + cmdiocbq->cmd_cmpl(phba, cmdiocbq, NULL); else lpfc_sli_release_iocbq(phba, cmdiocbq); return; @@ -12754,9 +12753,9 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba, /* Set the exchange busy flag for task management commands */ if ((cmdiocbq->cmd_flag & LPFC_IO_FCP) && - !(cmdiocbq->cmd_flag & LPFC_IO_LIBDFC)) { + !(cmdiocbq->cmd_flag & LPFC_IO_LIBDFC)) { lpfc_cmd = container_of(cmdiocbq, struct lpfc_io_buf, - cur_iocbq); + cur_iocbq); if (rspiocbq && (rspiocbq->cmd_flag & LPFC_EXCHANGE_BUSY)) lpfc_cmd->flags |= LPFC_SBUF_XBUSY; else @@ -13896,7 +13895,7 @@ void lpfc_sli4_els_xri_abort_event_proc(struct lpfc_hba *phba) * @irspiocbq: Pointer to work-queue completion queue entry. * * This routine handles an ELS work-queue completion event and construct - * a pseudo response ELS IODBQ from the SLI4 ELS WCQE for the common + * a pseudo response ELS IOCBQ from the SLI4 ELS WCQE for the common * discovery engine to handle. * * Return: Pointer to the receive IOCBQ, NULL otherwise. @@ -13940,7 +13939,7 @@ lpfc_sli4_els_preprocess_rspiocbq(struct lpfc_hba *phba, if (bf_get(lpfc_wcqe_c_xb, wcqe)) { spin_lock_irqsave(&phba->hbalock, iflags); - cmdiocbq->cmd_flag |= LPFC_EXCHANGE_BUSY; + irspiocbq->cmd_flag |= LPFC_EXCHANGE_BUSY; spin_unlock_irqrestore(&phba->hbalock, iflags); } @@ -14799,7 +14798,7 @@ lpfc_sli4_fp_handle_fcp_wcqe(struct lpfc_hba *phba, struct lpfc_queue *cq, /* Pass the cmd_iocb and the wcqe to the upper layer */ memcpy(&cmdiocbq->wcqe_cmpl, wcqe, sizeof(struct lpfc_wcqe_complete)); - (cmdiocbq->cmd_cmpl)(phba, cmdiocbq, cmdiocbq); + cmdiocbq->cmd_cmpl(phba, cmdiocbq, cmdiocbq); } else { lpfc_printf_log(phba, KERN_WARNING, LOG_SLI, "0375 FCP cmdiocb not callback function " @@ -18956,7 +18955,7 @@ lpfc_sli4_send_seq_to_ulp(struct lpfc_vport *vport, /* Free iocb created in lpfc_prep_seq */ list_for_each_entry_safe(curr_iocb, next_iocb, - &iocbq->list, list) { + &iocbq->list, list) { list_del_init(&curr_iocb->list); lpfc_sli_release_iocbq(phba, curr_iocb); } From patchwork Fri Jun 3 17:43:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DBECC433EF for ; Fri, 3 Jun 2022 17:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345200AbiFCRrU (ORCPT ); Fri, 3 Jun 2022 13:47:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345237AbiFCRqh (ORCPT ); Fri, 3 Jun 2022 13:46:37 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C79453E1B; Fri, 3 Jun 2022 10:43:39 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id q123so7735591pgq.6; Fri, 03 Jun 2022 10:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8+0I0SHfG0zz73fJ2FA496i9DVz96wphBCcvxAp0CpA=; b=jrSpzUpvJysLpcT9KHdN7iayPW+qGXtismb/MpiHJ4iwHbhvt8rqzRYT6SbrTWeqc/ YwnYqal4iKzgyLCRZ2eq16OSCGI9KR2FOYp2/mL49VYyw2kG2ESxtUDZQ1GTJCa+2zxZ Eyt9DyriY4MDVfJ/XCe/1Qcgli+v5ZJmPjiqjn/0hCg9+NljxcnqQwKB17bJ+pR6JZZi oIZME0vToFc843ET4DfemOaCs/B++i3HMR8jlJWAEYiCg106Acu5yCtbhPHQmMoO1GD9 IUs6wg3Qk6Ek7E/4choP/99ZpjsSyORfugIfIogwVkW29+pJ1y/RKFkc8G6mPsIIgQY/ Mk+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8+0I0SHfG0zz73fJ2FA496i9DVz96wphBCcvxAp0CpA=; b=m80nKyzaumRkqaNZ7FglihvgLKXtc5SBBz1b75v7rjkDZ4lHNYpOCW6t+aPcjk0eBO xrn6px4/ASGM1TxpTqOOCXdSO0PcaDrCsr8WdBYEZRIUoyl2l2sS6IfjUe3iQQP0SA1e Z/Gd65MOlJyZJfWXKZS3zFNvpMEQePMhrc9Wbqr3lXnkjUitSUSt+KbnQcZBRqau1QZA X4f9dBFcvmnfe8H7S8mSiI0K+kP94n5RQREWtjNMfUKLDcmcpJnqU6GPhn6Ame6Zo509 VHUwQ/ddxJ1LAkry1rpBO6Jr7Q357Jl2Db3OP2JDtpdB0dkF2ddhIKX6GbR2vg9dreOj 8Epg== X-Gm-Message-State: AOAM532n9nz7Hkn+7RIJQZsdz4jsrOtgzDRe5uapnC8YcOmsSqRkhfT8 CXCx0pjhsKGiplPpsVF7LBJwolxtOcE= X-Google-Smtp-Source: ABdhPJxSR4y3U82TXHppiIHKpM/WM/aE1pZqWV9Ge54biKSoSKUXkjnLcBXsIS4XRYb5dtT3aJKEyw== X-Received: by 2002:a63:f955:0:b0:3fc:cf92:cd26 with SMTP id q21-20020a63f955000000b003fccf92cd26mr9767628pgk.137.1654278218432; Fri, 03 Jun 2022 10:43:38 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:38 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , stable@vger.kernel.org, Justin Tee Subject: [PATCH 4/9] lpfc: Address null pointer dereference after starget_to_rport() Date: Fri, 3 Jun 2022 10:43:24 -0700 Message-Id: <20220603174329.63777-5-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Calls to starget_to_rport() may return null. Add check for null rport before dereference. Fixes: bb21fc9911ee ("scsi: lpfc: Use fc_block_rport()") Cc: # v5.18 Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_scsi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index f5f4409e24cd..cb5e4e63ac44 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -6060,6 +6060,9 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd) int status; u32 logit = LOG_FCP; + if (!rport) + return FAILED; + rdata = rport->dd_data; if (!rdata || !rdata->pnode) { lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT, @@ -6138,6 +6141,9 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) unsigned long flags; DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq); + if (!rport) + return FAILED; + rdata = rport->dd_data; if (!rdata || !rdata->pnode) { lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT, From patchwork Fri Jun 3 17:43:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578615 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7324ACCA480 for ; Fri, 3 Jun 2022 17:47:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239027AbiFCRrL (ORCPT ); Fri, 3 Jun 2022 13:47:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345341AbiFCRqj (ORCPT ); Fri, 3 Jun 2022 13:46:39 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 171406373 for ; Fri, 3 Jun 2022 10:43:40 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id y187so7748239pgd.3 for ; Fri, 03 Jun 2022 10:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Gcdftwb8mE00o6wiVyVM1abvHyHYZu+SCMr0IEKeM8=; b=qhvvqiFgLaylWsXnyBrDeZRbd4kGykXzQdXt6rz39zsa2snkbloA5ALBrgzPSg25MP dVkFmZP4ExnPu4PgaRwkQAQbznmiZHqi5vdi1zkEK/5mtv5lRUvK4AlvJqoT4eJhYyPX t4VGV7CmT2XSyL2eGLOy3RLiMU05ZhxnRKsmsnLDzYYurmxLJlG6Lf0KOEK6a8hhQRRV 9eiNbZkc7+XQpkmhL+smCeO1gBMF2CgvUPKw78N9B/NkaXbGTJDleMJp5T0apklRG3HB IfgDWHDTeJeTTgdDERXEodTkmg3Z1hGBOyoL2UT/CMhazisUeiMLKuTPu1KhFSKj+c4P tspg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Gcdftwb8mE00o6wiVyVM1abvHyHYZu+SCMr0IEKeM8=; b=4W6JCG6mQu7gOKwpY80IDiFHkLXf7si+WfrXFVwt/62cbWdOIFXTis7pnY7CglWEDg MW7obnY3WFxIRm0RzsIhp9F6/GJCtPdtGGliD5yyk6IVuot5yqtnoApGpVbPDAmh8MQK MngYtBNszOT8KBuI8HnWN2P6+JJ2htv8DbjdI8zeM4TRdzrItzUWcgNVLCEb/HZFwBt3 ke1QvDFoT9hpscmLSa54zTKRP2l/UObz3ryxOCLxNgMBBsCoDePQtCLtD5KULmLvUpH3 7IDFsTZMdqUarSCV+/XptoooIHylvztZXINPO0WgRO6NlfkkcJfMcBuID5J5DnniJcof Z5fg== X-Gm-Message-State: AOAM531C4mrwI2dkWNuXc5hS5Y+mNCz/zvRBPeABxOvdbW3i3o/jmUsl 2ZJ/Nx0HF09TeZojoFhCK91RCnQnP8E= X-Google-Smtp-Source: ABdhPJyrhFhDMunq85iwWKQt+SuMMOA+RlqNMg3tJd7w0t/LxJtlQbI22VMQIKMSosZAHDHQ4SL+ng== X-Received: by 2002:a63:87:0:b0:3fd:5248:9780 with SMTP id 129-20020a630087000000b003fd52489780mr204174pga.159.1654278219463; Fri, 03 Jun 2022 10:43:39 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:39 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Justin Tee Subject: [PATCH 5/9] lpfc: Resolve null ptr dereference after an ELS LOGO is aborted Date: Fri, 3 Jun 2022 10:43:25 -0700 Message-Id: <20220603174329.63777-6-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org A use-after-free crash can occur after an ELS LOGO is aborted. Specifically, a nodelist structure is freed and then ndlp->vport->cfg_log_verbose is dereferenced in lpfc_nlp_get when the discovery state machine is mistakenly called a second time with NLP_EVT_DEVICE_RM argument. Rework lpfc_cmpl_els_logo to prevent the duplicate calls to release a nodelist structure. Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_els.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 51c505d15410..57e189f62e42 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -2998,10 +2998,7 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, ndlp->nlp_DID, ulp_status, ulp_word4); - /* Call NLP_EVT_DEVICE_RM if link is down or LOGO is aborted */ if (lpfc_error_lost_link(ulp_status, ulp_word4)) { - lpfc_disc_state_machine(vport, ndlp, cmdiocb, - NLP_EVT_DEVICE_RM); skip_recovery = 1; goto out; } @@ -3021,18 +3018,10 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, spin_unlock_irq(&ndlp->lock); lpfc_disc_state_machine(vport, ndlp, cmdiocb, NLP_EVT_DEVICE_RM); - lpfc_els_free_iocb(phba, cmdiocb); - lpfc_nlp_put(ndlp); - - /* Presume the node was released. */ - return; + goto out_rsrc_free; } out: - /* Driver is done with the IO. */ - lpfc_els_free_iocb(phba, cmdiocb); - lpfc_nlp_put(ndlp); - /* At this point, the LOGO processing is complete. NOTE: For a * pt2pt topology, we are assuming the NPortID will only change * on link up processing. For a LOGO / PLOGI initiated by the @@ -3059,6 +3048,10 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, ndlp->nlp_DID, ulp_status, ulp_word4, tmo, vport->num_disc_nodes); + + lpfc_els_free_iocb(phba, cmdiocb); + lpfc_nlp_put(ndlp); + lpfc_disc_start(vport); return; } @@ -3075,6 +3068,10 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, lpfc_disc_state_machine(vport, ndlp, cmdiocb, NLP_EVT_DEVICE_RM); } +out_rsrc_free: + /* Driver is done with the I/O. */ + lpfc_els_free_iocb(phba, cmdiocb); + lpfc_nlp_put(ndlp); } /** From patchwork Fri Jun 3 17:43:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578843 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08E84C433EF for ; Fri, 3 Jun 2022 17:47:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235634AbiFCRrN (ORCPT ); Fri, 3 Jun 2022 13:47:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244999AbiFCRqh (ORCPT ); Fri, 3 Jun 2022 13:46:37 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C76F222A5 for ; Fri, 3 Jun 2022 10:43:40 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id g205so7653242pfb.11 for ; Fri, 03 Jun 2022 10:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dZuuFdsa30R1WGJTSTvb66jkpPKSwK0EQB5k/zdw9cg=; b=ZNkJtyXI4GnaXpDZ7Ov/bcz3aPpseYAKw5Fmk9IlI8YG3PzuXAaKBlpNW5DQcZg1jn 1b/AVTPQiQA6oyEBqgR+5040h/0cwOlBgVtGfl5yOvAA7ntB3viGnX5hf0ZIbKlWjKYq 2Mzz6YlNYAU7ZoHWxExI342gZ1vG5z4cZDGWiyAjsTVU0KMMWeCcfXY/txM+qmxpvpAi Z8oFqC4JqGffLHEBEEg5TOUI3tGsWKjOLdprB6yaGC8CifExejc0zTHjfJ43cFItGN/k SYgPT2DE617L06FrOJgY0vPqOUZOwERIfC0MbjCzkGzUm8khvxlygo8YScZZJmRw3dJG vBaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dZuuFdsa30R1WGJTSTvb66jkpPKSwK0EQB5k/zdw9cg=; b=JSkoOk/1WUX6JL1zss1wkWSyBBg9ktKZSNkPKN2G+AyCaFMKAZXjkTL9fSmGCqezCr WQ5Zt3nIPHEe4wZhYXiAb0D7pvjEeyE7uCgo07k0B1T+wM4vJFXhKvn6msjdwm36ckL+ /hQcIJwfdRQRn6VpEbBGZDryLzfk5mzTBNhTvjhl2qkV9shaq2mOEnO2jb43DDocwZH4 j0MX0ip+VOL2h9kI04pZGY5UkGPTTwW6RIbnm4ga2OcWVmPn7ea0DHXKBmulZ526aVi+ fTvSAKaS2RAh+Lg1dRdVcwL0Ytf9k0EYdyn7e5ZWpzkvPNo2k7w6wmjAf5QWj7AApJJf 5m+w== X-Gm-Message-State: AOAM532myY6ApawVSEQ8ESp9FhGsnLj30BklDu95IsxElwwEtFM3gyJh 9Pqh0nyjQt1ewtrkcsc6LwUzFwW4+GY= X-Google-Smtp-Source: ABdhPJzC6SeefG+BvrLMFgIx3bb5kzUwFqGcX9RyihA+Oct7Bg7r7d184Mk/gaF8xjrDykcGH+P9vw== X-Received: by 2002:a63:8a4c:0:b0:3fc:5c99:a194 with SMTP id y73-20020a638a4c000000b003fc5c99a194mr10076876pgd.313.1654278220275; Fri, 03 Jun 2022 10:43:40 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:39 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Justin Tee Subject: [PATCH 6/9] lpfc: Fix port stuck in bypassed state after lip in PT2PT topology Date: Fri, 3 Jun 2022 10:43:26 -0700 Message-Id: <20220603174329.63777-7-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org After issuing a lip, a specific target vendor does not ACC the FLOGI that lpfc sends. However, it does send its own FLOGI that lpfc ACCs. The target then establishes the port IDs by sending a PLOGI. Lpfc PLOGI_ACCs and starts the RPI registration for DID 0x000001. The target then sends a LOGO to the fabric DID. Lpfc is currently treating the LOGO from the fabric DID as a link down and cleans up all the ndlps. The ndlp for DID 0x000001 is put back into NPR and discovery stops, leaving the port in stuck in bypassed mode. Change lpfc behavior such that if a LOGO is received for the fabric DID in PT2PT topology skip the lpfc_linkdown_port routine and just move the fabric DID back to NPR. Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_nportdisc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index 639f86635127..b86ff9fcdf0c 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -834,7 +834,8 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, lpfc_nvmet_invalidate_host(phba, ndlp); if (ndlp->nlp_DID == Fabric_DID) { - if (vport->port_state <= LPFC_FDISC) + if (vport->port_state <= LPFC_FDISC || + vport->fc_flag & FC_PT2PT) goto out; lpfc_linkdown_port(vport); spin_lock_irq(shost->host_lock); From patchwork Fri Jun 3 17:43:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578614 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42330C433EF for ; Fri, 3 Jun 2022 17:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235330AbiFCRrQ (ORCPT ); Fri, 3 Jun 2022 13:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345338AbiFCRqh (ORCPT ); Fri, 3 Jun 2022 13:46:37 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8F58113 for ; Fri, 3 Jun 2022 10:43:41 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id y196so7674259pfb.6 for ; Fri, 03 Jun 2022 10:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H3fGv6f6ahm7AUtf7HLsl1aw/0UhET0VMaciuYsywx8=; b=PGzqV/4ZHA2UsJwvSzgmLgKLBZMNNx1WuS/mfNTrcpPTLXJQitqtEdrbpS5l/SjeVB ckLS/SxQbBTE8J7dVzFSb8kA6kpV6MWRo3tdtT4kFNIaMUyAbRkYxE9UUn0cDzEIUYIU rj6AlWchUwEqHgYRW5ueCbcK/kzMIrA36rZWE8Mm975Da5fzeo9pGhr0PvoWKVzk1yo7 V9aMb9/pSl07mtd8fxEGJj6wJACS1BqdD2u9LX45tmhF8XkIPKAdtKaDAQYgGx7p93iS 259SMFAuWqcVgT06CJy72LZ/jLXsVcHk0+V2UdiBgMJBHHpWaAzGLasiTRDqdCk89EXa mksA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H3fGv6f6ahm7AUtf7HLsl1aw/0UhET0VMaciuYsywx8=; b=p86E9WHBvHPzrwwSZJrGHQKlFMnCqnr7l5yZEkowVohlLhlu8WzgWD3erCevetnRZi jqBpiuQps1JorK3PUvIMJ/zPRUVnS9Yo2XewEQliqEf2hsWVQI8AGAtc4dEiOOJdOIT5 TDwZnPAlC+J6uTo7kNVBq9ZjS4fgOuMrb7frHZekMrPaOtxd2jYQ5mUvnHHzvatc6gch EqKTAnN/ZVtvWSjF0uhHdKDpcTYdxCJWNNAbcMCEPocJgJ+6xMNwoo/jtoO1DJWDObmN g2G4YAX1p9d04m2GrefEwbcVRbV6FFa0JGjKwCs/2RsqQkgOXW2mTWMFf+NCAwol2yth rlRg== X-Gm-Message-State: AOAM532i5tmSRf4w56yOWG2TUff4YEBH5mMWxgBTgjfleb3TxF/UdfDL I0u6cgO11iSQ13ys4J30DAhip6h10XE= X-Google-Smtp-Source: ABdhPJwpg+1gIKOa4hZt+OW95ELQft/5Y6GaPcOZzrprlKejQYo5zTZ5GQh9vamiT1rN2SG9MnBF8g== X-Received: by 2002:a62:868c:0:b0:51b:bd62:4c87 with SMTP id x134-20020a62868c000000b0051bbd624c87mr11243505pfd.83.1654278221183; Fri, 03 Jun 2022 10:43:41 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:40 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Justin Tee Subject: [PATCH 7/9] lpfc: Add more logging of cmd and cqe information for aborted NVME cmds Date: Fri, 3 Jun 2022 10:43:27 -0700 Message-Id: <20220603174329.63777-8-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org When an NVME command is aborted or completes with an ERSP, log the opcode and command id fields to help provide more detail on the failed command. Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_nvme.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index 88fa630ab93a..9cc22cefcb37 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -1065,25 +1065,37 @@ lpfc_nvme_io_cmd_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn, nCmd->rcv_rsplen = wcqe->parameter; nCmd->status = 0; + /* Get the NVME cmd details for this unique error. */ + cp = (struct nvme_fc_cmd_iu *)nCmd->cmdaddr; + ep = (struct nvme_fc_ersp_iu *)nCmd->rspaddr; + /* Check if this is really an ERSP */ if (nCmd->rcv_rsplen == LPFC_NVME_ERSP_LEN) { lpfc_ncmd->status = IOSTAT_SUCCESS; lpfc_ncmd->result = 0; lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME, - "6084 NVME Completion ERSP: " - "xri %x placed x%x\n", - lpfc_ncmd->cur_iocbq.sli4_xritag, - wcqe->total_data_placed); + "6084 NVME FCP_ERR ERSP: " + "xri %x placed x%x opcode x%x cmd_id " + "x%x cqe_status x%x\n", + lpfc_ncmd->cur_iocbq.sli4_xritag, + wcqe->total_data_placed, + cp->sqe.common.opcode, + cp->sqe.common.command_id, + ep->cqe.status); break; } lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT, "6081 NVME Completion Protocol Error: " "xri %x status x%x result x%x " - "placed x%x\n", + "placed x%x opcode x%x cmd_id x%x, " + "cqe_status x%x\n", lpfc_ncmd->cur_iocbq.sli4_xritag, lpfc_ncmd->status, lpfc_ncmd->result, - wcqe->total_data_placed); + wcqe->total_data_placed, + cp->sqe.common.opcode, + cp->sqe.common.command_id, + ep->cqe.status); break; case IOSTAT_LOCAL_REJECT: /* Let fall through to set command final state. */ @@ -1842,6 +1854,7 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport, struct lpfc_nvme_fcpreq_priv *freqpriv; unsigned long flags; int ret_val; + struct nvme_fc_cmd_iu *cp; /* Validate pointers. LLDD fault handling with transport does * have timing races. @@ -1965,10 +1978,16 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport, return; } + /* + * Get Command Id from cmd to plug into response. This + * code is not needed in the next NVME Transport drop. + */ + cp = (struct nvme_fc_cmd_iu *)lpfc_nbuf->nvmeCmd->cmdaddr; lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_ABTS, "6138 Transport Abort NVME Request Issued for " - "ox_id x%x\n", - nvmereq_wqe->sli4_xritag); + "ox_id x%x nvme opcode x%x nvme cmd_id x%x\n", + nvmereq_wqe->sli4_xritag, cp->sqe.common.opcode, + cp->sqe.common.command_id); return; out_unlock: From patchwork Fri Jun 3 17:43:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578844 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F17B1CCA47C for ; Fri, 3 Jun 2022 17:47:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345157AbiFCRrK (ORCPT ); Fri, 3 Jun 2022 13:47:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239027AbiFCRqi (ORCPT ); Fri, 3 Jun 2022 13:46:38 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 911FF532DE for ; Fri, 3 Jun 2022 10:43:42 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id w2-20020a17090ac98200b001e0519fe5a8so7646442pjt.4 for ; Fri, 03 Jun 2022 10:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wewEppFm0xz+tE3mu3MsP/tDp/xuSKRq2CYeWLrIEgw=; b=Epbuzzkt03cr7SRy401aVU1c+PzNCtizaWaaDVn8Vc4iYp2cduCq82u2SaUlbQPrIA JGitcLb3sJGEZkraoVaMzbdguadflZ5Uwym/gohnUuHjf7r7fn/7KNOs8hr2PEsv+Gw7 js69T/UvKnTjCM/DYA/AW1djpM2Gri2yem2i+UCtsDPt1tyXgk3tmXfzkoihG+qTGpB1 FuD8EJ6CFmqFWiN4yB82tAGHqBoUJyiVW0ZN3y1UYWlDBLjo63UifZ2QRyqvvR1GCUy+ tqgaf6ZnIbcMhgcbaq2iJEHhcm20OZzDhoQ3t19uDrqVEnyKN0CwJafjzOmt4obgdaXw C1bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wewEppFm0xz+tE3mu3MsP/tDp/xuSKRq2CYeWLrIEgw=; b=RnNgLGrgiQoaKCwKUCV+ahyJ1LjP8jLDi4hY9rygVCT0gnT6T0L4riHK9A4Ut97CFC H+/1toBmLhIkewiQKrsrzi+Jxsin1y2PH7jx5Q+mTru7iBaY8UixkDzAOm+lU7Y+OWNg xS5hBicSab19Y58Q7vqTsudnX54gE+og/g+Ma3miOfgJzItAvikiq2GY8Q/edzODl95b sSIJLqs+cE5nd4tEmfPPyDXFhR5y5ghuT6wCGurl+XNSJjzaXyvM0nks+8bH4cn6JMQf 41vikqkHw4qa++vKyuFHLQiIR1DXLr1Wf4tKWAQa4bgWutTGakJEw1b/6kptGiCQNGUY qaZQ== X-Gm-Message-State: AOAM530ZV3LMOsC+ldlqujzE8ao5dNfXeXupTtExfHE07Fr8bw8/TueU JTvKfjq/0/rgjMUHrFYOpazuDq29DCo= X-Google-Smtp-Source: ABdhPJxQBN/HCVYfnHpltNXTvfoHgmXTZjbv5IKxxQaThwcJqiH7oO6aZTkYJVb1EUhD/8ARKkj8/w== X-Received: by 2002:a17:90b:1c8e:b0:1bf:364c:dd7a with SMTP id oo14-20020a17090b1c8e00b001bf364cdd7amr11907286pjb.103.1654278221985; Fri, 03 Jun 2022 10:43:41 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:41 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Justin Tee Subject: [PATCH 8/9] lpfc: Allow reduced polling rate for nvme_admin_async_event cmd completion Date: Fri, 3 Jun 2022 10:43:28 -0700 Message-Id: <20220603174329.63777-9-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org NVME Asynchronous Event Request commands have no command timeout value per specifications. Set WQE option to allow a reduced FLUSH polling rate for I/O error detection specifically for nvme_admin_async_event commands. Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_hw4.h | 3 +++ drivers/scsi/lpfc/lpfc_nvme.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h index 8511369d2cf8..f024415731ac 100644 --- a/drivers/scsi/lpfc/lpfc_hw4.h +++ b/drivers/scsi/lpfc/lpfc_hw4.h @@ -4487,6 +4487,9 @@ struct wqe_common { #define wqe_sup_SHIFT 6 #define wqe_sup_MASK 0x00000001 #define wqe_sup_WORD word11 +#define wqe_ffrq_SHIFT 6 +#define wqe_ffrq_MASK 0x00000001 +#define wqe_ffrq_WORD word11 #define wqe_wqec_SHIFT 7 #define wqe_wqec_MASK 0x00000001 #define wqe_wqec_WORD word11 diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index 9cc22cefcb37..cd10ee6482fc 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -1207,7 +1207,8 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport, { struct lpfc_hba *phba = vport->phba; struct nvmefc_fcp_req *nCmd = lpfc_ncmd->nvmeCmd; - struct lpfc_iocbq *pwqeq = &(lpfc_ncmd->cur_iocbq); + struct nvme_common_command *sqe; + struct lpfc_iocbq *pwqeq = &lpfc_ncmd->cur_iocbq; union lpfc_wqe128 *wqe = &pwqeq->wqe; uint32_t req_len; @@ -1264,8 +1265,14 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport, cstat->control_requests++; } - if (pnode->nlp_nvme_info & NLP_NVME_NSLER) + if (pnode->nlp_nvme_info & NLP_NVME_NSLER) { bf_set(wqe_erp, &wqe->generic.wqe_com, 1); + sqe = &((struct nvme_fc_cmd_iu *) + nCmd->cmdaddr)->sqe.common; + if (sqe->opcode == nvme_admin_async_event) + bf_set(wqe_ffrq, &wqe->generic.wqe_com, 1); + } + /* * Finish initializing those WQE fields that are independent * of the nvme_cmnd request_buffer From patchwork Fri Jun 3 17:43:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 578616 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5492C43334 for ; Fri, 3 Jun 2022 17:47:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240024AbiFCRrI (ORCPT ); Fri, 3 Jun 2022 13:47:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345337AbiFCRqh (ORCPT ); Fri, 3 Jun 2022 13:46:37 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B137532F5 for ; Fri, 3 Jun 2022 10:43:43 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id c196so7695812pfb.1 for ; Fri, 03 Jun 2022 10:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=idlBu1mfySjHQkC45ii5O5/kmS1k0uPA+pzZ1dL1QC8=; b=gV+ydNpSBCe5iwuosfFxfHT+T5xOG3sTAo7MwxAICencapsC3xooBZsfDfP0VOMW69 aoe0mcTWnp4GVCyd76u3wKs/66cxv5izlXwmXP+3uGrvqBpyAzB9gkwK71dVA7ZhrIz9 5SQD2m82dYzrRykC91xb2nZUMZyxsibxNXEMSqvvp4uJRxC/shb17Xwo0ZkZdklOL5HP BsVtOW1PUEFXG5RIW1MEuspO3e8IZCPjwQW9FLb96/30QhlURxP0FiLzPMm30u/g0MjC Ad6Fe090ITnMcEZqixRfppjcmXbOLIxPWsXPk3la1g1W+7VLEGQieGylqXOGbb9a9wNp 4LpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=idlBu1mfySjHQkC45ii5O5/kmS1k0uPA+pzZ1dL1QC8=; b=fkpCxjbgyNUvYiZYj4gGfRunTaZoJk53/Dt+RolWwO5MAvkti7vJfRgqHLJ/xd3E9g PU360T3brNtHwTxxk1S62z6snAUZ7U6D2Fmjbq2uQvigZPFyVuq1Wj/EuYqVPP7cGrYp eSceY4lowDJ1VypQib3IlWC9Ods4HrIR6kbbfUjJH/z2TotJlHdlAjEX5X6lXKT0RAeG yS9s0StbRJ+itj57Pt2z8WslSuSGIIQIGHNA2StOCI0pfkFDZwMHWJ2pmVA5P64uqNPm ELz5xDmGm0gw6cQtphnXmKlUimE1G2pHE3c89c6qyX3tD65eR+G8N4K/6eKTIdn/ehu0 vdYQ== X-Gm-Message-State: AOAM531h2W4S3OMaJoly4SCjZJNr3I+xIlxwEENmZ1faq5wnXmoc/wcv wZ6M3v5IsM9DT5jYAb4H0DJoEjqbyZU= X-Google-Smtp-Source: ABdhPJwnIU/5K1lYeOQVN2Kq2uJjTDjRjeLxSJfPSyBORUYbcTQ033EuRPmldQ5wp+awB7YAtLWt+A== X-Received: by 2002:a63:524a:0:b0:3fc:7f18:685d with SMTP id s10-20020a63524a000000b003fc7f18685dmr9994167pgl.387.1654278222874; Fri, 03 Jun 2022 10:43:42 -0700 (PDT) Received: from localhost.localdomain (ip174-67-196-173.oc.oc.cox.net. [174.67.196.173]) by smtp.gmail.com with ESMTPSA id a13-20020a170902710d00b0015e8d4eb1d2sm5705047pll.28.2022.06.03.10.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 10:43:42 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Justin Tee Subject: [PATCH 9/9] lpfc: Update lpfc version to 14.2.0.4 Date: Fri, 3 Jun 2022 10:43:29 -0700 Message-Id: <20220603174329.63777-10-jsmart2021@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20220603174329.63777-1-jsmart2021@gmail.com> References: <20220603174329.63777-1-jsmart2021@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Update lpfc version to 14.2.0.4 Co-developed-by: Justin Tee Signed-off-by: Justin Tee Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h index 4fab79ed58ed..2ab6f7db64d8 100644 --- a/drivers/scsi/lpfc/lpfc_version.h +++ b/drivers/scsi/lpfc/lpfc_version.h @@ -20,7 +20,7 @@ * included with this package. * *******************************************************************/ -#define LPFC_DRIVER_VERSION "14.2.0.3" +#define LPFC_DRIVER_VERSION "14.2.0.4" #define LPFC_DRIVER_NAME "lpfc" /* Used for SLI 2/3 */