From nobody Mon Sep 29 21:15:52 2025 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 C2D1BC282E7 for ; Tue, 16 Aug 2022 04:33:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230202AbiHPEd3 (ORCPT ); Tue, 16 Aug 2022 00:33:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230042AbiHPEcv (ORCPT ); Tue, 16 Aug 2022 00:32:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CCF01665BB; Mon, 15 Aug 2022 13:22:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6429E61072; Mon, 15 Aug 2022 20:22:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65286C433D6; Mon, 15 Aug 2022 20:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660594977; bh=VjzZqsbaWnZGIyqrjQJ4BBVHwACh7tYen7EsXIv/VEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AWXbvGYW/ioJPk2AJquv8DAo2qtv4/EFLXc/QJKZsftvVLzdDSDn8z0sxQIsF9mVn GOWumVvEdn8CVVp07gibR6EHBm36xD1uCZn4AftLM51pESkB9aosqSjhrpTihhsox7 x01p03ZuMoXSZuHJ5ssOFatmCSZFx1ooL7EGjG8o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Quinn Tran , Nilesh Javali , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.19 0587/1157] scsi: qla2xxx: edif: Add retry for ELS passthrough Date: Mon, 15 Aug 2022 19:59:03 +0200 Message-Id: <20220815180503.143141029@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Quinn Tran [ Upstream commit 0b3f3143d473b489a7aa0779c43bcdb344bd3014 ] Relating to EDIF, when sending IKE message, updating key or deleting key, driver can encounter IOCB queue full. Add additional retries to reduce higher level recovery. Link: https://lore.kernel.org/r/20220607044627.19563-8-njavali@marvell.com Fixes: dd30706e73b7 ("scsi: qla2xxx: edif: Add key update") Signed-off-by: Quinn Tran Signed-off-by: Nilesh Javali Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_edif.c | 52 +++++++++++++++++++++++---------- drivers/scsi/qla2xxx/qla_os.c | 2 +- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_edif.c b/drivers/scsi/qla2xxx/qla_edi= f.c index c7198f8635c7..06c1252019e1 100644 --- a/drivers/scsi/qla2xxx/qla_edif.c +++ b/drivers/scsi/qla2xxx/qla_edif.c @@ -1467,6 +1467,8 @@ qla24xx_check_sadb_avail_slot(struct bsg_job *bsg_job= , fc_port_t *fcport, =20 #define QLA_SA_UPDATE_FLAGS_RX_KEY 0x0 #define QLA_SA_UPDATE_FLAGS_TX_KEY 0x2 +#define EDIF_MSLEEP_INTERVAL 100 +#define EDIF_RETRY_COUNT 50 =20 int qla24xx_sadb_update(struct bsg_job *bsg_job) @@ -1479,7 +1481,7 @@ qla24xx_sadb_update(struct bsg_job *bsg_job) struct edif_list_entry *edif_entry =3D NULL; int found =3D 0; int rval =3D 0; - int result =3D 0; + int result =3D 0, cnt; struct qla_sa_update_frame sa_frame; struct srb_iocb *iocb_cmd; port_id_t portid; @@ -1720,11 +1722,23 @@ qla24xx_sadb_update(struct bsg_job *bsg_job) sp->done =3D qla2x00_bsg_job_done; iocb_cmd =3D &sp->u.iocb_cmd; iocb_cmd->u.sa_update.sa_frame =3D sa_frame; - + cnt =3D 0; +retry: rval =3D qla2x00_start_sp(sp); - if (rval !=3D QLA_SUCCESS) { + switch (rval) { + case QLA_SUCCESS: + break; + case EAGAIN: + msleep(EDIF_MSLEEP_INTERVAL); + cnt++; + if (cnt < EDIF_RETRY_COUNT) + goto retry; + + fallthrough; + default: ql_log(ql_dbg_edif, vha, 0x70e3, - "qla2x00_start_sp failed=3D%d.\n", rval); + "%s qla2x00_start_sp failed=3D%d.\n", + __func__, rval); =20 qla2x00_rel_sp(sp); rval =3D -EIO; @@ -2398,7 +2412,6 @@ qla24xx_issue_sa_replace_iocb(scsi_qla_host_t *vha, s= truct qla_work_evt *e) rval =3D qla2x00_start_sp(sp); =20 if (rval !=3D QLA_SUCCESS) { - rval =3D QLA_FUNCTION_FAILED; goto done_free_sp; } =20 @@ -3530,7 +3543,7 @@ int qla_edif_process_els(scsi_qla_host_t *vha, struct= bsg_job *bsg_job) fc_port_t *fcport =3D NULL; struct qla_hw_data *ha =3D vha->hw; srb_t *sp; - int rval =3D (DID_ERROR << 16); + int rval =3D (DID_ERROR << 16), cnt; port_id_t d_id; struct qla_bsg_auth_els_request *p =3D (struct qla_bsg_auth_els_request *)bsg_job->request; @@ -3625,17 +3638,26 @@ int qla_edif_process_els(scsi_qla_host_t *vha, stru= ct bsg_job *bsg_job) sp->free =3D qla2x00_bsg_sp_free; sp->done =3D qla2x00_bsg_job_done; =20 + cnt =3D 0; +retry: rval =3D qla2x00_start_sp(sp); - - ql_dbg(ql_dbg_edif, vha, 0x700a, - "%s %s %8phN xchg %x ctlflag %x hdl %x reqlen %xh bsg ptr %p\n", - __func__, sc_to_str(p->e.sub_cmd), fcport->port_name, - p->e.extra_rx_xchg_address, p->e.extra_control_flags, - sp->handle, sp->remap.req.len, bsg_job); - - if (rval !=3D QLA_SUCCESS) { + switch (rval) { + case QLA_SUCCESS: + ql_dbg(ql_dbg_edif, vha, 0x700a, + "%s %s %8phN xchg %x ctlflag %x hdl %x reqlen %xh bsg ptr %p\n", + __func__, sc_to_str(p->e.sub_cmd), fcport->port_name, + p->e.extra_rx_xchg_address, p->e.extra_control_flags, + sp->handle, sp->remap.req.len, bsg_job); + break; + case EAGAIN: + msleep(EDIF_MSLEEP_INTERVAL); + cnt++; + if (cnt < EDIF_RETRY_COUNT) + goto retry; + fallthrough; + default: ql_log(ql_log_warn, vha, 0x700e, - "qla2x00_start_sp failed =3D %d\n", rval); + "%s qla2x00_start_sp failed =3D %d\n", __func__, rval); SET_DID_STATUS(bsg_reply->result, DID_IMM_RETRY); rval =3D -EIO; goto done_free_remap_rsp; diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 73073fb08369..4f3125b826c4 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -5472,7 +5472,7 @@ qla2x00_do_work(struct scsi_qla_host *vha) e->u.fcport.fcport, false); break; case QLA_EVT_SA_REPLACE: - qla24xx_issue_sa_replace_iocb(vha, e); + rc =3D qla24xx_issue_sa_replace_iocb(vha, e); break; } =20 --=20 2.35.1