scsi: qla2xxx: edif: Fix session thrash

[ Upstream commit a8fdfb0b39c2b31722c70bdf2272b949d5af4b7b ]

Current code prematurely sends out PRLI before authentication application
has given the OK to do so. This causes PRLI failure and session teardown.

Prevents PRLI from going out before authentication app gives the OK.

Link: https://lore.kernel.org/r/20220608115849.16693-7-njavali@marvell.com
Fixes: 91f6f5fbe87b ("scsi: qla2xxx: edif: Reduce connection thrash")
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/qla2xxx/qla_edif.c b/drivers/scsi/qla2xxx/qla_edif.c
index c097188..8e92374 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_edif.c
+++ b/drivers/scsi/qla2xxx/qla_edif.c
@@ -3437,7 +3437,7 @@ int qla_edif_process_els(scsi_qla_host_t *vha, struct bsg_job *bsg_job)
        if (qla_bsg_check(vha, bsg_job, fcport))
                return 0;
 
-       if (fcport->loop_id == FC_NO_LOOP_ID) {
+       if (EDIF_SESS_DELETE(fcport)) {
                ql_dbg(ql_dbg_edif, vha, 0x910d,
                    "%s ELS code %x, no loop id.\n", __func__,
                    bsg_request->rqst_data.r_els.els_code);

diff --git a/drivers/scsi/qla2xxx/qla_edif.h b/drivers/scsi/qla2xxx/qla_edif.h
index a965ca8..b9cedf6 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_edif.h
+++ b/drivers/scsi/qla2xxx/qla_edif.h
@@ -140,4 +140,8 @@ struct enode {
        (DBELL_ACTIVE(_fcport->vha) && \
         (_fcport->disc_state == DSC_LOGIN_AUTH_PEND))
 
+#define EDIF_SESS_DELETE(_s) \
+       (qla_ini_mode_enabled(_s->vha) && (_s->disc_state == DSC_DELETE_PEND || \
+        _s->disc_state == DSC_DELETED))
+
 #endif /* __QLA_EDIF_H */

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 49cfe8c..edc29d6 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1764,8 +1764,16 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
                break;
 
        case DSC_LOGIN_PEND:
-               if (fcport->fw_login_state == DSC_LS_PLOGI_COMP)
+               if (vha->hw->flags.edif_enabled)
+                       break;
+
+               if (fcport->fw_login_state == DSC_LS_PLOGI_COMP) {
+                       ql_dbg(ql_dbg_disc, vha, 0x2118,
+                              "%s %d %8phC post %s PRLI\n",
+                              __func__, __LINE__, fcport->port_name,
+                              NVME_TARGET(vha->hw, fcport) ? "NVME" : "FC");
                        qla24xx_post_prli_work(vha, fcport);
+               }
                break;
 
        case DSC_UPD_FCPORT: