lkml.org 
[lkml]   [2020]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 140/214] scsi: qla2xxx: Fix login timeout
    Date
    From: Quinn Tran <qutran@marvell.com>

    [ Upstream commit abb31aeaa9b20680b0620b23fea5475ea4591e31 ]

    Multipath errors were seen during failback due to login timeout. The
    remote device sent LOGO, the local host tore down the session and did
    relogin. The RSCN arrived indicates remote device is going through failover
    after which the relogin is in a 20s timeout phase. At this point the
    driver is stuck in the relogin process. Add a fix to delete the session as
    part of abort/flush the login.

    Link: https://lore.kernel.org/r/20200806111014.28434-5-njavali@marvell.com
    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>
    ---
    drivers/scsi/qla2xxx/qla_gs.c | 18 +++++++++++++++---
    drivers/scsi/qla2xxx/qla_target.c | 2 +-
    2 files changed, 16 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
    index a44de4c5dcf6c..fc6e12fb7d77b 100644
    --- a/drivers/scsi/qla2xxx/qla_gs.c
    +++ b/drivers/scsi/qla2xxx/qla_gs.c
    @@ -3673,10 +3673,22 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
    }

    if (fcport->scan_state != QLA_FCPORT_FOUND) {
    + bool do_delete = false;
    +
    + if (fcport->scan_needed &&
    + fcport->disc_state == DSC_LOGIN_PEND) {
    + /* Cable got disconnected after we sent
    + * a login. Do delete to prevent timeout.
    + */
    + fcport->logout_on_delete = 1;
    + do_delete = true;
    + }
    +
    fcport->scan_needed = 0;
    - if ((qla_dual_mode_enabled(vha) ||
    - qla_ini_mode_enabled(vha)) &&
    - atomic_read(&fcport->state) == FCS_ONLINE) {
    + if (((qla_dual_mode_enabled(vha) ||
    + qla_ini_mode_enabled(vha)) &&
    + atomic_read(&fcport->state) == FCS_ONLINE) ||
    + do_delete) {
    if (fcport->loop_id != FC_NO_LOOP_ID) {
    if (fcport->flags & FCF_FCP2_DEVICE)
    fcport->logout_on_delete = 0;
    diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
    index cb8a892e2d393..b75e6e4d58c06 100644
    --- a/drivers/scsi/qla2xxx/qla_target.c
    +++ b/drivers/scsi/qla2xxx/qla_target.c
    @@ -1262,7 +1262,7 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)

    qla24xx_chk_fcp_state(sess);

    - ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,
    + ql_dbg(ql_dbg_disc, sess->vha, 0xe001,
    "Scheduling sess %p for deletion %8phC\n",
    sess, sess->port_name);

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-01 18:22    [W:4.475 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site