From patchwork Mon Sep 30 18:56:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11167273 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 ABED71599 for ; Mon, 30 Sep 2019 19:06:01 +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 936D72245A for ; Mon, 30 Sep 2019 19:06:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 936D72245A 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 B49245E4B95; Mon, 30 Sep 2019 12:00:48 -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 B358E5C3B3B for ; Mon, 30 Sep 2019 11:57:35 -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 98A161005F07; Mon, 30 Sep 2019 14:56:57 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 97685BD; Mon, 30 Sep 2019 14:56:57 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 30 Sep 2019 14:56:14 -0400 Message-Id: <1569869810-23848-116-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 115/151] lnet: safe access in debug print 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: Amir Shehata , Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Amir Shehata Move debug print within the cpt lock to keep peer access safe. WC-bug-id: https://jira.whamcloud.com/browse/LU-9919 Lustre-commit: 7c9ffeac1b69 ("LU-9919 lnet: safe access in debug print") Signed-off-by: Amir Shehata Reviewed-on: https://review.whamcloud.com/28771 Reviewed-by: John L. Hammond Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- net/lnet/lnet/lib-move.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/lnet/lnet/lib-move.c b/net/lnet/lnet/lib-move.c index 202372d..eee4510a 100644 --- a/net/lnet/lnet/lib-move.c +++ b/net/lnet/lnet/lib-move.c @@ -1422,11 +1422,10 @@ void lnet_usr_translate_stats(struct lnet_ioctl_element_msg_stats *msg_stats, msg->msg_rtr_nid_param = rtr_nid; msg->msg_sending = 0; list_add_tail(&msg->msg_list, &peer->lp_dc_pendq); - lnet_peer_ni_decref_locked(lpni); - lnet_net_unlock(cpt); - CDEBUG(D_NET, "%s pending discovery\n", libcfs_nid2str(peer->lp_primary_nid)); + lnet_peer_ni_decref_locked(lpni); + lnet_net_unlock(cpt); return LNET_DC_WAIT; } @@ -1560,10 +1559,10 @@ void lnet_usr_translate_stats(struct lnet_ioctl_element_msg_stats *msg_stats, best_lpni->lpni_net->net_id, cpt); /* If there is no best_ni we don't have a route */ if (!best_ni) { - lnet_net_unlock(cpt); CERROR("no path to %s from net %s\n", libcfs_nid2str(best_lpni->lpni_nid), libcfs_net2str(best_lpni->lpni_net->net_id)); + lnet_net_unlock(cpt); return -EHOSTUNREACH; } lpni = list_first_entry(&peer_net->lpn_peer_nis, @@ -1718,9 +1717,9 @@ void lnet_usr_translate_stats(struct lnet_ioctl_element_msg_stats *msg_stats, * move onto the next peer_ni in the peer */ if (!best_gw) { - lnet_net_unlock(cpt); LCONSOLE_WARN("No route to peer from %s\n", libcfs_nid2str(best_ni->ni_nid)); + lnet_net_unlock(cpt); return -EHOSTUNREACH; }