lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 09/99] scsi: lpfc: Discovery state machine fixes for LOGO handling
    Date
    From: James Smart <jsmart2021@gmail.com>

    [ Upstream commit e77803bdbf0aad98d36b1d3fa082852831814edd ]

    If a LOGO is received for a node that is in the NPR state, post a DEVICE_RM
    event to allow clean up of the logged out node.

    Clearing the NLP_NPR_2B_DISC flag upon receipt of a LOGO ACC may cause
    skipping of processing outstanding PLOGIs triggered by parallel RSCN
    events. If an outstanding PLOGI is being retried and receipt of a LOGO ACC
    occurs, then allow the discovery state machine's PLOGI completion to clean
    up the node.

    Link: https://lore.kernel.org/r/20210707184351.67872-6-jsmart2021@gmail.com
    Co-developed-by: Justin Tee <justin.tee@broadcom.com>
    Signed-off-by: Justin Tee <justin.tee@broadcom.com>
    Signed-off-by: James Smart <jsmart2021@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/lpfc/lpfc_els.c | 12 ++++++++++++
    1 file changed, 12 insertions(+)

    diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
    index e481f5fe29d7..b0c443a0cf92 100644
    --- a/drivers/scsi/lpfc/lpfc_els.c
    +++ b/drivers/scsi/lpfc/lpfc_els.c
    @@ -4612,6 +4612,15 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
    goto out;

    if (ndlp->nlp_state == NLP_STE_NPR_NODE) {
    +
    + /* If PLOGI is being retried, PLOGI completion will cleanup the
    + * node. The NLP_NPR_2B_DISC flag needs to be retained to make
    + * progress on nodes discovered from last RSCN.
    + */
    + if ((ndlp->nlp_flag & NLP_DELAY_TMO) &&
    + (ndlp->nlp_last_elscmd == ELS_CMD_PLOGI))
    + goto out;
    +
    /* NPort Recovery mode or node is just allocated */
    if (!lpfc_nlp_not_used(ndlp)) {
    /* A LOGO is completing and the node is in NPR state.
    @@ -8948,6 +8957,9 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
    break;
    }
    lpfc_disc_state_machine(vport, ndlp, elsiocb, NLP_EVT_RCV_LOGO);
    + if (newnode)
    + lpfc_disc_state_machine(vport, ndlp, NULL,
    + NLP_EVT_DEVICE_RM);
    break;
    case ELS_CMD_PRLO:
    lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_UNSOL,
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-10 02:17    [W:4.618 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site