lnet_add_peer_ni() and lnet_del_peer_ni() now take
struct lnet_nid rather than lnet_nid_t.
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 <neilb@suse.de>
Change-Id: I48bbed96fddea509b27dee131e134aa7b35ae68c
Reviewed-on: https://review.whamcloud.com/44625
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
int lnet_peer_add_pref_rtr(struct lnet_peer_ni *lpni, struct lnet_nid *nid);
int lnet_peer_ni_set_non_mr_pref_nid(struct lnet_peer_ni *lpni,
struct lnet_nid *nid);
int lnet_peer_add_pref_rtr(struct lnet_peer_ni *lpni, struct lnet_nid *nid);
int lnet_peer_ni_set_non_mr_pref_nid(struct lnet_peer_ni *lpni,
struct lnet_nid *nid);
-int lnet_add_peer_ni(lnet_nid_t key_nid, lnet_nid_t nid, bool mr, bool temp);
-int lnet_del_peer_ni(lnet_nid_t key_nid, lnet_nid_t nid);
+int lnet_add_peer_ni(struct lnet_nid *key_nid, struct lnet_nid *nid, bool mr,
+ bool temp);
+int lnet_del_peer_ni(struct lnet_nid *key_nid, struct lnet_nid *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,
char alivness[LNET_MAX_STR_LEN],
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,
char alivness[LNET_MAX_STR_LEN],
case IOC_LIBCFS_ADD_PEER_NI: {
struct lnet_ioctl_peer_cfg *cfg = arg;
case IOC_LIBCFS_ADD_PEER_NI: {
struct lnet_ioctl_peer_cfg *cfg = arg;
+ struct lnet_nid prim_nid;
if (cfg->prcfg_hdr.ioc_len < sizeof(*cfg))
return -EINVAL;
mutex_lock(&the_lnet.ln_api_mutex);
if (cfg->prcfg_hdr.ioc_len < sizeof(*cfg))
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);
+ lnet_nid4_to_nid(cfg->prcfg_prim_nid, &prim_nid);
+ lnet_nid4_to_nid(cfg->prcfg_cfg_nid, &nid);
+ rc = lnet_add_peer_ni(&prim_nid, &nid, cfg->prcfg_mr, false);
mutex_unlock(&the_lnet.ln_api_mutex);
return rc;
}
case IOC_LIBCFS_DEL_PEER_NI: {
struct lnet_ioctl_peer_cfg *cfg = arg;
mutex_unlock(&the_lnet.ln_api_mutex);
return rc;
}
case IOC_LIBCFS_DEL_PEER_NI: {
struct lnet_ioctl_peer_cfg *cfg = arg;
+ struct lnet_nid prim_nid;
if (cfg->prcfg_hdr.ioc_len < sizeof(*cfg))
return -EINVAL;
mutex_lock(&the_lnet.ln_api_mutex);
if (cfg->prcfg_hdr.ioc_len < sizeof(*cfg))
return -EINVAL;
mutex_lock(&the_lnet.ln_api_mutex);
- rc = lnet_del_peer_ni(cfg->prcfg_prim_nid,
- cfg->prcfg_cfg_nid);
+ lnet_nid4_to_nid(cfg->prcfg_prim_nid, &prim_nid);
+ lnet_nid4_to_nid(cfg->prcfg_cfg_nid, &nid);
+ rc = lnet_del_peer_ni(&prim_nid,
+ &nid);
mutex_unlock(&the_lnet.ln_api_mutex);
return rc;
}
mutex_unlock(&the_lnet.ln_api_mutex);
return rc;
}
* -EBUSY: The lnet_peer_ni is the primary, and not the only peer_ni.
*/
static int
* -EBUSY: The lnet_peer_ni is the primary, and not the only peer_ni.
*/
static int
-lnet_peer_del_nid(struct lnet_peer *lp, lnet_nid_t nid4, unsigned int flags)
+lnet_peer_del_nid(struct lnet_peer *lp, struct lnet_nid *nid,
+ unsigned int flags)
{
struct lnet_peer_ni *lpni;
struct lnet_nid primary_nid = lp->lp_primary_nid;
{
struct lnet_peer_ni *lpni;
struct lnet_nid primary_nid = lp->lp_primary_nid;
int rc = 0;
bool force = (flags & LNET_PEER_RTR_NI_FORCE_DEL) ? true : false;
int rc = 0;
bool force = (flags & LNET_PEER_RTR_NI_FORCE_DEL) ? true : false;
- lnet_nid4_to_nid(nid4, &nid);
if (!(flags & LNET_PEER_CONFIGURED)) {
if (lp->lp_state & LNET_PEER_CONFIGURED) {
rc = -EPERM;
if (!(flags & LNET_PEER_CONFIGURED)) {
if (lp->lp_state & LNET_PEER_CONFIGURED) {
rc = -EPERM;
- lpni = lnet_peer_ni_find_locked(&nid);
+ lpni = lnet_peer_ni_find_locked(nid);
if (!lpni) {
rc = -ENOENT;
goto out;
if (!lpni) {
rc = -ENOENT;
goto out;
* This function only allows deletion of the primary NID if it
* is the only NID.
*/
* This function only allows deletion of the primary NID if it
* is the only NID.
*/
- if (nid_same(&nid, &lp->lp_primary_nid) && lp->lp_nnis != 1 && !force) {
+ if (nid_same(nid, &lp->lp_primary_nid) && lp->lp_nnis != 1 && !force) {
rc = -EBUSY;
goto out;
}
lnet_net_lock(LNET_LOCK_EX);
rc = -EBUSY;
goto out;
}
lnet_net_lock(LNET_LOCK_EX);
- if (nid_same(&nid, &lp->lp_primary_nid) && lp->lp_nnis != 1 && force) {
+ if (nid_same(nid, &lp->lp_primary_nid) && lp->lp_nnis != 1 && force) {
struct lnet_peer_ni *lpni2;
/* assign the next peer_ni to be the primary */
lpni2 = lnet_get_next_peer_ni_locked(lp, NULL, lpni);
struct lnet_peer_ni *lpni2;
/* assign the next peer_ni to be the primary */
lpni2 = lnet_get_next_peer_ni_locked(lp, NULL, lpni);
out:
CDEBUG(D_NET, "peer %s NID %s flags %#x: %d\n",
out:
CDEBUG(D_NET, "peer %s NID %s flags %#x: %d\n",
- libcfs_nidstr(&primary_nid), libcfs_nidstr(&nid),
+ libcfs_nidstr(&primary_nid), libcfs_nidstr(nid),
int
LNetAddPeer(lnet_nid_t *nids, __u32 num_nids)
{
int
LNetAddPeer(lnet_nid_t *nids, __u32 num_nids)
{
+ struct lnet_nid pnid = LNET_ANY_NID;
rc = 0;
for (i = 0; i < num_nids; i++) {
rc = 0;
for (i = 0; i < num_nids; i++) {
if (nids[i] == LNET_NID_LO_0)
continue;
if (nids[i] == LNET_NID_LO_0)
continue;
- if (!pnid) {
- pnid = nids[i];
- rc = lnet_add_peer_ni(pnid, LNET_NID_ANY, mr, true);
+ lnet_nid4_to_nid(nids[i], &nid);
+ if (LNET_NID_IS_ANY(&pnid)) {
+ lnet_nid4_to_nid(nids[i], &pnid);
+ rc = lnet_add_peer_ni(&pnid, &LNET_ANY_NID, mr, true);
} else if (lnet_peer_discovery_disabled) {
} else if (lnet_peer_discovery_disabled) {
- rc = lnet_add_peer_ni(nids[i], LNET_NID_ANY, mr, true);
+ lnet_nid4_to_nid(nids[i], &nid);
+ rc = lnet_add_peer_ni(&nid, &LNET_ANY_NID, mr, true);
- rc = lnet_add_peer_ni(pnid, nids[i], mr, true);
+ lnet_nid4_to_nid(nids[i], &nid);
+ rc = lnet_add_peer_ni(&pnid, &nid, mr, true);
}
if (rc && rc != -EEXIST)
}
if (rc && rc != -EEXIST)
* being created/modified/deleted by a different thread.
*/
int
* being created/modified/deleted by a different thread.
*/
int
-lnet_add_peer_ni(lnet_nid_t prim_nid4, lnet_nid_t nid4, bool mr, bool temp)
+lnet_add_peer_ni(struct lnet_nid *prim_nid, struct lnet_nid *nid, bool mr,
+ bool temp)
- struct lnet_nid prim_nid, nid;
struct lnet_peer *lp = NULL;
struct lnet_peer_ni *lpni;
unsigned int flags = 0;
/* The prim_nid must always be specified */
struct lnet_peer *lp = NULL;
struct lnet_peer_ni *lpni;
unsigned int flags = 0;
/* The prim_nid must always be specified */
- if (prim_nid4 == LNET_NID_ANY)
+ if (LNET_NID_IS_ANY(prim_nid))
- lnet_nid4_to_nid(prim_nid4, &prim_nid);
- lnet_nid4_to_nid(nid4, &nid);
-
if (!temp)
flags = LNET_PEER_CONFIGURED;
if (!temp)
flags = LNET_PEER_CONFIGURED;
* If nid isn't specified, we must create a new peer with
* prim_nid as its primary nid.
*/
* If nid isn't specified, we must create a new peer with
* prim_nid as its primary nid.
*/
- if (nid4 == LNET_NID_ANY)
- return lnet_peer_add(&prim_nid, flags);
+ if (LNET_NID_IS_ANY(nid))
+ return lnet_peer_add(prim_nid, flags);
/* Look up the prim_nid, which must exist. */
/* Look up the prim_nid, which must exist. */
- lpni = lnet_peer_ni_find_locked(&prim_nid);
+ lpni = lnet_peer_ni_find_locked(prim_nid);
if (!lpni)
return -ENOENT;
lnet_peer_ni_decref_locked(lpni);
if (!lpni)
return -ENOENT;
lnet_peer_ni_decref_locked(lpni);
/* Peer must have been configured. */
if (!temp && !(lp->lp_state & LNET_PEER_CONFIGURED)) {
CDEBUG(D_NET, "peer %s was not configured\n",
/* Peer must have been configured. */
if (!temp && !(lp->lp_state & LNET_PEER_CONFIGURED)) {
CDEBUG(D_NET, "peer %s was not configured\n",
- libcfs_nidstr(&prim_nid));
+ libcfs_nidstr(prim_nid));
return -ENOENT;
}
/* Primary NID must match */
return -ENOENT;
}
/* Primary NID must match */
- if (!nid_same(&lp->lp_primary_nid, &prim_nid)) {
+ if (!nid_same(&lp->lp_primary_nid, prim_nid)) {
CDEBUG(D_NET, "prim_nid %s is not primary for peer %s\n",
CDEBUG(D_NET, "prim_nid %s is not primary for peer %s\n",
- libcfs_nidstr(&prim_nid),
+ libcfs_nidstr(prim_nid),
libcfs_nidstr(&lp->lp_primary_nid));
return -ENODEV;
}
libcfs_nidstr(&lp->lp_primary_nid));
return -ENODEV;
}
/* Multi-Rail flag must match. */
if ((lp->lp_state ^ flags) & LNET_PEER_MULTI_RAIL) {
CDEBUG(D_NET, "multi-rail state mismatch for peer %s\n",
/* Multi-Rail flag must match. */
if ((lp->lp_state ^ flags) & LNET_PEER_MULTI_RAIL) {
CDEBUG(D_NET, "multi-rail state mismatch for peer %s\n",
- libcfs_nidstr(&prim_nid));
+ libcfs_nidstr(prim_nid));
- return lnet_peer_add_nid(lp, &nid, flags);
+ return lnet_peer_add_nid(lp, nid, flags);
* being modified/deleted by a different thread.
*/
int
* being modified/deleted by a different thread.
*/
int
-lnet_del_peer_ni(lnet_nid_t prim_nid4, lnet_nid_t nid)
+lnet_del_peer_ni(struct lnet_nid *prim_nid, struct lnet_nid *nid)
{
struct lnet_peer *lp;
struct lnet_peer_ni *lpni;
unsigned int flags;
{
struct lnet_peer *lp;
struct lnet_peer_ni *lpni;
unsigned int flags;
- struct lnet_nid prim_nid;
- if (prim_nid4 == LNET_NID_ANY)
+ if (!prim_nid || LNET_NID_IS_ANY(prim_nid))
- lnet_nid4_to_nid(prim_nid4, &prim_nid);
- lpni = lnet_peer_ni_find_locked(&prim_nid);
+ lpni = lnet_peer_ni_find_locked(prim_nid);
if (!lpni)
return -ENOENT;
lnet_peer_ni_decref_locked(lpni);
lp = lpni->lpni_peer_net->lpn_peer;
if (!lpni)
return -ENOENT;
lnet_peer_ni_decref_locked(lpni);
lp = lpni->lpni_peer_net->lpn_peer;
- if (!nid_same(&prim_nid, &lp->lp_primary_nid)) {
+ if (!nid_same(prim_nid, &lp->lp_primary_nid)) {
CDEBUG(D_NET, "prim_nid %s is not primary for peer %s\n",
CDEBUG(D_NET, "prim_nid %s is not primary for peer %s\n",
- libcfs_nidstr(&prim_nid),
+ libcfs_nidstr(prim_nid),
libcfs_nidstr(&lp->lp_primary_nid));
return -ENODEV;
}
libcfs_nidstr(&lp->lp_primary_nid));
return -ENODEV;
}
if (lp->lp_rtr_refcount > 0) {
lnet_net_unlock(LNET_LOCK_EX);
CERROR("%s is a router. Can not be deleted\n",
if (lp->lp_rtr_refcount > 0) {
lnet_net_unlock(LNET_LOCK_EX);
CERROR("%s is a router. Can not be deleted\n",
- libcfs_nidstr(&prim_nid));
+ libcfs_nidstr(prim_nid));
return -EBUSY;
}
lnet_net_unlock(LNET_LOCK_EX);
return -EBUSY;
}
lnet_net_unlock(LNET_LOCK_EX);
- if (nid == LNET_NID_ANY || nid == lnet_nid_to_nid4(&lp->lp_primary_nid))
+ if (LNET_NID_IS_ANY(nid) || nid_same(nid, &lp->lp_primary_nid))
return lnet_peer_del(lp);
flags = LNET_PEER_CONFIGURED;
return lnet_peer_del(lp);
flags = LNET_PEER_CONFIGURED;
* being told that the router changed its primary_nid
* then it's okay to delete it.
*/
* being told that the router changed its primary_nid
* then it's okay to delete it.
*/
+ lnet_nid4_to_nid(delnis[i], &nid);
if (lp->lp_rtr_refcount > 0)
flags |= LNET_PEER_RTR_NI_FORCE_DEL;
if (lp->lp_rtr_refcount > 0)
flags |= LNET_PEER_RTR_NI_FORCE_DEL;
- rc = lnet_peer_del_nid(lp, delnis[i], flags);
+ rc = lnet_peer_del_nid(lp, &nid, flags);
if (rc) {
CERROR("Error deleting NID %s from peer %s: %d\n",
libcfs_nid2str(delnis[i]),
if (rc) {
CERROR("Error deleting NID %s from peer %s: %d\n",
libcfs_nid2str(delnis[i]),