From: Quinn Tran <qutran@marvell.com>

Date: Mon, 6 Jun 2022 21:46:21 -0700

Subject: scsi: qla2xxx: edif: Fix potential stuck session in sa update

Patch-mainline: v5.20-rc1

Git-commit: e0fb8ce2bb9e52c846e54ad2c58b5b7beb13eb09

References: bsc#1201958

When a thread is in the process of reestablish a session, a flag is set to

prevent multiple threads/triggers from doing the same task. This flag was

left on, and any attempt to relogin was locked out. Clear this flag if the

attempt has failed.

Link: https://lore.kernel.org/r/20220607044627.19563-6-njavali@marvell.com

Fixes: dd30706e73b7 ("scsi: qla2xxx: edif: Add key update")

Signed-off-by: Quinn Tran <qutran@marvell.com>

Signed-off-by: Nilesh Javali <njavali@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/scsi/qla2xxx/qla_edif.c |   17 ++++++++++++++---

 1 file changed, 14 insertions(+), 3 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_edif.c

+++ b/drivers/scsi/qla2xxx/qla_edif.c

@@ -2331,6 +2331,7 @@ edif_doorbell_show(struct device *dev, s

 static void qla_noop_sp_done(srb_t *sp, int res)

 {

+	sp->fcport->flags &= ~(FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE);

 	/* ref: INIT */

 	kref_put(&sp->cmd_kref, qla2x00_sp_release);

 }

@@ -2355,7 +2356,8 @@ qla24xx_issue_sa_replace_iocb(scsi_qla_h

 	if (!sa_ctl) {

 		ql_dbg(ql_dbg_edif, vha, 0x70e6,

 		    "sa_ctl allocation failed\n");

-		return -ENOMEM;

+		rval =  -ENOMEM;

+		goto done;

 	}

 	fcport = sa_ctl->fcport;

@@ -2365,7 +2367,8 @@ qla24xx_issue_sa_replace_iocb(scsi_qla_h

 	if (!sp) {

 		ql_dbg(ql_dbg_edif, vha, 0x70e6,

 		 "SRB allocation failed\n");

-		return -ENOMEM;

+		rval = -ENOMEM;

+		goto done;

 	}

 	fcport->flags |= FCF_ASYNC_SENT;

@@ -2394,10 +2397,18 @@ qla24xx_issue_sa_replace_iocb(scsi_qla_h

 	rval = qla2x00_start_sp(sp);

-	if (rval != QLA_SUCCESS)

+	if (rval != QLA_SUCCESS) {

 		rval = QLA_FUNCTION_FAILED;

+		goto done_free_sp;

+	}

 	return rval;

+done_free_sp:

+	kref_put(&sp->cmd_kref, qla2x00_sp_release);

+	fcport->flags &= ~FCF_ASYNC_SENT;

+done:

+	fcport->flags &= ~FCF_ASYNC_ACTIVE;

+	return rval;

 }

 void qla24xx_sa_update_iocb(srb_t *sp, struct sa_update_28xx *sa_update_iocb)