From patchwork Mon Sep 30 18:54:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11167067 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2803F16B1 for ; Mon, 30 Sep 2019 18:57:43 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C5DB224D5 for ; Mon, 30 Sep 2019 18:57:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C5DB224D5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id BA9EA5C3AA6; Mon, 30 Sep 2019 11:57:23 -0700 (PDT) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp4.ccs.ornl.gov (smtp4.ccs.ornl.gov [160.91.203.40]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id E61AB5C3B0A for ; Mon, 30 Sep 2019 11:57:09 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp4.ccs.ornl.gov (Postfix) with ESMTP id 96209100543C; Mon, 30 Sep 2019 14:56:56 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 94D05B5; Mon, 30 Sep 2019 14:56:56 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 30 Sep 2019 14:54:56 -0400 Message-Id: <1569869810-23848-38-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1569869810-23848-1-git-send-email-jsimmons@infradead.org> References: <1569869810-23848-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 037/151] lnet: Handle ping buffer with only loopback NID X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Olaf Weber During startup lnet_peer_data_resent() can see a ping buffer for the local node which contains only the loopback NID. This shows up as pi_nnis == 1, and there is nothing to be done (or that needs to be done) in that case. WC-bug-id: https://jira.whamcloud.com/browse/LU-9933 Lustre-commit: 002e25b92779 ("LU-9933 lnet: Handle ping buffer with only loopback NID") Signed-off-by: Olaf Weber Reviewed-on: https://review.whamcloud.com/28811 Reviewed-by: James Simmons Reviewed-by: Amir Shehata Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- net/lnet/lnet/peer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/lnet/lnet/peer.c b/net/lnet/lnet/peer.c index d7a2e3b..9fdb6a9 100644 --- a/net/lnet/lnet/peer.c +++ b/net/lnet/lnet/peer.c @@ -2589,10 +2589,12 @@ static int lnet_peer_data_present(struct lnet_peer *lp) * * The peer for the loopback interface is a special case: this * is the peer for the local node, and we want to set its - * primary NID to the correct value here. + * primary NID to the correct value here. Moreover, this peer + * can show up with only the loopback NID in the ping buffer. */ - if (pbuf->pb_info.pi_nnis > 1) - nid = pbuf->pb_info.pi_ni[1].ns_nid; + if (pbuf->pb_info.pi_nnis <= 1) + goto out; + nid = pbuf->pb_info.pi_ni[1].ns_nid; if (LNET_NETTYP(LNET_NIDNET(lp->lp_primary_nid)) == LOLND) { rc = lnet_peer_set_primary_nid(lp, nid, flags); if (!rc)