From 7a99dc0b2f27132bea0d823ba9d2ce35ade49cb1 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Wed, 11 Sep 2019 15:27:30 -0500 Subject: [PATCH] LU-12942 lnet: Optimize check for routing feature flag Check the routing feature flag outside of the loop. Cray-bug-id: LUS-7862 Test-Parameters: trivial Signed-off-by: Chris Horn Change-Id: I636305532d4bd5b8157a9df1b98af0da3bba867f Reviewed-on: https://review.whamcloud.com/36679 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alexandr Boyko Reviewed-by: Alexey Lyashkov Reviewed-by: Neil Brown Reviewed-by: Amir Shehata Reviewed-by: Oleg Drokin Reviewed-by: James Simmons --- lnet/lnet/router.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index 2014e67..c7368ca 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -341,12 +341,14 @@ lnet_router_discovery_ping_reply(struct lnet_peer *lp) spin_unlock(&lp->lp_lock); - if (lp_state & LNET_PEER_PING_FAILED) { - CDEBUG(D_NET, - "Ping failed with %d. Set routes down for gw %s\n", - lp->lp_ping_error, libcfs_nid2str(lp->lp_primary_nid)); - /* If the ping failed then mark the routes served by this - * peer down + if (lp_state & LNET_PEER_PING_FAILED || + pbuf->pb_info.pi_features & LNET_PING_FEAT_RTE_DISABLED) { + CDEBUG(D_NET, "Set routes down for gw %s because %s %d\n", + libcfs_nid2str(lp->lp_primary_nid), + lp_state & LNET_PEER_PING_FAILED ? "ping failed" : + "route feature is disabled", lp->lp_ping_error); + /* If the ping failed or the peer has routing disabled then + * mark the routes served by this peer down */ list_for_each_entry(route, &lp->lp_routes, lr_gwlist) lnet_set_route_aliveness(route, false); @@ -376,13 +378,6 @@ lnet_router_discovery_ping_reply(struct lnet_peer *lp) route->lr_gateway->lp_primary_nid) continue; - /* gateway has the routing feature disabled */ - if (pbuf->pb_info.pi_features & - LNET_PING_FEAT_RTE_DISABLED) { - lnet_set_route_aliveness(route, false); - continue; - } - llpn = lnet_peer_get_net_locked(lp, route->lr_lnet); if (!llpn) { lnet_set_route_aliveness(route, false); -- 1.8.3.1