scsi: qla2xxx: Fix hang due to session stuck

User experienced device lost. The log shows Get port data base command was
queued up, failed, and requeued again. Every time it is requeued, it set
the FCF_ASYNC_ACTIVE. This prevents any recovery code from occurring
because driver thinks a recovery is in progress for this session. In
essence, this session is hung.  The reason it gets into this place is the
session deletion got in front of this call due to link perturbation.

Break the requeue cycle and exit.  The session deletion code will trigger a
session relogin.

Link: https://lore.kernel.org/r/20220310092604.22950-8-njavali@marvell.com
Fixes: 577bdb5ee4e0 ("qla2xxx: Add framework for async fabric discovery")
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_def.h b/drivers/scsi/qla2xxx/qla_def.h
index bab2f665b6c25e570feba9ffbfe8d6d8d8fd7a83..8aa1cccebab1323548b3042571d055555d0fb961 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -5438,4 +5438,8 @@ struct ql_vnd_tgt_stats_resp {
 #include "qla_gbl.h"
 #include "qla_dbg.h"
 #include "qla_inline.h"
+
+#define IS_SESSION_DELETED(_fcport) (_fcport->disc_state == DSC_DELETE_PEND || \
+                                     _fcport->disc_state == DSC_DELETED)
+
 #endif

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index e468b05f90c08342e3c1236d0f7f7153e1b15f03..5dfaa4d39cec0b3449e4e6964de5b0257091cd24 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -575,6 +575,14 @@ qla2x00_async_adisc(struct scsi_qla_host *vha, fc_port_t *fcport,
        struct srb_iocb *lio;
        int rval = QLA_FUNCTION_FAILED;
 
+       if (IS_SESSION_DELETED(fcport)) {
+               ql_log(ql_log_warn, vha, 0xffff,
+                      "%s: %8phC is being delete - not sending command.\n",
+                      __func__, fcport->port_name);
+               fcport->flags &= ~FCF_ASYNC_ACTIVE;
+               return rval;
+       }
+
        if (!vha->flags.online || (fcport->flags & FCF_ASYNC_SENT))
                return rval;
 
@@ -1338,8 +1346,15 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt)
        struct port_database_24xx *pd;
        struct qla_hw_data *ha = vha->hw;
 
-       if (!vha->flags.online || (fcport->flags & FCF_ASYNC_SENT) ||
-           fcport->loop_id == FC_NO_LOOP_ID) {
+       if (IS_SESSION_DELETED(fcport)) {
+               ql_log(ql_log_warn, vha, 0xffff,
+                      "%s: %8phC is being delete - not sending command.\n",
+                      __func__, fcport->port_name);
+               fcport->flags &= ~FCF_ASYNC_ACTIVE;
+               return rval;
+       }
+
+       if (!vha->flags.online || fcport->flags & FCF_ASYNC_SENT) {
                ql_log(ql_log_warn, vha, 0xffff,
                    "%s: %8phC online %d flags %x - not sending command.\n",
                    __func__, fcport->port_name, vha->flags.online, fcport->flags);