scsi: qla2xxx: Reduce false trigger to login

While a session is in the middle of a relogin, a late RSCN can be delivered
from switch. RSCN trigger fabric scan where the scan logic can trigger
another session login while a login is in progress.  Reduce the extra
trigger to prevent multiple logins to the same session.

Link: https://lore.kernel.org/r/20220310092604.22950-10-njavali@marvell.com
Fixes: c8dec38adaa9 ("scsi: qla2xxx: Reduce redundant ADISC command for RSCNs")
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>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 5dfaa4d39cec0b3449e4e6964de5b0257091cd24..7f5b5811c23d9420edaa0bd0907557d9e3498745 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1644,7 +1644,8 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
            fcport->login_gen, fcport->loop_id, fcport->scan_state,
            fcport->fc4_type);
 
-       if (fcport->scan_state != QLA_FCPORT_FOUND)
+       if (fcport->scan_state != QLA_FCPORT_FOUND ||
+           fcport->disc_state == DSC_DELETE_PEND)
                return 0;
 
        if ((fcport->loop_id != FC_NO_LOOP_ID) &&
@@ -1665,7 +1666,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
        if (vha->host->active_mode == MODE_TARGET && !N2N_TOPO(vha->hw))
                return 0;
 
-       if (fcport->flags & FCF_ASYNC_SENT) {
+       if (fcport->flags & (FCF_ASYNC_SENT | FCF_ASYNC_ACTIVE)) {
                set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
                return 0;
        }