lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0622/1157] scsi: qla2xxx: edif: Fix session thrash
    Date
    From: Quinn Tran <qutran@marvell.com>

    [ 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>
    ---
    drivers/scsi/qla2xxx/qla_edif.c | 2 +-
    drivers/scsi/qla2xxx/qla_edif.h | 4 ++++
    drivers/scsi/qla2xxx/qla_init.c | 10 +++++++++-
    3 files changed, 14 insertions(+), 2 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_edif.c b/drivers/scsi/qla2xxx/qla_edif.c
    index c4bebbb17e92..7239439120c0 100644
    --- a/drivers/scsi/qla2xxx/qla_edif.c
    +++ b/drivers/scsi/qla2xxx/qla_edif.c
    @@ -3588,7 +3588,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 3561e22b8f0f..7cdb89ccdc6e 100644
    --- a/drivers/scsi/qla2xxx/qla_edif.h
    +++ b/drivers/scsi/qla2xxx/qla_edif.h
    @@ -141,4 +141,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 177ce45b76a6..7bd10b4ed9ed 100644
    --- a/drivers/scsi/qla2xxx/qla_init.c
    +++ b/drivers/scsi/qla2xxx/qla_init.c
    @@ -1762,8 +1762,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:
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:35    [W:4.031 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site