From dbcddb4824f08153f145327e2bfe1bf4a2becc4f Mon Sep 17 00:00:00 2001 From: Amir Shehata Date: Mon, 8 Jul 2019 12:51:05 -0700 Subject: [PATCH] LU-9971 lnet: fix peer ref counting Exit from the loop after peer ref count has been incremented to avoid wrong ref count. The code makes sure that a peer is queued for discovery at most once if discovery is disabled. This is done to use discovery as a standard ping for gateways which do not have discovery feature or discovery is disabled. Signed-off-by: Amir Shehata Change-Id: I2cc4c8f9d780f5c438d9b51bb2d1106fec553f39 Reviewed-on: https://review.whamcloud.com/35446 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Olaf Weber Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin --- lnet/lnet/peer.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c index 01fcad3..a60a2e6 100644 --- a/lnet/lnet/peer.c +++ b/lnet/lnet/peer.c @@ -2150,6 +2150,7 @@ lnet_discover_peer_locked(struct lnet_peer_ni *lpni, int cpt, bool block) DEFINE_WAIT(wait); struct lnet_peer *lp; int rc = 0; + int count = 0; again: lnet_net_unlock(cpt); @@ -2169,11 +2170,21 @@ again: break; if (the_lnet.ln_dc_state != LNET_DC_STATE_RUNNING) break; + /* + * Don't repeat discovery if discovery is disabled. This is + * done to ensure we can use discovery as a standard ping as + * well for backwards compatibility with routers which do not + * have discovery or have discovery disabled + */ + if (lnet_is_discovery_disabled(lp) && count > 0) + break; if (lp->lp_dc_error) break; if (lnet_peer_is_uptodate(lp)) break; lnet_peer_queue_for_discovery(lp); + count++; + CDEBUG(D_NET, "Discovery attempt # %d\n", count); /* * If caller requested a non-blocking operation then @@ -2191,16 +2202,6 @@ again: lnet_peer_decref_locked(lp); /* Peer may have changed */ lp = lpni->lpni_peer_net->lpn_peer; - - /* - * Wait for discovery to complete, but don't repeat if - * discovery is disabled. This is done to ensure we can - * use discovery as a standard ping as well for backwards - * compatibility with routers which do not have discovery - * or have discovery disabled - */ - if (lnet_is_discovery_disabled(lp)) - break; } finish_wait(&lp->lp_dc_waitq, &wait); -- 1.8.3.1