From: Quinn Tran <qutran@marvell.com>

Date: Tue, 12 Jul 2022 22:20:41 -0700

Subject: scsi: qla2xxx: Fix imbalance vha->vref_count

Patch-mainline: v5.20-rc1

Git-commit: 63fa7f2644b4b48e1913af33092c044bf48e9321

References: bsc#1201651

vref_count took an extra decrement in the task management path.  Add an

extra ref count to compensate the imbalance.

Link: https://lore.kernel.org/r/20220713052045.10683-7-njavali@marvell.com

Cc: stable@vger.kernel.org

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

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_init.c |    4 ++++

 1 file changed, 4 insertions(+)

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

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

@@ -162,6 +162,7 @@ int qla24xx_async_abort_cmd(srb_t *cmd_s

 	struct srb_iocb *abt_iocb;

 	srb_t *sp;

 	int rval = QLA_FUNCTION_FAILED;

+	uint8_t bail;

 	/* ref: INIT for ABTS command */

 	sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport,

@@ -169,6 +170,7 @@ int qla24xx_async_abort_cmd(srb_t *cmd_s

 	if (!sp)

 		return QLA_MEMORY_ALLOC_FAILED;

+	QLA_VHA_MARK_BUSY(vha, bail);

 	abt_iocb = &sp->u.iocb_cmd;

 	sp->type = SRB_ABT_CMD;

 	sp->name = "abort";

@@ -2003,12 +2005,14 @@ qla2x00_async_tm_cmd(fc_port_t *fcport,

 	struct srb_iocb *tm_iocb;

 	srb_t *sp;

 	int rval = QLA_FUNCTION_FAILED;

+	uint8_t bail;

 	/* ref: INIT */

 	sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);

 	if (!sp)

 		goto done;

+	QLA_VHA_MARK_BUSY(vha, bail);

 	sp->type = SRB_TM_CMD;

 	sp->name = "tmf";

 	qla2x00_init_async_sp(sp, qla2x00_get_async_timeout(vha),