From 56bcfbf22d91b96c3367533145e5099e63f26d14 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Mon, 15 Aug 2022 11:57:57 -0400 Subject: [PATCH] LU-10391 lnet: extend lnet_is_nid_in_ping_info() lnet_is_nid_in_ping_info() now checks the ping_info for both nid4 and larger nids. Test-Parameters: trivial testlist=sanity-lnet Test-Parameters: serverversion=2.12 serverdistro=el7.9 testlist=runtests Test-Parameters: clientversion=2.12 testlist=runtests Signed-off-by: Mr NeilBrown Change-Id: I7555947203acb5e5c6025ccb1ec5fba60bbf2f31 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/44629 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Frank Sehr Reviewed-by: James Simmons --- lnet/include/lnet/lib-lnet.h | 9 ++++++ lnet/lnet/peer.c | 70 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index e2f3560..cab038a 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -963,6 +963,15 @@ static inline void lnet_ping_buffer_decref(struct lnet_ping_buffer *pbuf) } } +struct lnet_ping_iter { + struct lnet_ping_info *pinfo; + void *pos, *end; +}; + +u32 *ping_iter_first(struct lnet_ping_iter *pi, struct lnet_ping_buffer *pbuf, + struct lnet_nid *nid); +u32 *ping_iter_next(struct lnet_ping_iter *pi, struct lnet_nid *nid); + static inline int lnet_push_target_resize_needed(void) { return the_lnet.ln_push_target->pb_nbytes < the_lnet.ln_push_target_nbytes; diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c index b93f8dd..7be3eb4 100644 --- a/lnet/lnet/peer.c +++ b/lnet/lnet/peer.c @@ -2889,6 +2889,56 @@ static void lnet_discovery_event_handler(struct lnet_event *event) lnet_net_unlock(LNET_LOCK_EX); } +u32 *ping_iter_first(struct lnet_ping_iter *pi, + struct lnet_ping_buffer *pbuf, + struct lnet_nid *nid) +{ + pi->pinfo = &pbuf->pb_info; + pi->pos = &pbuf->pb_info.pi_ni; + pi->end = (void *)pi->pinfo + + min_t(int, pbuf->pb_nbytes, + lnet_ping_info_size(pi->pinfo)); + /* lnet_ping_info_validiate ensures there will be one + * lnet_ni_status at the start + */ + if (nid) + lnet_nid4_to_nid(pbuf->pb_info.pi_ni[0].ns_nid, nid); + return &pbuf->pb_info.pi_ni[0].ns_status; +} + +u32 *ping_iter_next(struct lnet_ping_iter *pi, struct lnet_nid *nid) +{ + int off = offsetof(struct lnet_ping_info, pi_ni[pi->pinfo->pi_nnis]); + + if (pi->pos < ((void *)pi->pinfo + off)) { + struct lnet_ni_status *ns = pi->pos; + + pi->pos = ns + 1; + if (pi->pos > pi->end) + return NULL; + if (nid) + lnet_nid4_to_nid(ns->ns_nid, nid); + return &ns->ns_status; + } + + while (pi->pinfo->pi_features & LNET_PING_FEAT_LARGE_ADDR) { + struct lnet_ni_large_status *lns = pi->pos; + + if (pi->pos + 8 > pi->end) + /* Not safe to examine next */ + return NULL; + pi->pos = lnet_ping_sts_next(lns); + if (pi->pos > pi->end) + return NULL; + if (NID_BYTES(&lns->ns_nid) > sizeof(struct lnet_nid)) + continue; + if (nid) + *nid = lns->ns_nid; + return &lns->ns_status; + } + return NULL; +} + /* * Build a peer from incoming data. * @@ -3157,15 +3207,18 @@ lnet_peer_set_primary_data(struct lnet_peer *lp, struct lnet_ping_buffer *pbuf) return 0; } -static bool lnet_is_nid_in_ping_info(lnet_nid_t nid, struct lnet_ping_info *pinfo) +static bool lnet_is_nid_in_ping_info(struct lnet_nid *nid, + struct lnet_ping_buffer *pbuf) { - int i; - - for (i = 0; i < pinfo->pi_nnis; i++) { - if (pinfo->pi_ni[i].ns_nid == nid) + struct lnet_ping_iter pi; + struct lnet_nid pnid; + u32 *st; + + for (st = ping_iter_first(&pi, pbuf, &pnid); + st; + st = ping_iter_next(&pi, &pnid)) + if (nid_same(nid, &pnid)) return true; - } - return false; } @@ -3325,8 +3378,7 @@ __must_hold(&lp->lp_lock) * recorded in that peer. */ } else if (nid_same(&lp->lp_primary_nid, &nid) || - (lnet_is_nid_in_ping_info(lnet_nid_to_nid4(&lp->lp_primary_nid), - &pbuf->pb_info) && + (lnet_is_nid_in_ping_info(&lp->lp_primary_nid, pbuf) && lnet_is_discovery_disabled(lp))) { rc = lnet_peer_merge_data(lp, pbuf); } else { -- 1.8.3.1