From ce22e31b75f30e732fb586300d987aa71cb2c3ac Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Tue, 25 May 2021 11:17:49 -0500 Subject: [PATCH] LU-14668 lnet: Peers added via kernel API should be permanent The LNetAddPeer() API allows Lustre to predefine the Peer for LNet. Originally these peers would be temporary and potentially re-created via discovery. Instead, let's make these peers permanent. This allows Lustre to dictate the primary NID of the peer. LNet makes sure this primary NID is not changed afterwards. Lustre-change: https://review.whamcloud.com/43788 Lustre-commit: TBD (f5008e02d8a49525b5d85887a13aad27e4a23cfd) Test-Parameters: trivial Signed-off-by: Amir Shehata Signed-off-by: Chris Horn Change-Id: I3f54c04719c9e0374176682af08183f0c93ef737 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50115 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Cyril Bordage Reviewed-by: Frank Sehr Reviewed-by: Andreas Dilger --- lnet/include/lnet/lib-lnet.h | 2 +- lnet/lnet/api-ni.c | 6 +++--- lnet/lnet/peer.c | 35 ++++++++++++++++++----------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index 7b89709..a653170 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -905,7 +905,7 @@ struct lnet_peer_net *lnet_peer_get_net_locked(struct lnet_peer *peer, __u32 net_id); bool lnet_peer_is_pref_nid_locked(struct lnet_peer_ni *lpni, lnet_nid_t nid); int lnet_peer_ni_set_non_mr_pref_nid(struct lnet_peer_ni *lpni, lnet_nid_t nid); -int lnet_add_peer_ni(lnet_nid_t key_nid, lnet_nid_t nid, bool mr, bool temp); +int lnet_user_add_peer_ni(lnet_nid_t key_nid, lnet_nid_t nid, bool mr); int lnet_del_peer_ni(lnet_nid_t key_nid, lnet_nid_t nid); int lnet_get_peer_info(struct lnet_ioctl_peer_cfg *cfg, void __user *bulk); int lnet_get_peer_ni_info(__u32 peer_index, __u64 *nid, diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 879dc38..0cff451 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -3900,9 +3900,9 @@ LNetCtl(unsigned int cmd, void *arg) return -EINVAL; mutex_lock(&the_lnet.ln_api_mutex); - rc = lnet_add_peer_ni(cfg->prcfg_prim_nid, - cfg->prcfg_cfg_nid, - cfg->prcfg_mr, false); + rc = lnet_user_add_peer_ni(cfg->prcfg_prim_nid, + cfg->prcfg_cfg_nid, + cfg->prcfg_mr); mutex_unlock(&the_lnet.ln_api_mutex); return rc; } diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c index bb4acf8..0b28060 100644 --- a/lnet/lnet/peer.c +++ b/lnet/lnet/peer.c @@ -47,6 +47,8 @@ #define LNET_REDISCOVER_PEER (1) static int lnet_peer_queue_for_discovery(struct lnet_peer *lp); +static int lnet_add_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid, bool mr, + unsigned int flags); static void lnet_peer_remove_from_remote_list(struct lnet_peer_ni *lpni) @@ -1245,7 +1247,8 @@ LNetAddPeer(lnet_nid_t *nids, __u32 num_nids) if (!pnid) { pnid = nids[i]; - rc = lnet_add_peer_ni(pnid, LNET_NID_ANY, mr, true); + rc = lnet_add_peer_ni(pnid, LNET_NID_ANY, mr, + LNET_PEER_LOCK_PRIMARY); if (rc == -EALREADY) { struct lnet_peer *lp; @@ -1260,9 +1263,11 @@ LNetAddPeer(lnet_nid_t *nids, __u32 num_nids) lnet_peer_decref_locked(lp); } } else if (lnet_peer_discovery_disabled) { - rc = lnet_add_peer_ni(nids[i], LNET_NID_ANY, mr, true); + rc = lnet_add_peer_ni(nids[i], LNET_NID_ANY, mr, + LNET_PEER_LOCK_PRIMARY); } else { - rc = lnet_add_peer_ni(pnid, nids[i], mr, true); + rc = lnet_add_peer_ni(pnid, nids[i], mr, + LNET_PEER_LOCK_PRIMARY); } if (rc && rc != -EEXIST) @@ -1771,21 +1776,18 @@ out: * The caller must hold ln_api_mutex. This prevents the peer from * being created/modified/deleted by a different thread. */ -int -lnet_add_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid, bool mr, bool temp) +static int +lnet_add_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid, bool mr, + unsigned int flags) __must_hold(&the_lnet.ln_api_mutex) { struct lnet_peer *lp = NULL; struct lnet_peer_ni *lpni; - unsigned int flags = 0; /* The prim_nid must always be specified */ if (prim_nid == LNET_NID_ANY) return -EINVAL; - if (!temp) - flags = LNET_PEER_CONFIGURED; - if (mr) flags |= LNET_PEER_MULTI_RAIL; @@ -1803,13 +1805,6 @@ __must_hold(&the_lnet.ln_api_mutex) lnet_peer_ni_decref_locked(lpni); lp = lpni->lpni_peer_net->lpn_peer; - /* Peer must have been configured. */ - if (!temp && !(lp->lp_state & LNET_PEER_CONFIGURED)) { - CDEBUG(D_NET, "peer %s was not configured\n", - libcfs_nid2str(prim_nid)); - return -ENOENT; - } - /* Primary NID must match */ if (lp->lp_primary_nid != prim_nid) { CDEBUG(D_NET, "prim_nid %s is not primary for peer %s\n", @@ -1825,7 +1820,8 @@ __must_hold(&the_lnet.ln_api_mutex) return -EPERM; } - if (temp && lnet_peer_is_uptodate(lp)) { + if ((flags & LNET_PEER_LOCK_PRIMARY) && + (lnet_peer_is_uptodate(lp) && (lp->lp_state & LNET_PEER_LOCK_PRIMARY))) { CDEBUG(D_NET, "Don't add temporary peer NI for uptodate peer %s\n", libcfs_nid2str(prim_nid)); @@ -1835,6 +1831,11 @@ __must_hold(&the_lnet.ln_api_mutex) return lnet_peer_add_nid(lp, nid, flags); } +int lnet_user_add_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid, bool mr) +{ + return lnet_add_peer_ni(prim_nid, nid, mr, LNET_PEER_CONFIGURED); +} + /* * Implementation of IOC_LIBCFS_DEL_PEER_NI. * -- 1.8.3.1