Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2543089pxj; Mon, 10 May 2021 05:34:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvCwF6uvdKC4T9j9E+ilGF0K2SH30wrII0qTiuyGmWgbm8gZ+e0BgN1Y2v8nTDtIRkplun X-Received: by 2002:a50:8fe6:: with SMTP id y93mr29025265edy.224.1620650049746; Mon, 10 May 2021 05:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620650049; cv=none; d=google.com; s=arc-20160816; b=Ek9WHp2CRW8Okq+SSrfljIR/gQv8WcgIyV9Tp4OUAZnmVGbA8W8+YKFY6d4ZrJ+Q+G 5XSxfpnTJ7VNapkJpDlx7zbcunEKeJsImtfD3sgaqFTiPAxs1ZfGpGshwlhYeUuXU/3V +0jdLEoEoG/yB+oDb245KA2SGfCIisNypF/H8iCZrK5YZS/HsSvQLAFsx4ElS8zpzNiC qyXSbMPkZlV898nSin528CSXc4WlyCqPVkRNfwHiSD6HT4XWZ3cDsI1xbcVLoa7e6bK/ Rw0RSUjpOcfOPzTNf5N1PTo7/sypGF98KKa7LTxug2RNi5XKvthyXGTfaPEyFthf1YFO q4kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m7JEgpFWVkKb1+3lefiKbjb5TWSabxdndcbxsTCYr/4=; b=Hx1JuhE0ro60dz9lCiVbjlpAclc2SvLSKu02WrqQvVrnU4My9Gmn/yLmTuW0TvN3hk MlqInY6hejUl02uUHawkhTR1KYF+Aa1cyk2UPGt4GQrfUMgUASeI0/lC4n1DwoLuq7xZ Z61MbLoTSAxjzO1xEusKwadX+LsJLaKz/XmR1K5YY9F3IJfrLieTXFtCUj7NPu5YHcUR QLPnECDfIMrOvAtplZ8Ui6B/NKyQfZQpzzTr5ZG7+iQBJgrxq3CV0uhNU+yWGRvZoEqs +jDtsls+gPvvOTIXyuVBXzLSd1w1SFhTB7FzqC1+ASfk9IjVas6655zOhsxtNzcwrnTq TIeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rLuPXaXv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m1si16040273ejj.42.2021.05.10.05.33.24; Mon, 10 May 2021 05:34:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rLuPXaXv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344948AbhEJMVB (ORCPT + 99 others); Mon, 10 May 2021 08:21:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:45604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234393AbhEJLJX (ORCPT ); Mon, 10 May 2021 07:09:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id ACB7161361; Mon, 10 May 2021 11:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644705; bh=iJf/hRq5/+RUd6t633qESKJEnLI0H+JH7UYAKdPDZhE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rLuPXaXvBixmbtOM1FFdOcEfdEtfI8xGOFRGv6+mx01Aa16oEJpnXySjOAuTWfc1N z8llqbeBIQNItDJ1eTS4RBE+WDssIIWI9YOGSwYtK4vx6eSVBHPCFBEmJS2gsSxMEp oi2/kTTAj7ynU/Zb4lS8iTCIgFkNHtMa6WXEjpA4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dick Kennedy , James Smart , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.12 155/384] scsi: lpfc: Fix pt2pt connection does not recover after LOGO Date: Mon, 10 May 2021 12:19:04 +0200 Message-Id: <20210510102019.992621424@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: James Smart [ Upstream commit bd4f5100424d17d4e560d6653902ef8e49b2fc1f ] On a pt2pt setup, between 2 initiators, if one side issues a a LOGO, there is no relogin attempt. The FC specs are grey in this area on which port (higher wwn or not) is to re-login. As there is no spec guidance, unconditionally re-PLOGI after the logout to ensure a login is re-established. Link: https://lore.kernel.org/r/20210301171821.3427-8-jsmart2021@gmail.com Co-developed-by: Dick Kennedy Signed-off-by: Dick Kennedy Signed-off-by: James Smart Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc_nportdisc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index f67cf3c4fab1..ef8feb933cd8 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -913,9 +913,14 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, } } else if ((!(ndlp->nlp_type & NLP_FABRIC) && ((ndlp->nlp_type & NLP_FCP_TARGET) || - !(ndlp->nlp_type & NLP_FCP_INITIATOR))) || + (ndlp->nlp_type & NLP_NVME_TARGET) || + (vport->fc_flag & FC_PT2PT))) || (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) { - /* Only try to re-login if this is NOT a Fabric Node */ + /* Only try to re-login if this is NOT a Fabric Node + * AND the remote NPORT is a FCP/NVME Target or we + * are in pt2pt mode. NLP_STE_ADISC_ISSUE is a special + * case for LOGO as a response to ADISC behavior. + */ mod_timer(&ndlp->nlp_delayfunc, jiffies + msecs_to_jiffies(1000 * 1)); spin_lock_irq(&ndlp->lock); -- 2.30.2