*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* lnet/lnet/peer.c
*/
#endif
#include <linux/uaccess.h>
+#include <lnet/udsp.h>
#include <lnet/lib-lnet.h>
#include <uapi/linux/lnet/lnet-dlc.h>
list_for_each_entry_safe(lpni, tmp, &the_lnet.ln_remote_peer_ni_list,
lpni_on_remote_peer_ni_list) {
- if (LNET_NIDNET(lpni->lpni_nid) == net->net_id) {
+ if (LNET_NID_NET(&lpni->lpni_nid) == net->net_id) {
lpni->lpni_net = net;
spin_lock(&lpni->lpni_lock);
}
static struct lnet_peer_ni *
-lnet_peer_ni_alloc(lnet_nid_t nid)
+lnet_peer_ni_alloc(struct lnet_nid *nid)
{
struct lnet_peer_ni *lpni;
struct lnet_net *net;
INIT_LIST_HEAD(&lpni->lpni_peer_nis);
INIT_LIST_HEAD(&lpni->lpni_recovery);
INIT_LIST_HEAD(&lpni->lpni_on_remote_peer_ni_list);
+ INIT_LIST_HEAD(&lpni->lpni_rtr_pref_nids);
LNetInvalidateMDHandle(&lpni->lpni_recovery_ping_mdh);
+ kref_init(&lpni->lpni_kref);
+ lpni->lpni_sel_priority = LNET_MAX_SELECTION_PRIORITY;
spin_lock_init(&lpni->lpni_lock);
else
lpni->lpni_ns_status = LNET_NI_STATUS_UP;
lpni->lpni_ping_feats = LNET_PING_FEAT_INVAL;
- lpni->lpni_nid = nid;
+ lpni->lpni_nid = *nid;
lpni->lpni_cpt = cpt;
atomic_set(&lpni->lpni_healthv, LNET_MAX_HEALTH_VALUE);
- net = lnet_get_net_locked(LNET_NIDNET(nid));
+ net = lnet_get_net_locked(LNET_NID_NET(nid));
lpni->lpni_net = net;
if (net) {
lpni->lpni_txcredits = net->net_tunables.lct_peer_tx_credits;
* list so it can be easily found and revisited.
*/
/* FIXME: per-net implementation instead? */
- atomic_inc(&lpni->lpni_refcount);
+ lnet_peer_ni_addref_locked(lpni);
list_add_tail(&lpni->lpni_on_remote_peer_ni_list,
&the_lnet.ln_remote_peer_ni_list);
}
- CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nid2str(lpni->lpni_nid));
+ CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nidstr(&lpni->lpni_nid));
return lpni;
}
INIT_LIST_HEAD(&lpn->lpn_peer_nets);
INIT_LIST_HEAD(&lpn->lpn_peer_nis);
lpn->lpn_net_id = net_id;
+ lpn->lpn_sel_priority = LNET_MAX_SELECTION_PRIORITY;
CDEBUG(D_NET, "%p net %s\n", lpn, libcfs_net2str(lpn->lpn_net_id));
}
static struct lnet_peer *
-lnet_peer_alloc(lnet_nid_t nid)
+lnet_peer_alloc(struct lnet_nid *nid)
{
struct lnet_peer *lp;
INIT_LIST_HEAD(&lp->lp_rtr_list);
init_waitqueue_head(&lp->lp_dc_waitq);
spin_lock_init(&lp->lp_lock);
- lp->lp_primary_nid = nid;
+ lp->lp_primary_nid = *nid;
+ lp->lp_disc_src_nid = LNET_ANY_NID;
+ lp->lp_disc_dst_nid = LNET_ANY_NID;
if (lnet_peers_start_down())
lp->lp_alive = false;
else
* to ever use a different interface when sending messages to
* myself.
*/
- if (nid == LNET_NID_LO_0)
+ if (nid_is_lo0(nid))
lp->lp_state = LNET_PEER_NO_DISCOVERY;
lp->lp_cpt = lnet_nid_cpt_hash(nid, LNET_CPT_NUMBER);
- CDEBUG(D_NET, "%p nid %s\n", lp, libcfs_nid2str(lp->lp_primary_nid));
+ CDEBUG(D_NET, "%p nid %s\n", lp, libcfs_nidstr(&lp->lp_primary_nid));
return lp;
}
void
lnet_destroy_peer_locked(struct lnet_peer *lp)
{
- CDEBUG(D_NET, "%p nid %s\n", lp, libcfs_nid2str(lp->lp_primary_nid));
+ CDEBUG(D_NET, "%p nid %s\n", lp, libcfs_nidstr(&lp->lp_primary_nid));
LASSERT(atomic_read(&lp->lp_refcount) == 0);
LASSERT(lp->lp_rtr_refcount == 0);
wake_up(&the_lnet.ln_dc_waitq);
}
CDEBUG(D_NET, "peer %s NID %s\n",
- libcfs_nid2str(lp->lp_primary_nid),
- libcfs_nid2str(lpni->lpni_nid));
+ libcfs_nidstr(&lp->lp_primary_nid),
+ libcfs_nidstr(&lpni->lpni_nid));
}
/* called with lnet_net_lock LNET_LOCK_EX held */
/* don't remove a peer_ni if it's also a gateway */
if (lnet_isrouter(lpni) && !force) {
CERROR("Peer NI %s is a gateway. Can not delete it\n",
- libcfs_nid2str(lpni->lpni_nid));
+ libcfs_nidstr(&lpni->lpni_nid));
return -EBUSY;
}
struct lnet_peer_ni *lpni = NULL, *lpni2;
int rc = 0, rc2 = 0;
- CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(peer->lp_primary_nid));
+ CDEBUG(D_NET, "peer %s\n", libcfs_nidstr(&peer->lp_primary_nid));
+
+ spin_lock(&peer->lp_lock);
+ peer->lp_state |= LNET_PEER_MARK_DELETED;
+ spin_unlock(&peer->lp_lock);
lpni = lnet_get_next_peer_ni_locked(peer, NULL, lpni);
while (lpni != NULL) {
return rc2;
}
+/*
+ * Discovering this peer is taking too long. Cancel any Ping or Push
+ * that discovery is waiting on by unlinking the relevant MDs. The
+ * lnet_discovery_event_handler() will proceed from here and complete
+ * the cleanup.
+ */
+static void lnet_peer_cancel_discovery(struct lnet_peer *lp)
+{
+ struct lnet_handle_md ping_mdh;
+ struct lnet_handle_md push_mdh;
+
+ LNetInvalidateMDHandle(&ping_mdh);
+ LNetInvalidateMDHandle(&push_mdh);
+
+ spin_lock(&lp->lp_lock);
+ if (lp->lp_state & LNET_PEER_PING_SENT) {
+ ping_mdh = lp->lp_ping_mdh;
+ LNetInvalidateMDHandle(&lp->lp_ping_mdh);
+ }
+ if (lp->lp_state & LNET_PEER_PUSH_SENT) {
+ push_mdh = lp->lp_push_mdh;
+ LNetInvalidateMDHandle(&lp->lp_push_mdh);
+ }
+ spin_unlock(&lp->lp_lock);
+
+ if (!LNetMDHandleIsInvalid(ping_mdh))
+ LNetMDUnlink(ping_mdh);
+ if (!LNetMDHandleIsInvalid(push_mdh))
+ LNetMDUnlink(push_mdh);
+}
+
static int
lnet_peer_del(struct lnet_peer *peer)
{
+ int rc;
+
+ lnet_peer_cancel_discovery(peer);
lnet_net_lock(LNET_LOCK_EX);
- lnet_peer_del_locked(peer);
+ rc = lnet_peer_del_locked(peer);
lnet_net_unlock(LNET_LOCK_EX);
- return 0;
+ return rc;
}
/*
* -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 nid, unsigned flags)
+lnet_peer_del_nid(struct lnet_peer *lp, lnet_nid_t nid4, unsigned int flags)
{
struct lnet_peer_ni *lpni;
- lnet_nid_t primary_nid = lp->lp_primary_nid;
+ struct lnet_nid primary_nid = lp->lp_primary_nid;
+ struct lnet_nid nid;
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;
goto out;
}
}
- lpni = lnet_find_peer_ni_locked(nid);
+
+ lpni = lnet_peer_ni_find_locked(&nid);
if (!lpni) {
rc = -ENOENT;
goto out;
* This function only allows deletion of the primary NID if it
* is the only NID.
*/
- if (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);
- if (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);
out:
CDEBUG(D_NET, "peer %s NID %s flags %#x: %d\n",
- libcfs_nid2str(primary_nid), libcfs_nid2str(nid), flags, rc);
+ libcfs_nidstr(&primary_nid), libcfs_nidstr(&nid),
+ flags, rc);
return rc;
}
continue;
peer = lpni->lpni_peer_net->lpn_peer;
- if (peer->lp_primary_nid != lpni->lpni_nid) {
+ if (!nid_same(&peer->lp_primary_nid,
+ &lpni->lpni_nid)) {
lnet_peer_ni_del_locked(lpni, false);
continue;
}
{
struct lnet_peer_ni *lp;
struct lnet_peer_ni *tmp;
- lnet_nid_t gw_nid;
+ struct lnet_nid gw_nid;
int i;
for (i = 0; i < LNET_PEER_HASH_SIZE; i++) {
gw_nid = lp->lpni_peer_net->lpn_peer->lp_primary_nid;
lnet_net_unlock(LNET_LOCK_EX);
- lnet_del_route(LNET_NIDNET(LNET_NID_ANY), gw_nid);
+ lnet_del_route(LNET_NET_ANY, &gw_nid);
lnet_net_lock(LNET_LOCK_EX);
}
}
}
static struct lnet_peer_ni *
-lnet_get_peer_ni_locked(struct lnet_peer_table *ptable, lnet_nid_t nid)
+lnet_get_peer_ni_locked(struct lnet_peer_table *ptable, struct lnet_nid *nid)
{
struct list_head *peers;
struct lnet_peer_ni *lp;
peers = &ptable->pt_hash[lnet_nid2peerhash(nid)];
list_for_each_entry(lp, peers, lpni_hashlist) {
- if (lp->lpni_nid == nid) {
+ if (nid_same(&lp->lpni_nid, nid)) {
lnet_peer_ni_addref_locked(lp);
return lp;
}
}
struct lnet_peer_ni *
-lnet_find_peer_ni_locked(lnet_nid_t nid)
+lnet_find_peer_ni_locked(lnet_nid_t nid4)
+{
+ struct lnet_peer_ni *lpni;
+ struct lnet_peer_table *ptable;
+ int cpt;
+ struct lnet_nid nid;
+
+ lnet_nid4_to_nid(nid4, &nid);
+
+ cpt = lnet_nid_cpt_hash(&nid, LNET_CPT_NUMBER);
+
+ ptable = the_lnet.ln_peer_tables[cpt];
+ lpni = lnet_get_peer_ni_locked(ptable, &nid);
+
+ return lpni;
+}
+
+struct lnet_peer_ni *
+lnet_peer_ni_find_locked(struct lnet_nid *nid)
{
struct lnet_peer_ni *lpni;
struct lnet_peer_table *ptable;
return NULL;
list_for_each_entry(lpni, &lpn->lpn_peer_nis, lpni_peer_nis) {
- if (lpni->lpni_nid == nid)
+ if (lnet_nid_to_nid4(&lpni->lpni_nid) == nid)
+ return lpni;
+ }
+
+ return NULL;
+}
+
+struct lnet_peer_ni *
+lnet_peer_ni_get_locked(struct lnet_peer *lp, struct lnet_nid *nid)
+{
+ struct lnet_peer_net *lpn;
+ struct lnet_peer_ni *lpni;
+
+ lpn = lnet_peer_get_net_locked(lp, LNET_NID_NET(nid));
+ if (!lpn)
+ return NULL;
+
+ list_for_each_entry(lpni, &lpn->lpn_peer_nis, lpni_peer_nis) {
+ if (nid_same(&lpni->lpni_nid, nid))
return lpni;
}
}
struct lnet_peer *
-lnet_find_peer(lnet_nid_t nid)
+lnet_find_peer4(lnet_nid_t nid)
{
struct lnet_peer_ni *lpni;
struct lnet_peer *lp = NULL;
return lp;
}
+struct lnet_peer *
+lnet_find_peer(struct lnet_nid *nid)
+{
+ struct lnet_peer_ni *lpni;
+ struct lnet_peer *lp = NULL;
+ int cpt;
+
+ cpt = lnet_net_lock_current();
+ lpni = lnet_peer_ni_find_locked(nid);
+ if (lpni) {
+ lp = lpni->lpni_peer_net->lpn_peer;
+ lnet_peer_addref_locked(lp);
+ lnet_peer_ni_decref_locked(lpni);
+ }
+ lnet_net_unlock(cpt);
+
+ return lp;
+}
+
struct lnet_peer_net *
lnet_get_next_peer_net_locked(struct lnet_peer *lp, __u32 prev_lpn_id)
{
for (cpt = 0; cpt < lncpt; cpt++) {
ptable = the_lnet.ln_peer_tables[cpt];
list_for_each_entry(lp, &ptable->pt_peer_list, lp_peer_list) {
+ if (!nid_is_nid4(&lp->lp_primary_nid))
+ continue;
if (i >= count)
goto done;
- id.nid = lp->lp_primary_nid;
+ id.nid = lnet_nid_to_nid4(&lp->lp_primary_nid);
if (copy_to_user(&ids[i], &id, sizeof(id)))
goto done;
i++;
wake_up(&the_lnet.ln_dc_waitq);
}
+/* find the NID in the preferred gateways for the remote peer
+ * return:
+ * false: list is not empty and NID is not preferred
+ * false: list is empty
+ * true: nid is found in the list
+ */
+bool
+lnet_peer_is_pref_rtr_locked(struct lnet_peer_ni *lpni,
+ struct lnet_nid *gw_nid)
+{
+ struct lnet_nid_list *ne;
+
+ CDEBUG(D_NET, "%s: rtr pref emtpy: %d\n",
+ libcfs_nidstr(&lpni->lpni_nid),
+ list_empty(&lpni->lpni_rtr_pref_nids));
+
+ if (list_empty(&lpni->lpni_rtr_pref_nids))
+ return false;
+
+ /* iterate through all the preferred NIDs and see if any of them
+ * matches the provided gw_nid
+ */
+ list_for_each_entry(ne, &lpni->lpni_rtr_pref_nids, nl_list) {
+ CDEBUG(D_NET, "Comparing pref %s with gw %s\n",
+ libcfs_nidstr(&ne->nl_nid),
+ libcfs_nidstr(gw_nid));
+ if (nid_same(&ne->nl_nid, gw_nid))
+ return true;
+ }
+
+ return false;
+}
+
+void
+lnet_peer_clr_pref_rtrs(struct lnet_peer_ni *lpni)
+{
+ struct list_head zombies;
+ struct lnet_nid_list *ne;
+ struct lnet_nid_list *tmp;
+ int cpt = lpni->lpni_cpt;
+
+ INIT_LIST_HEAD(&zombies);
+
+ lnet_net_lock(cpt);
+ list_splice_init(&lpni->lpni_rtr_pref_nids, &zombies);
+ lnet_net_unlock(cpt);
+
+ list_for_each_entry_safe(ne, tmp, &zombies, nl_list) {
+ list_del(&ne->nl_list);
+ LIBCFS_FREE(ne, sizeof(*ne));
+ }
+}
+
+int
+lnet_peer_add_pref_rtr(struct lnet_peer_ni *lpni,
+ struct lnet_nid *gw_nid)
+{
+ int cpt = lpni->lpni_cpt;
+ struct lnet_nid_list *ne = NULL;
+
+ /* This function is called with api_mutex held. When the api_mutex
+ * is held the list can not be modified, as it is only modified as
+ * a result of applying a UDSP and that happens under api_mutex
+ * lock.
+ */
+ __must_hold(&the_lnet.ln_api_mutex);
+
+ list_for_each_entry(ne, &lpni->lpni_rtr_pref_nids, nl_list) {
+ if (nid_same(&ne->nl_nid, gw_nid))
+ return -EEXIST;
+ }
+
+ LIBCFS_CPT_ALLOC(ne, lnet_cpt_table(), cpt, sizeof(*ne));
+ if (!ne)
+ return -ENOMEM;
+
+ ne->nl_nid = *gw_nid;
+
+ /* Lock the cpt to protect against addition and checks in the
+ * selection algorithm
+ */
+ lnet_net_lock(cpt);
+ list_add(&ne->nl_list, &lpni->lpni_rtr_pref_nids);
+ lnet_net_unlock(cpt);
+
+ return 0;
+}
+
/*
* Test whether a ni is a preferred ni for this peer_ni, e.g, whether
* this is a preferred point-to-point path. Call with lnet_net_lock in
* shared mmode.
*/
bool
-lnet_peer_is_pref_nid_locked(struct lnet_peer_ni *lpni, lnet_nid_t nid)
+lnet_peer_is_pref_nid_locked(struct lnet_peer_ni *lpni, struct lnet_nid *nid)
{
- int i;
+ struct lnet_nid_list *ne;
if (lpni->lpni_pref_nnids == 0)
return false;
if (lpni->lpni_pref_nnids == 1)
- return lpni->lpni_pref.nid == nid;
- for (i = 0; i < lpni->lpni_pref_nnids; i++) {
- if (lpni->lpni_pref.nids[i] == nid)
+ return nid_same(&lpni->lpni_pref.nid, nid);
+ list_for_each_entry(ne, &lpni->lpni_pref.nids, nl_list) {
+ if (nid_same(&ne->nl_nid, nid))
return true;
}
return false;
* defined. Only to be used for non-multi-rail peer_ni.
*/
int
-lnet_peer_ni_set_non_mr_pref_nid(struct lnet_peer_ni *lpni, lnet_nid_t nid)
+lnet_peer_ni_set_non_mr_pref_nid(struct lnet_peer_ni *lpni,
+ struct lnet_nid *nid)
{
int rc = 0;
+ if (!nid)
+ return -EINVAL;
spin_lock(&lpni->lpni_lock);
- if (nid == LNET_NID_ANY) {
+ if (LNET_NID_IS_ANY(nid)) {
rc = -EINVAL;
} else if (lpni->lpni_pref_nnids > 0) {
rc = -EPERM;
} else if (lpni->lpni_pref_nnids == 0) {
- lpni->lpni_pref.nid = nid;
+ lpni->lpni_pref.nid = *nid;
lpni->lpni_pref_nnids = 1;
lpni->lpni_state |= LNET_PEER_NI_NON_MR_PREF;
}
spin_unlock(&lpni->lpni_lock);
CDEBUG(D_NET, "peer %s nid %s: %d\n",
- libcfs_nid2str(lpni->lpni_nid), libcfs_nid2str(nid), rc);
+ libcfs_nidstr(&lpni->lpni_nid), libcfs_nidstr(nid), rc);
return rc;
}
spin_unlock(&lpni->lpni_lock);
CDEBUG(D_NET, "peer %s: %d\n",
- libcfs_nid2str(lpni->lpni_nid), rc);
+ libcfs_nidstr(&lpni->lpni_nid), rc);
return rc;
}
+void
+lnet_peer_ni_set_selection_priority(struct lnet_peer_ni *lpni, __u32 priority)
+{
+ lpni->lpni_sel_priority = priority;
+}
+
/*
* Clear the preferred NIDs from a non-multi-rail peer.
*/
}
int
-lnet_peer_add_pref_nid(struct lnet_peer_ni *lpni, lnet_nid_t nid)
+lnet_peer_add_pref_nid(struct lnet_peer_ni *lpni, struct lnet_nid *nid)
{
- lnet_nid_t *nids = NULL;
- lnet_nid_t *oldnids = NULL;
struct lnet_peer *lp = lpni->lpni_peer_net->lpn_peer;
- int size;
- int i;
+ struct lnet_nid_list *ne1 = NULL;
+ struct lnet_nid_list *ne2 = NULL;
+ struct lnet_nid *tmp_nid = NULL;
int rc = 0;
- if (nid == LNET_NID_ANY) {
+ if (LNET_NID_IS_ANY(nid)) {
rc = -EINVAL;
goto out;
}
- if (lpni->lpni_pref_nnids == 1 && lpni->lpni_pref.nid == nid) {
+ if (lpni->lpni_pref_nnids == 1 &&
+ nid_same(&lpni->lpni_pref.nid, nid)) {
rc = -EEXIST;
goto out;
}
/* A non-MR node may have only one preferred NI per peer_ni */
- if (lpni->lpni_pref_nnids > 0) {
- if (!(lp->lp_state & LNET_PEER_MULTI_RAIL)) {
- rc = -EPERM;
- goto out;
- }
+ if (lpni->lpni_pref_nnids > 0 &&
+ !(lp->lp_state & LNET_PEER_MULTI_RAIL)) {
+ rc = -EPERM;
+ goto out;
}
+ /* add the new preferred nid to the list of preferred nids */
if (lpni->lpni_pref_nnids != 0) {
- size = sizeof(*nids) * (lpni->lpni_pref_nnids + 1);
- LIBCFS_CPT_ALLOC(nids, lnet_cpt_table(), lpni->lpni_cpt, size);
- if (!nids) {
+ size_t alloc_size = sizeof(*ne1);
+
+ if (lpni->lpni_pref_nnids == 1) {
+ tmp_nid = &lpni->lpni_pref.nid;
+ INIT_LIST_HEAD(&lpni->lpni_pref.nids);
+ }
+
+ list_for_each_entry(ne1, &lpni->lpni_pref.nids, nl_list) {
+ if (nid_same(&ne1->nl_nid, nid)) {
+ rc = -EEXIST;
+ goto out;
+ }
+ }
+
+ LIBCFS_CPT_ALLOC(ne1, lnet_cpt_table(), lpni->lpni_cpt,
+ alloc_size);
+ if (!ne1) {
rc = -ENOMEM;
goto out;
}
- for (i = 0; i < lpni->lpni_pref_nnids; i++) {
- if (lpni->lpni_pref.nids[i] == nid) {
- LIBCFS_FREE(nids, size);
- rc = -EEXIST;
+
+ /* move the originally stored nid to the list */
+ if (lpni->lpni_pref_nnids == 1) {
+ LIBCFS_CPT_ALLOC(ne2, lnet_cpt_table(),
+ lpni->lpni_cpt, alloc_size);
+ if (!ne2) {
+ rc = -ENOMEM;
goto out;
}
- nids[i] = lpni->lpni_pref.nids[i];
+ INIT_LIST_HEAD(&ne2->nl_list);
+ ne2->nl_nid = *tmp_nid;
}
- nids[i] = nid;
+ ne1->nl_nid = *nid;
}
lnet_net_lock(LNET_LOCK_EX);
spin_lock(&lpni->lpni_lock);
if (lpni->lpni_pref_nnids == 0) {
- lpni->lpni_pref.nid = nid;
+ lpni->lpni_pref.nid = *nid;
} else {
- oldnids = lpni->lpni_pref.nids;
- lpni->lpni_pref.nids = nids;
+ if (ne2)
+ list_add_tail(&ne2->nl_list, &lpni->lpni_pref.nids);
+ list_add_tail(&ne1->nl_list, &lpni->lpni_pref.nids);
}
lpni->lpni_pref_nnids++;
lpni->lpni_state &= ~LNET_PEER_NI_NON_MR_PREF;
spin_unlock(&lpni->lpni_lock);
lnet_net_unlock(LNET_LOCK_EX);
- if (oldnids) {
- size = sizeof(*nids) * (lpni->lpni_pref_nnids - 1);
- CFS_FREE_PTR_ARRAY(oldnids, size);
- }
out:
if (rc == -EEXIST && (lpni->lpni_state & LNET_PEER_NI_NON_MR_PREF)) {
spin_lock(&lpni->lpni_lock);
spin_unlock(&lpni->lpni_lock);
}
CDEBUG(D_NET, "peer %s nid %s: %d\n",
- libcfs_nid2str(lp->lp_primary_nid), libcfs_nid2str(nid), rc);
+ libcfs_nidstr(&lp->lp_primary_nid), libcfs_nidstr(nid), rc);
return rc;
}
int
-lnet_peer_del_pref_nid(struct lnet_peer_ni *lpni, lnet_nid_t nid)
+lnet_peer_del_pref_nid(struct lnet_peer_ni *lpni, struct lnet_nid *nid)
{
- lnet_nid_t *nids = NULL;
- lnet_nid_t *oldnids = NULL;
struct lnet_peer *lp = lpni->lpni_peer_net->lpn_peer;
- int size;
- int i, j;
+ struct lnet_nid_list *ne = NULL;
int rc = 0;
if (lpni->lpni_pref_nnids == 0) {
}
if (lpni->lpni_pref_nnids == 1) {
- if (lpni->lpni_pref.nid != nid) {
- rc = -ENOENT;
- goto out;
- }
- } else if (lpni->lpni_pref_nnids == 2) {
- if (lpni->lpni_pref.nids[0] != nid &&
- lpni->lpni_pref.nids[1] != nid) {
+ if (!nid_same(&lpni->lpni_pref.nid, nid)) {
rc = -ENOENT;
goto out;
}
} else {
- size = sizeof(*nids) * (lpni->lpni_pref_nnids - 1);
- LIBCFS_CPT_ALLOC(nids, lnet_cpt_table(), lpni->lpni_cpt, size);
- if (!nids) {
- rc = -ENOMEM;
- goto out;
- }
- for (i = 0, j = 0; i < lpni->lpni_pref_nnids; i++) {
- if (lpni->lpni_pref.nids[i] != nid)
- continue;
- nids[j++] = lpni->lpni_pref.nids[i];
- }
- /* Check if we actually removed a nid. */
- if (j == lpni->lpni_pref_nnids) {
- LIBCFS_FREE(nids, size);
- rc = -ENOENT;
- goto out;
+ list_for_each_entry(ne, &lpni->lpni_pref.nids, nl_list) {
+ if (nid_same(&ne->nl_nid, nid))
+ goto remove_nid_entry;
}
+ rc = -ENOENT;
+ ne = NULL;
+ goto out;
}
+remove_nid_entry:
lnet_net_lock(LNET_LOCK_EX);
spin_lock(&lpni->lpni_lock);
- if (lpni->lpni_pref_nnids == 1) {
- lpni->lpni_pref.nid = LNET_NID_ANY;
- } else if (lpni->lpni_pref_nnids == 2) {
- oldnids = lpni->lpni_pref.nids;
- if (oldnids[0] == nid)
- lpni->lpni_pref.nid = oldnids[1];
- else
- lpni->lpni_pref.nid = oldnids[2];
- } else {
- oldnids = lpni->lpni_pref.nids;
- lpni->lpni_pref.nids = nids;
+ if (lpni->lpni_pref_nnids == 1)
+ lpni->lpni_pref.nid = LNET_ANY_NID;
+ else {
+ list_del_init(&ne->nl_list);
+ if (lpni->lpni_pref_nnids == 2) {
+ struct lnet_nid_list *ne, *tmp;
+
+ list_for_each_entry_safe(ne, tmp,
+ &lpni->lpni_pref.nids,
+ nl_list) {
+ lpni->lpni_pref.nid = ne->nl_nid;
+ list_del_init(&ne->nl_list);
+ LIBCFS_FREE(ne, sizeof(*ne));
+ }
+ }
}
lpni->lpni_pref_nnids--;
lpni->lpni_state &= ~LNET_PEER_NI_NON_MR_PREF;
spin_unlock(&lpni->lpni_lock);
lnet_net_unlock(LNET_LOCK_EX);
- if (oldnids) {
- size = sizeof(*nids) * (lpni->lpni_pref_nnids + 1);
- CFS_FREE_PTR_ARRAY(oldnids, size);
- }
+ if (ne)
+ LIBCFS_FREE(ne, sizeof(*ne));
out:
CDEBUG(D_NET, "peer %s nid %s: %d\n",
- libcfs_nid2str(lp->lp_primary_nid), libcfs_nid2str(nid), rc);
+ libcfs_nidstr(&lp->lp_primary_nid), libcfs_nidstr(nid), rc);
return rc;
}
-lnet_nid_t
-lnet_peer_primary_nid_locked(lnet_nid_t nid)
+void
+lnet_peer_clr_pref_nids(struct lnet_peer_ni *lpni)
+{
+ struct list_head zombies;
+ struct lnet_nid_list *ne;
+ struct lnet_nid_list *tmp;
+
+ INIT_LIST_HEAD(&zombies);
+
+ lnet_net_lock(LNET_LOCK_EX);
+ if (lpni->lpni_pref_nnids == 1)
+ lpni->lpni_pref.nid = LNET_ANY_NID;
+ else if (lpni->lpni_pref_nnids > 1)
+ list_splice_init(&lpni->lpni_pref.nids, &zombies);
+ lpni->lpni_pref_nnids = 0;
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ list_for_each_entry_safe(ne, tmp, &zombies, nl_list) {
+ list_del_init(&ne->nl_list);
+ LIBCFS_FREE(ne, sizeof(*ne));
+ }
+}
+
+void
+lnet_peer_primary_nid_locked(struct lnet_nid *nid, struct lnet_nid *result)
{
struct lnet_peer_ni *lpni;
- lnet_nid_t primary_nid = nid;
- lpni = lnet_find_peer_ni_locked(nid);
+ *result = *nid;
+ lpni = lnet_peer_ni_find_locked(nid);
if (lpni) {
- primary_nid = lpni->lpni_peer_net->lpn_peer->lp_primary_nid;
+ *result = lpni->lpni_peer_net->lpn_peer->lp_primary_nid;
lnet_peer_ni_decref_locked(lpni);
}
-
- return primary_nid;
}
bool
return rc;
}
-lnet_nid_t
-LNetPrimaryNID(lnet_nid_t nid)
+int
+LNetAddPeer(lnet_nid_t *nids, __u32 num_nids)
+{
+ lnet_nid_t pnid = 0;
+ bool mr;
+ int i, rc;
+
+ if (!nids || num_nids < 1)
+ return -EINVAL;
+
+ rc = LNetNIInit(LNET_PID_ANY);
+ if (rc < 0)
+ return rc;
+
+ mutex_lock(&the_lnet.ln_api_mutex);
+
+ mr = lnet_peer_discovery_disabled == 0;
+
+ rc = 0;
+ for (i = 0; i < num_nids; i++) {
+ if (nids[i] == LNET_NID_LO_0)
+ continue;
+
+ if (!pnid) {
+ pnid = nids[i];
+ rc = lnet_add_peer_ni(pnid, LNET_NID_ANY, mr, true);
+ } else if (lnet_peer_discovery_disabled) {
+ rc = lnet_add_peer_ni(nids[i], LNET_NID_ANY, mr, true);
+ } else {
+ rc = lnet_add_peer_ni(pnid, nids[i], mr, true);
+ }
+
+ if (rc && rc != -EEXIST)
+ goto unlock;
+ }
+
+unlock:
+ mutex_unlock(&the_lnet.ln_api_mutex);
+
+ LNetNIFini();
+
+ return rc == -EEXIST ? 0 : rc;
+}
+EXPORT_SYMBOL(LNetAddPeer);
+
+void LNetPrimaryNID(struct lnet_nid *nid)
{
struct lnet_peer *lp;
struct lnet_peer_ni *lpni;
- lnet_nid_t primary_nid = nid;
+ struct lnet_nid orig;
int rc = 0;
int cpt;
- if (nid == LNET_NID_LO_0)
- return LNET_NID_LO_0;
+ if (!nid || nid_is_lo0(nid))
+ return;
+ orig = *nid;
cpt = lnet_net_lock_current();
- lpni = lnet_nid2peerni_locked(nid, LNET_NID_ANY, cpt);
+ lpni = lnet_peerni_by_nid_locked(nid, NULL, cpt);
if (IS_ERR(lpni)) {
rc = PTR_ERR(lpni);
goto out_unlock;
}
lp = lpni->lpni_peer_net->lpn_peer;
- while (!lnet_peer_is_uptodate(lp)) {
+ /* If discovery is disabled locally then we needn't bother running
+ * discovery here because discovery will not modify whatever
+ * primary NID is currently set for this peer. If the specified peer is
+ * down then this discovery can introduce long delays into the mount
+ * process, so skip it if it isn't necessary.
+ */
+ while (!lnet_peer_discovery_disabled && !lnet_peer_is_uptodate(lp)) {
+ spin_lock(&lp->lp_lock);
+ /* force a full discovery cycle */
+ lp->lp_state |= LNET_PEER_FORCE_PING | LNET_PEER_FORCE_PUSH;
+ spin_unlock(&lp->lp_lock);
+
rc = lnet_discover_peer_locked(lpni, cpt, true);
if (rc)
goto out_decref;
+ /* The lpni (or lp) for this NID may have changed and our ref is
+ * the only thing keeping the old one around. Release the ref
+ * and lookup the lpni again
+ */
+ lnet_peer_ni_decref_locked(lpni);
+ lpni = lnet_peer_ni_find_locked(nid);
+ if (!lpni) {
+ rc = -ENOENT;
+ goto out_unlock;
+ }
lp = lpni->lpni_peer_net->lpn_peer;
- /* Only try once if discovery is disabled */
+ /* If we find that the peer has discovery disabled then we will
+ * not modify whatever primary NID is currently set for this
+ * peer. Thus, we can break out of this loop even if the peer
+ * is not fully up to date.
+ */
if (lnet_is_discovery_disabled(lp))
break;
}
- primary_nid = lp->lp_primary_nid;
+ *nid = lp->lp_primary_nid;
out_decref:
lnet_peer_ni_decref_locked(lpni);
out_unlock:
lnet_net_unlock(cpt);
- CDEBUG(D_NET, "NID %s primary NID %s rc %d\n", libcfs_nid2str(nid),
- libcfs_nid2str(primary_nid), rc);
- return primary_nid;
+ CDEBUG(D_NET, "NID %s primary NID %s rc %d\n", libcfs_nidstr(&orig),
+ libcfs_nidstr(nid), rc);
}
EXPORT_SYMBOL(LNetPrimaryNID);
* may be attached to a different peer, in which case it will be
* properly detached first. The whole operation is done atomically.
*
- * Always returns 0. This is the last function called from functions
- * that do return an int, so returning 0 here allows the compiler to
- * do a tail call.
+ * This function consumes the reference on lpni and Always returns 0.
+ * This is the last function called from functions that do return an
+ * int, so returning 0 here allows the compiler to do a tail call.
*/
static int
lnet_peer_attach_peer_ni(struct lnet_peer *lp,
unsigned flags)
{
struct lnet_peer_table *ptable;
+ bool new_lpn = false;
+ int rc;
/* Install the new peer_ni */
lnet_net_lock(LNET_LOCK_EX);
/* Add peer_ni to global peer table hash, if necessary. */
if (list_empty(&lpni->lpni_hashlist)) {
- int hash = lnet_nid2peerhash(lpni->lpni_nid);
+ int hash = lnet_nid2peerhash(&lpni->lpni_nid);
ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
list_add_tail(&lpni->lpni_hashlist, &ptable->pt_hash[hash]);
ptable->pt_version++;
- /* This is the 1st refcount on lpni. */
- atomic_inc(&lpni->lpni_refcount);
+ lnet_peer_ni_addref_locked(lpni);
}
/* Detach the peer_ni from an existing peer, if necessary. */
/* Add peer_ni to peer_net */
lpni->lpni_peer_net = lpn;
- list_add_tail(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
+ if (nid_same(&lp->lp_primary_nid, &lpni->lpni_nid))
+ list_add(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
+ else
+ list_add_tail(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
lnet_update_peer_net_healthv(lpni);
lnet_peer_net_addref_locked(lpn);
/* Add peer_net to peer */
if (!lpn->lpn_peer) {
+ new_lpn = true;
lpn->lpn_peer = lp;
- list_add_tail(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+ if (nid_same(&lp->lp_primary_nid, &lpni->lpni_nid))
+ list_add(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+ else
+ list_add_tail(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
lnet_peer_addref_locked(lp);
}
spin_unlock(&lp->lp_lock);
lp->lp_nnis++;
- lnet_net_unlock(LNET_LOCK_EX);
+
+ /* apply UDSPs */
+ if (new_lpn) {
+ rc = lnet_udsp_apply_policies_on_lpn(lpn);
+ if (rc)
+ CERROR("Failed to apply UDSPs on lpn %s\n",
+ libcfs_net2str(lpn->lpn_net_id));
+ }
+ rc = lnet_udsp_apply_policies_on_lpni(lpni);
+ if (rc)
+ CERROR("Failed to apply UDSPs on lpni %s\n",
+ libcfs_nidstr(&lpni->lpni_nid));
CDEBUG(D_NET, "peer %s NID %s flags %#x\n",
- libcfs_nid2str(lp->lp_primary_nid),
- libcfs_nid2str(lpni->lpni_nid), flags);
+ libcfs_nidstr(&lp->lp_primary_nid),
+ libcfs_nidstr(&lpni->lpni_nid), flags);
+ lnet_peer_ni_decref_locked(lpni);
+ lnet_net_unlock(LNET_LOCK_EX);
return 0;
}
* Call with the lnet_api_mutex held.
*/
static int
-lnet_peer_add(lnet_nid_t nid, unsigned flags)
+lnet_peer_add(lnet_nid_t nid4, unsigned int flags)
{
+ struct lnet_nid nid;
struct lnet_peer *lp;
struct lnet_peer_net *lpn;
struct lnet_peer_ni *lpni;
int rc = 0;
- LASSERT(nid != LNET_NID_ANY);
+ LASSERT(nid4 != LNET_NID_ANY);
/*
* No need for the lnet_net_lock here, because the
* lnet_api_mutex is held.
*/
- lpni = lnet_find_peer_ni_locked(nid);
+ lpni = lnet_find_peer_ni_locked(nid4);
if (lpni) {
/* A peer with this NID already exists. */
lp = lpni->lpni_peer_net->lpn_peer;
* that an existing peer is being modified.
*/
if (lp->lp_state & LNET_PEER_CONFIGURED) {
- if (lp->lp_primary_nid != nid)
+ if (lnet_nid_to_nid4(&lp->lp_primary_nid) != nid4)
rc = -EEXIST;
else if ((lp->lp_state ^ flags) & LNET_PEER_MULTI_RAIL)
rc = -EPERM;
goto out;
+ } else if (!(flags & LNET_PEER_CONFIGURED)) {
+ if (lnet_nid_to_nid4(&lp->lp_primary_nid) == nid4) {
+ rc = -EEXIST;
+ goto out;
+ }
}
/* Delete and recreate as a configured peer. */
- lnet_peer_del(lp);
+ rc = lnet_peer_del(lp);
+ if (rc)
+ goto out;
}
/* Create peer, peer_net, and peer_ni. */
rc = -ENOMEM;
- lp = lnet_peer_alloc(nid);
+ lnet_nid4_to_nid(nid4, &nid);
+ lp = lnet_peer_alloc(&nid);
if (!lp)
goto out;
- lpn = lnet_peer_net_alloc(LNET_NIDNET(nid));
+ lpn = lnet_peer_net_alloc(LNET_NID_NET(&nid));
if (!lpn)
goto out_free_lp;
- lpni = lnet_peer_ni_alloc(nid);
+ lpni = lnet_peer_ni_alloc(&nid);
if (!lpni)
goto out_free_lpn;
LIBCFS_FREE(lp, sizeof(*lp));
out:
CDEBUG(D_NET, "peer %s NID flags %#x: %d\n",
- libcfs_nid2str(nid), flags, rc);
+ libcfs_nid2str(nid4), flags, rc);
return rc;
}
* non-multi-rail peer.
*/
static int
-lnet_peer_add_nid(struct lnet_peer *lp, lnet_nid_t nid, unsigned flags)
+lnet_peer_add_nid(struct lnet_peer *lp, lnet_nid_t nid4, unsigned int flags)
{
struct lnet_peer_net *lpn;
struct lnet_peer_ni *lpni;
+ struct lnet_nid nid;
int rc = 0;
LASSERT(lp);
- LASSERT(nid != LNET_NID_ANY);
+ LASSERT(nid4 != LNET_NID_ANY);
+
+ lnet_nid4_to_nid(nid4, &nid);
/* A configured peer can only be updated through configuration. */
if (!(flags & LNET_PEER_CONFIGURED)) {
goto out;
}
- lpni = lnet_find_peer_ni_locked(nid);
+ lpni = lnet_find_peer_ni_locked(nid4);
if (lpni) {
/*
* A peer_ni already exists. This is only a problem if
* it is not connected to this peer and was configured
* by DLC.
*/
- lnet_peer_ni_decref_locked(lpni);
if (lpni->lpni_peer_net->lpn_peer == lp)
- goto out;
+ goto out_free_lpni;
if (lnet_peer_ni_is_configured(lpni)) {
rc = -EEXIST;
- goto out;
+ goto out_free_lpni;
}
/* If this is the primary NID, destroy the peer. */
if (lnet_peer_ni_is_primary(lpni)) {
struct lnet_peer *rtr_lp =
- lpni->lpni_peer_net->lpn_peer;
+ lpni->lpni_peer_net->lpn_peer;
int rtr_refcount = rtr_lp->lp_rtr_refcount;
/*
* if we're trying to delete a router it means
lnet_rtr_transfer_to_peer(rtr_lp, lp);
}
lnet_peer_del(lpni->lpni_peer_net->lpn_peer);
- lpni = lnet_peer_ni_alloc(nid);
+ lnet_peer_ni_decref_locked(lpni);
+ lpni = lnet_peer_ni_alloc(&nid);
if (!lpni) {
rc = -ENOMEM;
- goto out;
+ goto out_free_lpni;
}
}
} else {
- lpni = lnet_peer_ni_alloc(nid);
+ lpni = lnet_peer_ni_alloc(&nid);
if (!lpni) {
rc = -ENOMEM;
- goto out;
+ goto out_free_lpni;
}
}
* Get the peer_net. Check that we're not adding a second
* peer_ni on a peer_net of a non-multi-rail peer.
*/
- lpn = lnet_peer_get_net_locked(lp, LNET_NIDNET(nid));
+ lpn = lnet_peer_get_net_locked(lp, LNET_NIDNET(nid4));
if (!lpn) {
- lpn = lnet_peer_net_alloc(LNET_NIDNET(nid));
+ lpn = lnet_peer_net_alloc(LNET_NIDNET(nid4));
if (!lpn) {
rc = -ENOMEM;
goto out_free_lpni;
return lnet_peer_attach_peer_ni(lp, lpn, lpni, flags);
out_free_lpni:
- /* If the peer_ni was allocated above its peer_net pointer is NULL */
- if (!lpni->lpni_peer_net)
- LIBCFS_FREE(lpni, sizeof(*lpni));
+ lnet_peer_ni_decref_locked(lpni);
out:
CDEBUG(D_NET, "peer %s NID %s flags %#x: %d\n",
- libcfs_nid2str(lp->lp_primary_nid), libcfs_nid2str(nid),
+ libcfs_nidstr(&lp->lp_primary_nid), libcfs_nid2str(nid4),
flags, rc);
return rc;
}
* Call with the lnet_api_mutex held.
*/
static int
-lnet_peer_set_primary_nid(struct lnet_peer *lp, lnet_nid_t nid, unsigned flags)
+lnet_peer_set_primary_nid(struct lnet_peer *lp, lnet_nid_t nid,
+ unsigned int flags)
{
- lnet_nid_t old = lp->lp_primary_nid;
+ struct lnet_nid old = lp->lp_primary_nid;
int rc = 0;
- if (lp->lp_primary_nid == nid)
+ if (lnet_nid_to_nid4(&lp->lp_primary_nid) == nid)
goto out;
+
+ lnet_nid4_to_nid(nid, &lp->lp_primary_nid);
+
rc = lnet_peer_add_nid(lp, nid, flags);
- if (rc)
+ if (rc) {
+ lp->lp_primary_nid = old;
goto out;
- lp->lp_primary_nid = nid;
+ }
out:
CDEBUG(D_NET, "peer %s NID %s: %d\n",
- libcfs_nid2str(old), libcfs_nid2str(nid), rc);
+ libcfs_nidstr(&old), libcfs_nid2str(nid), rc);
+
return rc;
}
/*
* lpni creation initiated due to traffic either sending or receiving.
+ * Callers must hold ln_api_mutex
+ * Ref taken on lnet_peer_ni returned by this function
*/
-static int
-lnet_peer_ni_traffic_add(lnet_nid_t nid, lnet_nid_t pref)
+static struct lnet_peer_ni *
+lnet_peer_ni_traffic_add(struct lnet_nid *nid, struct lnet_nid *pref)
+__must_hold(&the_lnet.ln_api_mutex)
{
- struct lnet_peer *lp;
- struct lnet_peer_net *lpn;
+ struct lnet_peer *lp = NULL;
+ struct lnet_peer_net *lpn = NULL;
struct lnet_peer_ni *lpni;
unsigned flags = 0;
int rc = 0;
- if (nid == LNET_NID_ANY) {
+ if (LNET_NID_IS_ANY(nid)) {
rc = -EINVAL;
- goto out;
+ goto out_err;
}
/* lnet_net_lock is not needed here because ln_api_lock is held */
- lpni = lnet_find_peer_ni_locked(nid);
+ lpni = lnet_peer_ni_find_locked(nid);
if (lpni) {
/*
* We must have raced with another thread. Since we
* traffic, we just assume everything is ok and
* return.
*/
- lnet_peer_ni_decref_locked(lpni);
goto out;
}
rc = -ENOMEM;
lp = lnet_peer_alloc(nid);
if (!lp)
- goto out;
- lpn = lnet_peer_net_alloc(LNET_NIDNET(nid));
+ goto out_err;
+ lpn = lnet_peer_net_alloc(LNET_NID_NET(nid));
if (!lpn)
- goto out_free_lp;
+ goto out_err;
lpni = lnet_peer_ni_alloc(nid);
if (!lpni)
- goto out_free_lpn;
- if (pref != LNET_NID_ANY)
- lnet_peer_ni_set_non_mr_pref_nid(lpni, pref);
+ goto out_err;
+ lnet_peer_ni_set_non_mr_pref_nid(lpni, pref);
- return lnet_peer_attach_peer_ni(lp, lpn, lpni, flags);
+ /* lnet_peer_attach_peer_ni() always returns 0 */
+ rc = lnet_peer_attach_peer_ni(lp, lpn, lpni, flags);
-out_free_lpn:
- LIBCFS_FREE(lpn, sizeof(*lpn));
-out_free_lp:
- LIBCFS_FREE(lp, sizeof(*lp));
+ lnet_peer_ni_addref_locked(lpni);
+
+out_err:
+ if (rc) {
+ if (lpn)
+ LIBCFS_FREE(lpn, sizeof(*lpn));
+ if (lp)
+ LIBCFS_FREE(lp, sizeof(*lp));
+ lpni = ERR_PTR(rc);
+ }
out:
- CDEBUG(D_NET, "peer %s: %d\n", libcfs_nid2str(nid), rc);
- return rc;
+ CDEBUG(D_NET, "peer %s: %d\n", libcfs_nidstr(nid), rc);
+ return lpni;
}
/*
* being created/modified/deleted by a different thread.
*/
int
-lnet_add_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid, bool mr)
+lnet_add_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid, bool mr, bool temp)
{
struct lnet_peer *lp = NULL;
struct lnet_peer_ni *lpni;
- unsigned flags;
+ unsigned int flags = 0;
/* The prim_nid must always be specified */
if (prim_nid == LNET_NID_ANY)
return -EINVAL;
- flags = LNET_PEER_CONFIGURED;
+ if (!temp)
+ flags = LNET_PEER_CONFIGURED;
+
if (mr)
flags |= LNET_PEER_MULTI_RAIL;
lp = lpni->lpni_peer_net->lpn_peer;
/* Peer must have been configured. */
- if (!(lp->lp_state & LNET_PEER_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) {
+ if (lnet_nid_to_nid4(&lp->lp_primary_nid) != prim_nid) {
CDEBUG(D_NET, "prim_nid %s is not primary for peer %s\n",
libcfs_nid2str(prim_nid),
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
return -ENODEV;
}
lnet_peer_ni_decref_locked(lpni);
lp = lpni->lpni_peer_net->lpn_peer;
- if (prim_nid != lp->lp_primary_nid) {
+ if (prim_nid != lnet_nid_to_nid4(&lp->lp_primary_nid)) {
CDEBUG(D_NET, "prim_nid %s is not primary for peer %s\n",
libcfs_nid2str(prim_nid),
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
return -ENODEV;
}
}
lnet_net_unlock(LNET_LOCK_EX);
- if (nid == LNET_NID_ANY || nid == lp->lp_primary_nid)
+ if (nid == LNET_NID_ANY || nid == lnet_nid_to_nid4(&lp->lp_primary_nid))
return lnet_peer_del(lp);
flags = LNET_PEER_CONFIGURED;
}
void
-lnet_destroy_peer_ni_locked(struct lnet_peer_ni *lpni)
+lnet_destroy_peer_ni_locked(struct kref *ref)
{
+ struct lnet_peer_ni *lpni = container_of(ref, struct lnet_peer_ni,
+ lpni_kref);
struct lnet_peer_table *ptable;
struct lnet_peer_net *lpn;
- CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nid2str(lpni->lpni_nid));
+ CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nidstr(&lpni->lpni_nid));
- LASSERT(atomic_read(&lpni->lpni_refcount) == 0);
+ LASSERT(kref_read(&lpni->lpni_kref) == 0);
LASSERT(list_empty(&lpni->lpni_txq));
LASSERT(lpni->lpni_txqnob == 0);
LASSERT(list_empty(&lpni->lpni_peer_nis));
LASSERT(list_empty(&lpni->lpni_on_remote_peer_ni_list));
lpn = lpni->lpni_peer_net;
- lpni->lpni_peer_net = NULL;
- lpni->lpni_net = NULL;
-
- /* remove the peer ni from the zombie list */
- ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
- spin_lock(&ptable->pt_zombie_lock);
- list_del_init(&lpni->lpni_hashlist);
- ptable->pt_zombies--;
- spin_unlock(&ptable->pt_zombie_lock);
+ lpni->lpni_peer_net = NULL;
+ lpni->lpni_net = NULL;
+
+ if (!list_empty(&lpni->lpni_hashlist)) {
+ /* remove the peer ni from the zombie list */
+ ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
+ spin_lock(&ptable->pt_zombie_lock);
+ list_del_init(&lpni->lpni_hashlist);
+ ptable->pt_zombies--;
+ spin_unlock(&ptable->pt_zombie_lock);
+ }
- if (lpni->lpni_pref_nnids > 1)
- CFS_FREE_PTR_ARRAY(lpni->lpni_pref.nids, lpni->lpni_pref_nnids);
+ if (lpni->lpni_pref_nnids > 1) {
+ struct lnet_nid_list *ne, *tmp;
+ list_for_each_entry_safe(ne, tmp, &lpni->lpni_pref.nids,
+ nl_list) {
+ list_del_init(&ne->nl_list);
+ LIBCFS_FREE(ne, sizeof(*ne));
+ }
+ }
LIBCFS_FREE(lpni, sizeof(*lpni));
- lnet_peer_net_decref_locked(lpn);
+ if (lpn)
+ lnet_peer_net_decref_locked(lpn);
}
struct lnet_peer_ni *
-lnet_nid2peerni_ex(lnet_nid_t nid, int cpt)
+lnet_nid2peerni_ex(struct lnet_nid *nid)
+__must_hold(&the_lnet.ln_api_mutex)
{
struct lnet_peer_ni *lpni = NULL;
- int rc;
if (the_lnet.ln_state != LNET_STATE_RUNNING)
return ERR_PTR(-ESHUTDOWN);
* find if a peer_ni already exists.
* If so then just return that.
*/
- lpni = lnet_find_peer_ni_locked(nid);
+ lpni = lnet_peer_ni_find_locked(nid);
if (lpni)
return lpni;
- lnet_net_unlock(cpt);
-
- rc = lnet_peer_ni_traffic_add(nid, LNET_NID_ANY);
- if (rc) {
- lpni = ERR_PTR(rc);
- goto out_net_relock;
- }
+ lnet_net_unlock(LNET_LOCK_EX);
- lpni = lnet_find_peer_ni_locked(nid);
- LASSERT(lpni);
+ lpni = lnet_peer_ni_traffic_add(nid, NULL);
-out_net_relock:
- lnet_net_lock(cpt);
+ lnet_net_lock(LNET_LOCK_EX);
return lpni;
}
* hold on the peer_ni.
*/
struct lnet_peer_ni *
-lnet_nid2peerni_locked(lnet_nid_t nid, lnet_nid_t pref, int cpt)
+lnet_peerni_by_nid_locked(struct lnet_nid *nid,
+ struct lnet_nid *pref, int cpt)
{
struct lnet_peer_ni *lpni = NULL;
- int rc;
if (the_lnet.ln_state != LNET_STATE_RUNNING)
return ERR_PTR(-ESHUTDOWN);
* find if a peer_ni already exists.
* If so then just return that.
*/
- lpni = lnet_find_peer_ni_locked(nid);
+ lpni = lnet_peer_ni_find_locked(nid);
if (lpni)
return lpni;
lnet_net_unlock(cpt);
mutex_lock(&the_lnet.ln_api_mutex);
/*
- * Shutdown is only set under the ln_api_lock, so a single
+ * the_lnet.ln_state is only modified under the ln_api_lock, so a single
* check here is sufficent.
*/
- if (the_lnet.ln_state != LNET_STATE_RUNNING) {
- lpni = ERR_PTR(-ESHUTDOWN);
- goto out_mutex_unlock;
- }
-
- rc = lnet_peer_ni_traffic_add(nid, pref);
- if (rc) {
- lpni = ERR_PTR(rc);
- goto out_mutex_unlock;
- }
-
- lpni = lnet_find_peer_ni_locked(nid);
- LASSERT(lpni);
+ if (the_lnet.ln_state == LNET_STATE_RUNNING)
+ lpni = lnet_peer_ni_traffic_add(nid, pref);
-out_mutex_unlock:
mutex_unlock(&the_lnet.ln_api_mutex);
lnet_net_lock(cpt);
/* Lock has been dropped, check again for shutdown. */
if (the_lnet.ln_state != LNET_STATE_RUNNING) {
- if (!IS_ERR(lpni))
+ if (!IS_ERR_OR_NULL(lpni))
lnet_peer_ni_decref_locked(lpni);
lpni = ERR_PTR(-ESHUTDOWN);
}
return lpni;
}
+struct lnet_peer_ni *
+lnet_nid2peerni_locked(lnet_nid_t nid4, lnet_nid_t pref4, int cpt)
+{
+ struct lnet_nid nid, pref;
+
+ lnet_nid4_to_nid(nid4, &nid);
+ lnet_nid4_to_nid(pref4, &pref);
+ if (pref4 == LNET_NID_ANY)
+ return lnet_peerni_by_nid_locked(&nid, NULL, cpt);
+ else
+ return lnet_peerni_by_nid_locked(&nid, &pref, cpt);
+}
+
bool
lnet_peer_gw_discovery(struct lnet_peer *lp)
{
return rc;
}
+/* Add the message to the peer's lp_dc_pendq and queue the peer for discovery */
+void
+lnet_peer_queue_message(struct lnet_peer *lp, struct lnet_msg *msg)
+{
+ /* The discovery thread holds net_lock/EX and lp_lock when it splices
+ * the lp_dc_pendq onto a local list for resending. Thus, we do the same
+ * when adding to the list and queuing the peer to ensure that we do not
+ * strand any messages on the lp_dc_pendq. This scheme ensures the
+ * message will be resent even if the peer is already being discovered.
+ * Therefore we needn't check the return value of
+ * lnet_peer_queue_for_discovery(lp).
+ */
+ lnet_net_lock(LNET_LOCK_EX);
+ spin_lock(&lp->lp_lock);
+ list_add_tail(&msg->msg_list, &lp->lp_dc_pendq);
+ spin_unlock(&lp->lp_lock);
+ lnet_peer_queue_for_discovery(lp);
+ lnet_net_unlock(LNET_LOCK_EX);
+}
+
/*
* Queue a peer for the attention of the discovery thread. Call with
* lnet_net_lock/EX held. Returns 0 if the peer was queued, and
}
CDEBUG(D_NET, "Queue peer %s: %d\n",
- libcfs_nid2str(lp->lp_primary_nid), rc);
+ libcfs_nidstr(&lp->lp_primary_nid), rc);
return rc;
}
* Discovery of a peer is complete. Wake all waiters on the peer.
* Call with lnet_net_lock/EX held.
*/
-static void lnet_peer_discovery_complete(struct lnet_peer *lp)
+static void lnet_peer_discovery_complete(struct lnet_peer *lp, int dc_error)
{
struct lnet_msg *msg, *tmp;
int rc = 0;
LIST_HEAD(pending_msgs);
CDEBUG(D_NET, "Discovery complete. Dequeue peer %s\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
list_del_init(&lp->lp_dc_list);
spin_lock(&lp->lp_lock);
+ if (dc_error) {
+ lp->lp_dc_error = dc_error;
+ lp->lp_state &= ~LNET_PEER_DISCOVERING;
+ lp->lp_state |= LNET_PEER_REDISCOVER;
+ }
list_splice_init(&lp->lp_dc_pendq, &pending_msgs);
spin_unlock(&lp->lp_lock);
- wake_up_all(&lp->lp_dc_waitq);
+ wake_up(&lp->lp_dc_waitq);
if (lp->lp_rtr_refcount > 0)
lnet_router_discovery_complete(lp);
/* iterate through all pending messages and send them again */
list_for_each_entry_safe(msg, tmp, &pending_msgs, msg_list) {
list_del_init(&msg->msg_list);
- if (lp->lp_dc_error) {
- lnet_finalize(msg, lp->lp_dc_error);
+ if (dc_error) {
+ lnet_finalize(msg, dc_error);
continue;
}
CDEBUG(D_NET, "sending pending message %s to target %s\n",
lnet_msgtyp2str(msg->msg_type),
- libcfs_id2str(msg->msg_target));
- rc = lnet_send(msg->msg_src_nid_param, msg,
- msg->msg_rtr_nid_param);
+ libcfs_idstr(&msg->msg_target));
+ rc = lnet_send(&msg->msg_src_nid_param, msg,
+ &msg->msg_rtr_nid_param);
if (rc < 0) {
CNETERR("Error sending %s to %s: %d\n",
lnet_msgtyp2str(msg->msg_type),
- libcfs_id2str(msg->msg_target), rc);
+ libcfs_idstr(&msg->msg_target), rc);
lnet_finalize(msg, rc);
}
}
pbuf = LNET_PING_INFO_TO_BUFFER(ev->md_start + ev->offset);
/* lnet_find_peer() adds a refcount */
- lp = lnet_find_peer(ev->source.nid);
+ lp = lnet_find_peer(&ev->source.nid);
if (!lp) {
CDEBUG(D_NET, "Push Put from unknown %s (source %s). Ignoring...\n",
- libcfs_nid2str(ev->initiator.nid),
- libcfs_nid2str(ev->source.nid));
+ libcfs_nidstr(&ev->initiator.nid),
+ libcfs_nidstr(&ev->source.nid));
pbuf->pb_needs_post = true;
return;
}
lp->lp_state |= LNET_PEER_FORCE_PING;
CDEBUG(D_NET, "Push Put error %d from %s (source %s)\n",
ev->status,
- libcfs_nid2str(lp->lp_primary_nid),
- libcfs_nid2str(ev->source.nid));
+ libcfs_nidstr(&lp->lp_primary_nid),
+ libcfs_nidstr(&ev->source.nid));
goto out;
}
lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
lp->lp_state |= LNET_PEER_FORCE_PING;
CDEBUG(D_NET, "Corrupted Push from %s\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
goto out;
}
*/
if (!(pbuf->pb_info.pi_features & LNET_PING_FEAT_MULTI_RAIL)) {
CERROR("Push from non-Multi-Rail peer %s dropped\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
goto out;
}
*/
if (!(pbuf->pb_info.pi_features & LNET_PING_FEAT_DISCOVERY)) {
CDEBUG(D_NET, "Peer %s has discovery disabled\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
/*
- * If the peer is going from discovery enabled to
- * discovery disabled, we need to reflect that in our
- * representation of the peer.
+ * Mark the peer for deletion if we already know about it
+ * and it's going from discovery set to no discovery set
*/
if (!(lp->lp_state & (LNET_PEER_NO_DISCOVERY |
- LNET_PEER_DISCOVERING)))
+ LNET_PEER_DISCOVERING)) &&
+ lp->lp_state & LNET_PEER_DISCOVERED) {
+ CDEBUG(D_NET, "Marking %s:0x%x for deletion\n",
+ libcfs_nidstr(&lp->lp_primary_nid),
+ lp->lp_state);
lp->lp_state |= LNET_PEER_MARK_DELETION;
+ }
lp->lp_state |= LNET_PEER_NO_DISCOVERY;
} else if (lp->lp_state & LNET_PEER_NO_DISCOVERY) {
CDEBUG(D_NET, "Peer %s has discovery enabled\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
lp->lp_state &= ~LNET_PEER_NO_DISCOVERY;
}
*/
if (lp->lp_state & LNET_PEER_MULTI_RAIL) {
CDEBUG(D_NET, "peer %s(%p) is MR\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
} else if (lp->lp_state & LNET_PEER_CONFIGURED) {
CWARN("Push says %s is Multi-Rail, DLC says not\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
} else if (lnet_peer_discovery_disabled) {
CDEBUG(D_NET, "peer %s(%p) not MR: DD disabled locally\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
} else if (lp->lp_state & LNET_PEER_NO_DISCOVERY) {
CDEBUG(D_NET, "peer %s(%p) not MR: DD disabled remotely\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
} else {
CDEBUG(D_NET, "peer %s(%p) is MR capable\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
lp->lp_state |= LNET_PEER_MULTI_RAIL;
lnet_peer_clr_non_mr_pref_nids(lp);
}
lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
lp->lp_state |= LNET_PEER_FORCE_PING;
CDEBUG(D_NET, "Truncated Push from %s (%d nids)\n",
- libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nidstr(&lp->lp_primary_nid),
pbuf->pb_info.pi_nnis);
goto out;
}
memcpy(&lp->lp_data->pb_info, &pbuf->pb_info,
LNET_PING_INFO_SIZE(pbuf->pb_info.pi_nnis));
CDEBUG(D_NET, "Ping/Push race from %s: %u vs %u\n",
- libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nidstr(&lp->lp_primary_nid),
LNET_PING_BUFFER_SEQNO(pbuf),
LNET_PING_BUFFER_SEQNO(lp->lp_data));
}
if (!lp->lp_data) {
lp->lp_state |= LNET_PEER_FORCE_PING;
CDEBUG(D_NET, "Cannot allocate Push buffer for %s %u\n",
- libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nidstr(&lp->lp_primary_nid),
LNET_PING_BUFFER_SEQNO(pbuf));
goto out;
}
LNET_PING_INFO_SIZE(pbuf->pb_info.pi_nnis));
lp->lp_state |= LNET_PEER_DATA_PRESENT;
CDEBUG(D_NET, "Received Push %s %u\n",
- libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nidstr(&lp->lp_primary_nid),
LNET_PING_BUFFER_SEQNO(pbuf));
out:
break;
if (lnet_peer_is_uptodate(lp))
break;
+ if (lp->lp_state & LNET_PEER_MARK_DELETED)
+ break;
lnet_peer_queue_for_discovery(lp);
count++;
CDEBUG(D_NET, "Discovery attempt # %d\n", count);
rc = lp->lp_dc_error;
else if (!block)
CDEBUG(D_NET, "non-blocking discovery\n");
- else if (!lnet_peer_is_uptodate(lp) && !lnet_is_discovery_disabled(lp))
+ else if (!lnet_peer_is_uptodate(lp) &&
+ !(lnet_is_discovery_disabled(lp) ||
+ (lp->lp_state & LNET_PEER_MARK_DELETED)))
goto again;
CDEBUG(D_NET, "peer %s NID %s: %d. %s\n",
- (lp ? libcfs_nid2str(lp->lp_primary_nid) : "(none)"),
- libcfs_nid2str(lpni->lpni_nid), rc,
+ (lp ? libcfs_nidstr(&lp->lp_primary_nid) : "(none)"),
+ libcfs_nidstr(&lpni->lpni_nid), rc,
(!block) ? "pending discovery" : "discovery complete");
return rc;
spin_unlock(&lp->lp_lock);
CDEBUG(D_NET, "peer %s ev->status %d\n",
- libcfs_nid2str(lp->lp_primary_nid), ev->status);
+ libcfs_nidstr(&lp->lp_primary_nid), ev->status);
}
/* Handle a Reply message. This is the reply to a Ping message. */
spin_lock(&lp->lp_lock);
+ lp->lp_disc_src_nid = ev->target.nid;
+ lp->lp_disc_dst_nid = ev->source.nid;
+
/*
* If some kind of error happened the contents of message
* cannot be used. Set PING_FAILED to trigger a retry.
lp->lp_ping_error = ev->status;
CDEBUG(D_NET, "Ping Reply error %d from %s (source %s)\n",
ev->status,
- libcfs_nid2str(lp->lp_primary_nid),
- libcfs_nid2str(ev->source.nid));
+ libcfs_nidstr(&lp->lp_primary_nid),
+ libcfs_nidstr(&ev->source.nid));
goto out;
}
lp->lp_state |= LNET_PEER_PING_FAILED;
lp->lp_ping_error = 0;
CDEBUG(D_NET, "Corrupted Ping Reply from %s: %d\n",
- libcfs_nid2str(lp->lp_primary_nid), rc);
+ libcfs_nidstr(&lp->lp_primary_nid), rc);
goto out;
}
-
/*
* The peer may have discovery disabled at its end. Set
* NO_DISCOVERY as appropriate.
*/
- if ((pbuf->pb_info.pi_features & LNET_PING_FEAT_DISCOVERY) &&
- !lnet_peer_discovery_disabled) {
- CDEBUG(D_NET, "Peer %s has discovery enabled\n",
- libcfs_nid2str(lp->lp_primary_nid));
- lp->lp_state &= ~LNET_PEER_NO_DISCOVERY;
- } else {
+ if (!(pbuf->pb_info.pi_features & LNET_PING_FEAT_DISCOVERY) ||
+ lnet_peer_discovery_disabled) {
CDEBUG(D_NET, "Peer %s has discovery disabled\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
+
+ /* Detect whether this peer has toggled discovery from on to
+ * off and whether we can delete and re-create the peer. Peers
+ * that were manually configured cannot be deleted by discovery.
+ * We need to delete this peer and re-create it if the peer was
+ * not configured manually, is currently considered DD capable,
+ * and either:
+ * 1. We've already discovered the peer (the peer has toggled
+ * the discovery feature from on to off), or
+ * 2. The peer is considered MR, but it was not user configured
+ * (this was a "temporary" peer created via the kernel APIs
+ * that we're discovering for the first time)
+ */
+ if (!(lp->lp_state & (LNET_PEER_CONFIGURED |
+ LNET_PEER_NO_DISCOVERY)) &&
+ (lp->lp_state & (LNET_PEER_DISCOVERED |
+ LNET_PEER_MULTI_RAIL))) {
+ CDEBUG(D_NET, "Marking %s:0x%x for deletion\n",
+ libcfs_nidstr(&lp->lp_primary_nid),
+ lp->lp_state);
+ lp->lp_state |= LNET_PEER_MARK_DELETION;
+ }
lp->lp_state |= LNET_PEER_NO_DISCOVERY;
+ } else {
+ CDEBUG(D_NET, "Peer %s has discovery enabled\n",
+ libcfs_nidstr(&lp->lp_primary_nid));
+ lp->lp_state &= ~LNET_PEER_NO_DISCOVERY;
}
/*
if (pbuf->pb_info.pi_features & LNET_PING_FEAT_MULTI_RAIL) {
if (lp->lp_state & LNET_PEER_MULTI_RAIL) {
CDEBUG(D_NET, "peer %s(%p) is MR\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
} else if (lp->lp_state & LNET_PEER_CONFIGURED) {
CWARN("Reply says %s is Multi-Rail, DLC says not\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
} else if (lnet_peer_discovery_disabled) {
CDEBUG(D_NET,
"peer %s(%p) not MR: DD disabled locally\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
} else if (lp->lp_state & LNET_PEER_NO_DISCOVERY) {
CDEBUG(D_NET,
"peer %s(%p) not MR: DD disabled remotely\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
} else {
CDEBUG(D_NET, "peer %s(%p) is MR capable\n",
- libcfs_nid2str(lp->lp_primary_nid), lp);
+ libcfs_nidstr(&lp->lp_primary_nid), lp);
lp->lp_state |= LNET_PEER_MULTI_RAIL;
lnet_peer_clr_non_mr_pref_nids(lp);
}
} else if (lp->lp_state & LNET_PEER_MULTI_RAIL) {
if (lp->lp_state & LNET_PEER_CONFIGURED) {
CWARN("DLC says %s is Multi-Rail, Reply says not\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
} else {
CERROR("Multi-Rail state vanished from %s\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
lp->lp_state &= ~LNET_PEER_MULTI_RAIL;
}
}
lp->lp_state |= LNET_PEER_PING_FAILED;
lp->lp_ping_error = 0;
CDEBUG(D_NET, "Truncated Reply from %s (%d nids)\n",
- libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nidstr(&lp->lp_primary_nid),
pbuf->pb_info.pi_nnis);
goto out;
}
*/
if (pbuf->pb_info.pi_features & LNET_PING_FEAT_MULTI_RAIL &&
pbuf->pb_info.pi_nnis > 1 &&
- lp->lp_primary_nid == pbuf->pb_info.pi_ni[1].ns_nid) {
+ lnet_nid_to_nid4(&lp->lp_primary_nid) ==
+ pbuf->pb_info.pi_ni[1].ns_nid) {
if (LNET_PING_BUFFER_SEQNO(pbuf) < lp->lp_peer_seqno)
CDEBUG(D_NET, "peer %s: seq# got %u have %u. peer rebooted?\n",
- libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nidstr(&lp->lp_primary_nid),
LNET_PING_BUFFER_SEQNO(pbuf),
lp->lp_peer_seqno);
/* We're happy with the state of the data in the buffer. */
CDEBUG(D_NET, "peer %s data present %u. state = 0x%x\n",
- libcfs_nid2str(lp->lp_primary_nid), lp->lp_peer_seqno, lp->lp_state);
+ libcfs_nidstr(&lp->lp_primary_nid), lp->lp_peer_seqno,
+ lp->lp_state);
if (lp->lp_state & LNET_PEER_DATA_PRESENT)
lnet_ping_buffer_decref(lp->lp_data);
else
out:
CDEBUG(D_NET, "%s Send to %s: %d\n",
(ev->msg_type == LNET_MSG_GET ? "Ping" : "Push"),
- libcfs_nid2str(ev->target.nid), rc);
+ libcfs_nidstr(&ev->target.nid), rc);
return rc;
}
lp->lp_state |= LNET_PEER_PING_FAILED;
lp->lp_ping_error = -ETIMEDOUT;
CDEBUG(D_NET, "Ping Unlink for message to peer %s\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
}
/* We've passed through LNetPut() */
if (lp->lp_state & LNET_PEER_PUSH_SENT) {
lp->lp_state |= LNET_PEER_PUSH_FAILED;
lp->lp_push_error = -ETIMEDOUT;
CDEBUG(D_NET, "Push Unlink for message to peer %s\n",
- libcfs_nid2str(lp->lp_primary_nid));
+ libcfs_nidstr(&lp->lp_primary_nid));
}
spin_unlock(&lp->lp_lock);
}
/* put peer back at end of request queue, if discovery not already
* done */
- if (rc == LNET_REDISCOVER_PEER && !lnet_peer_is_uptodate(lp)) {
+ if (rc == LNET_REDISCOVER_PEER && !lnet_peer_is_uptodate(lp) &&
+ lnet_peer_queue_for_discovery(lp)) {
list_move_tail(&lp->lp_dc_list, &the_lnet.ln_dc_request);
wake_up(&the_lnet.ln_dc_waitq);
}
static int lnet_peer_merge_data(struct lnet_peer *lp,
struct lnet_ping_buffer *pbuf)
{
+ struct lnet_peer_net *lpn;
struct lnet_peer_ni *lpni;
lnet_nid_t *curnis = NULL;
struct lnet_ni_status *addnis = NULL;
/* Construct the list of NIDs present in peer. */
lpni = NULL;
while ((lpni = lnet_get_next_peer_ni_locked(lp, NULL, lpni)) != NULL)
- curnis[ncurnis++] = lpni->lpni_nid;
+ curnis[ncurnis++] = lnet_nid_to_nid4(&lpni->lpni_nid);
/*
* Check for NIDs in pbuf not present in curnis[].
if (rc) {
CERROR("Error adding NID %s to peer %s: %d\n",
libcfs_nid2str(addnis[i].ns_nid),
- libcfs_nid2str(lp->lp_primary_nid), rc);
+ libcfs_nidstr(&lp->lp_primary_nid), rc);
if (rc == -ENOMEM)
goto out;
}
if (rc) {
CERROR("Error deleting NID %s from peer %s: %d\n",
libcfs_nid2str(delnis[i]),
- libcfs_nid2str(lp->lp_primary_nid), rc);
+ libcfs_nidstr(&lp->lp_primary_nid), rc);
if (rc == -ENOMEM)
goto out;
}
}
+
+ /* The peer net for the primary NID should be the first entry in the
+ * peer's lp_peer_nets list, and the peer NI for the primary NID should
+ * be the first entry in its peer net's lpn_peer_nis list.
+ */
+ lpni = lnet_find_peer_ni_locked(pbuf->pb_info.pi_ni[1].ns_nid);
+ if (!lpni) {
+ CERROR("Internal error: Failed to lookup peer NI for primary NID: %s\n",
+ libcfs_nid2str(pbuf->pb_info.pi_ni[1].ns_nid));
+ goto out;
+ }
+
+ lnet_peer_ni_decref_locked(lpni);
+
+ lpn = lpni->lpni_peer_net;
+ if (lpn->lpn_peer_nets.prev != &lp->lp_peer_nets)
+ list_move(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+
+ if (lpni->lpni_peer_nis.prev != &lpni->lpni_peer_net->lpn_peer_nis)
+ list_move(&lpni->lpni_peer_nis,
+ &lpni->lpni_peer_net->lpn_peer_nis);
+
/*
* Errors other than -ENOMEM are due to peers having been
* configured with DLC. Ignore these because DLC overrides
CFS_FREE_PTR_ARRAY(addnis, nnis);
CFS_FREE_PTR_ARRAY(delnis, nnis);
lnet_ping_buffer_decref(pbuf);
- CDEBUG(D_NET, "peer %s (%p): %d\n", libcfs_nid2str(lp->lp_primary_nid), lp, rc);
+ CDEBUG(D_NET, "peer %s (%p): %d\n",
+ libcfs_nidstr(&lp->lp_primary_nid), lp, rc);
if (rc) {
spin_lock(&lp->lp_lock);
if (pbuf)
return lnet_peer_merge_data(lp, pbuf);
- CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+ CDEBUG(D_NET, "peer %s\n", libcfs_nidstr(&lp->lp_primary_nid));
return 0;
}
return false;
}
+/* Delete a peer that has been marked for deletion. NB: when this peer was added
+ * to the discovery queue a reference was taken that will prevent the peer from
+ * actually being freed by this function. After this function exits the
+ * discovery thread should call lnet_peer_discovery_complete() which will
+ * drop that reference as well as wake any waiters that may also be holding a
+ * ref on the peer
+ */
+static int lnet_peer_deletion(struct lnet_peer *lp)
+__must_hold(&lp->lp_lock)
+{
+ struct list_head rlist;
+ struct lnet_route *route, *tmp;
+ int sensitivity = lp->lp_health_sensitivity;
+ int rc;
+
+ INIT_LIST_HEAD(&rlist);
+
+ lp->lp_state &= ~(LNET_PEER_DISCOVERING | LNET_PEER_FORCE_PING |
+ LNET_PEER_FORCE_PUSH);
+ CDEBUG(D_NET, "peer %s(%p) state %#x\n",
+ libcfs_nidstr(&lp->lp_primary_nid), lp, lp->lp_state);
+
+ /* no-op if lnet_peer_del() has already been called on this peer */
+ if (lp->lp_state & LNET_PEER_MARK_DELETED)
+ return 0;
+
+ spin_unlock(&lp->lp_lock);
+
+ mutex_lock(&the_lnet.ln_api_mutex);
+ if (the_lnet.ln_state != LNET_STATE_RUNNING ||
+ the_lnet.ln_dc_state != LNET_DC_STATE_RUNNING) {
+ mutex_unlock(&the_lnet.ln_api_mutex);
+ spin_lock(&lp->lp_lock);
+ return -ESHUTDOWN;
+ }
+
+ lnet_net_lock(LNET_LOCK_EX);
+ /* remove the peer from the discovery work
+ * queue if it's on there in preparation
+ * of deleting it.
+ */
+ if (!list_empty(&lp->lp_dc_list))
+ list_del_init(&lp->lp_dc_list);
+ list_for_each_entry_safe(route, tmp,
+ &lp->lp_routes,
+ lr_gwlist)
+ lnet_move_route(route, NULL, &rlist);
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ /* lnet_peer_del() deletes all the peer NIs owned by this peer */
+ rc = lnet_peer_del(lp);
+ if (rc)
+ CNETERR("Internal error: Unable to delete peer %s rc %d\n",
+ libcfs_nidstr(&lp->lp_primary_nid), rc);
+
+ list_for_each_entry_safe(route, tmp,
+ &rlist, lr_list) {
+ /* re-add these routes */
+ lnet_add_route(route->lr_net,
+ route->lr_hops,
+ &route->lr_nid,
+ route->lr_priority,
+ sensitivity);
+ LIBCFS_FREE(route, sizeof(*route));
+ }
+
+ mutex_unlock(&the_lnet.ln_api_mutex);
+
+ spin_lock(&lp->lp_lock);
+
+ return 0;
+}
+
/*
* Update a peer using the data received.
*/
* down, and our reference count may be all that is keeping it
* alive. Don't do any work on it.
*/
- if (list_empty(&lp->lp_peer_list))
+ if (list_empty(&lp->lp_peer_list)) {
+ lnet_ping_buffer_decref(pbuf);
goto out;
+ }
flags = LNET_PEER_DISCOVERED;
if (pbuf->pb_info.pi_features & LNET_PING_FEAT_MULTI_RAIL)
* primary NID to the correct value here. Moreover, this peer
* can show up with only the loopback NID in the ping buffer.
*/
- if (pbuf->pb_info.pi_nnis <= 1)
+ if (pbuf->pb_info.pi_nnis <= 1) {
+ lnet_ping_buffer_decref(pbuf);
goto out;
+ }
nid = pbuf->pb_info.pi_ni[1].ns_nid;
- if (lp->lp_primary_nid == LNET_NID_LO_0) {
+ if (nid_is_lo0(&lp->lp_primary_nid)) {
rc = lnet_peer_set_primary_nid(lp, nid, flags);
- if (!rc)
+ if (rc)
+ lnet_ping_buffer_decref(pbuf);
+ else
rc = lnet_peer_merge_data(lp, pbuf);
/*
* if the primary nid of the peer is present in the ping info returned
* to update the status of the nids that we currently have
* recorded in that peer.
*/
- } else if (lp->lp_primary_nid == nid ||
- (lnet_is_nid_in_ping_info(lp->lp_primary_nid, &pbuf->pb_info) &&
+ } else if (lnet_nid_to_nid4(&lp->lp_primary_nid) == nid ||
+ (lnet_is_nid_in_ping_info(lnet_nid_to_nid4(&lp->lp_primary_nid),
+ &pbuf->pb_info) &&
lnet_is_discovery_disabled(lp))) {
rc = lnet_peer_merge_data(lp, pbuf);
} else {
lpni = lnet_find_peer_ni_locked(nid);
- if (!lpni) {
+ if (!lpni || lp == lpni->lpni_peer_net->lpn_peer) {
rc = lnet_peer_set_primary_nid(lp, nid, flags);
if (rc) {
CERROR("Primary NID error %s versus %s: %d\n",
- libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nidstr(&lp->lp_primary_nid),
libcfs_nid2str(nid), rc);
+ lnet_ping_buffer_decref(pbuf);
} else {
rc = lnet_peer_merge_data(lp, pbuf);
}
+ if (lpni)
+ lnet_peer_ni_decref_locked(lpni);
} else {
struct lnet_peer *new_lp;
new_lp = lpni->lpni_peer_net->lpn_peer;
* should have discovery/MR enabled as well, since
* it's the same peer, which we're about to merge
*/
+ spin_lock(&lp->lp_lock);
+ spin_lock(&new_lp->lp_lock);
if (!(lp->lp_state & LNET_PEER_NO_DISCOVERY))
new_lp->lp_state &= ~LNET_PEER_NO_DISCOVERY;
if (lp->lp_state & LNET_PEER_MULTI_RAIL)
new_lp->lp_state |= LNET_PEER_MULTI_RAIL;
+ /* If we're processing a ping reply then we may be
+ * about to send a push to the peer that we ping'd.
+ * Since the ping reply that we're processing was
+ * received by lp, we need to set the discovery source
+ * NID for new_lp to the NID stored in lp.
+ */
+ if (!LNET_NID_IS_ANY(&lp->lp_disc_src_nid)) {
+ new_lp->lp_disc_src_nid = lp->lp_disc_src_nid;
+ new_lp->lp_disc_dst_nid = lp->lp_disc_dst_nid;
+ }
+ spin_unlock(&new_lp->lp_lock);
+ spin_unlock(&lp->lp_lock);
rc = lnet_peer_set_primary_data(new_lp, pbuf);
lnet_consolidate_routes_locked(lp, new_lp);
}
}
out:
- CDEBUG(D_NET, "peer %s(%p): %d. state = 0x%x\n", libcfs_nid2str(lp->lp_primary_nid), lp, rc,
+ CDEBUG(D_NET, "peer %s(%p): %d. state = 0x%x\n",
+ libcfs_nidstr(&lp->lp_primary_nid), lp, rc,
lp->lp_state);
mutex_unlock(&the_lnet.ln_api_mutex);
LNetMDUnlink(mdh);
CDEBUG(D_NET, "peer %s:%d\n",
- libcfs_nid2str(lp->lp_primary_nid), rc);
+ libcfs_nidstr(&lp->lp_primary_nid), rc);
spin_lock(&lp->lp_lock);
return rc ? rc : LNET_REDISCOVER_PEER;
}
-/*
- * Select NID to send a Ping or Push to.
- */
-static lnet_nid_t lnet_peer_select_nid(struct lnet_peer *lp)
-{
- struct lnet_peer_ni *lpni;
-
- /* Look for a direct-connected NID for this peer. */
- lpni = NULL;
- while ((lpni = lnet_get_next_peer_ni_locked(lp, NULL, lpni)) != NULL) {
- if (!lnet_get_net_locked(lpni->lpni_peer_net->lpn_net_id))
- continue;
- break;
- }
- if (lpni)
- return lpni->lpni_nid;
-
- /* Look for a routed-connected NID for this peer. */
- lpni = NULL;
- while ((lpni = lnet_get_next_peer_ni_locked(lp, NULL, lpni)) != NULL) {
- if (!lnet_find_rnet_locked(lpni->lpni_peer_net->lpn_net_id))
- continue;
- break;
- }
- if (lpni)
- return lpni->lpni_nid;
-
- return LNET_NID_ANY;
-}
-
/* Active side of ping. */
static int lnet_peer_send_ping(struct lnet_peer *lp)
__must_hold(&lp->lp_lock)
{
- lnet_nid_t pnid;
int nnis;
int rc;
int cpt;
cpt = lnet_net_lock_current();
/* Refcount for MD. */
lnet_peer_addref_locked(lp);
- pnid = lnet_peer_select_nid(lp);
lnet_net_unlock(cpt);
nnis = max(lp->lp_data_nnis, LNET_INTERFACES_MIN);
- rc = lnet_send_ping(pnid, &lp->lp_ping_mdh, nnis, lp,
+ rc = lnet_send_ping(&lp->lp_primary_nid, &lp->lp_ping_mdh, nnis, lp,
the_lnet.ln_dc_handler, false);
/*
goto fail_error;
}
- CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+ CDEBUG(D_NET, "peer %s\n", libcfs_nidstr(&lp->lp_primary_nid));
spin_lock(&lp->lp_lock);
return 0;
fail_error:
- CDEBUG(D_NET, "peer %s: %d\n", libcfs_nid2str(lp->lp_primary_nid), rc);
+ CDEBUG(D_NET, "peer %s: %d\n", libcfs_nidstr(&lp->lp_primary_nid), rc);
/*
* The errors that get us here are considered hard errors and
* cause Discovery to terminate. So we clear PING_SENT, but do
if (!LNetMDHandleIsInvalid(mdh))
LNetMDUnlink(mdh);
- CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+ CDEBUG(D_NET, "peer %s\n", libcfs_nidstr(&lp->lp_primary_nid));
spin_lock(&lp->lp_lock);
return rc ? rc : LNET_REDISCOVER_PEER;
}
+/*
+ * Mark the peer as discovered.
+ */
+static int lnet_peer_discovered(struct lnet_peer *lp)
+__must_hold(&lp->lp_lock)
+{
+ lp->lp_state |= LNET_PEER_DISCOVERED;
+ lp->lp_state &= ~(LNET_PEER_DISCOVERING |
+ LNET_PEER_REDISCOVER);
+
+ lp->lp_dc_error = 0;
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nidstr(&lp->lp_primary_nid));
+
+ return 0;
+}
+
/* Active side of push. */
static int lnet_peer_send_push(struct lnet_peer *lp)
__must_hold(&lp->lp_lock)
{
struct lnet_ping_buffer *pbuf;
- struct lnet_process_id id;
+ struct lnet_processid id;
struct lnet_md md;
int cpt;
int rc;
/* Don't push to a non-multi-rail peer. */
if (!(lp->lp_state & LNET_PEER_MULTI_RAIL)) {
lp->lp_state &= ~LNET_PEER_FORCE_PUSH;
+ /* if peer's NIDs are uptodate then peer is discovered */
+ if (lp->lp_state & LNET_PEER_NIDS_UPTODATE) {
+ rc = lnet_peer_discovered(lp);
+ return rc;
+ }
+
return 0;
}
md.length = LNET_PING_INFO_SIZE(pbuf->pb_nnis);
md.threshold = 2; /* Put/Ack */
md.max_size = 0;
- md.options = 0;
+ md.options = LNET_MD_TRACK_RESPONSE;
md.handler = the_lnet.ln_dc_handler;
md.user_ptr = lp;
- rc = LNetMDBind(md, LNET_UNLINK, &lp->lp_push_mdh);
+ rc = LNetMDBind(&md, LNET_UNLINK, &lp->lp_push_mdh);
if (rc) {
lnet_ping_buffer_decref(pbuf);
CERROR("Can't bind push source MD: %d\n", rc);
goto fail_error;
}
+
cpt = lnet_net_lock_current();
/* Refcount for MD. */
lnet_peer_addref_locked(lp);
id.pid = LNET_PID_LUSTRE;
- id.nid = lnet_peer_select_nid(lp);
+ if (!LNET_NID_IS_ANY(&lp->lp_disc_dst_nid))
+ id.nid = lp->lp_disc_dst_nid;
+ else
+ id.nid = lp->lp_primary_nid;
lnet_net_unlock(cpt);
- if (id.nid == LNET_NID_ANY) {
- rc = -EHOSTUNREACH;
- goto fail_unlink;
- }
-
- rc = LNetPut(LNET_NID_ANY, lp->lp_push_mdh,
- LNET_ACK_REQ, id, LNET_RESERVED_PORTAL,
+ rc = LNetPut(&lp->lp_disc_src_nid, lp->lp_push_mdh,
+ LNET_ACK_REQ, &id, LNET_RESERVED_PORTAL,
LNET_PROTO_PING_MATCHBITS, 0, 0);
+ /*
+ * reset the discovery nid. There is no need to restrict sending
+ * from that source, if we call lnet_push_update_to_peers(). It'll
+ * get set to a specific NID, if we initiate discovery from the
+ * scratch
+ */
+ lp->lp_disc_src_nid = LNET_ANY_NID;
+ lp->lp_disc_dst_nid = LNET_ANY_NID;
+
if (rc)
goto fail_unlink;
- CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+ CDEBUG(D_NET, "peer %s\n", libcfs_nidstr(&lp->lp_primary_nid));
spin_lock(&lp->lp_lock);
return 0;
LNetMDUnlink(lp->lp_push_mdh);
LNetInvalidateMDHandle(&lp->lp_push_mdh);
fail_error:
- CDEBUG(D_NET, "peer %s(%p): %d\n", libcfs_nid2str(lp->lp_primary_nid), lp, rc);
+ CDEBUG(D_NET, "peer %s(%p): %d\n", libcfs_nidstr(&lp->lp_primary_nid),
+ lp, rc);
/*
* The errors that get us here are considered hard errors and
* cause Discovery to terminate. So we clear PUSH_SENT, but do
}
/*
- * An unrecoverable error was encountered during discovery.
- * Set error status in peer and abort discovery.
- */
-static void lnet_peer_discovery_error(struct lnet_peer *lp, int error)
-{
- CDEBUG(D_NET, "Discovery error %s: %d\n",
- libcfs_nid2str(lp->lp_primary_nid), error);
-
- spin_lock(&lp->lp_lock);
- lp->lp_dc_error = error;
- lp->lp_state &= ~LNET_PEER_DISCOVERING;
- lp->lp_state |= LNET_PEER_REDISCOVER;
- spin_unlock(&lp->lp_lock);
-}
-
-/*
- * Mark the peer as discovered.
- */
-static int lnet_peer_discovered(struct lnet_peer *lp)
-__must_hold(&lp->lp_lock)
-{
- lp->lp_state |= LNET_PEER_DISCOVERED;
- lp->lp_state &= ~(LNET_PEER_DISCOVERING |
- LNET_PEER_REDISCOVER);
-
- CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
-
- return 0;
-}
-
-
-/*
- * Discovering this peer is taking too long. Cancel any Ping or Push
- * that discovery is waiting on by unlinking the relevant MDs. The
- * lnet_discovery_event_handler() will proceed from here and complete
- * the cleanup.
- */
-static void lnet_peer_cancel_discovery(struct lnet_peer *lp)
-{
- struct lnet_handle_md ping_mdh;
- struct lnet_handle_md push_mdh;
-
- LNetInvalidateMDHandle(&ping_mdh);
- LNetInvalidateMDHandle(&push_mdh);
-
- spin_lock(&lp->lp_lock);
- if (lp->lp_state & LNET_PEER_PING_SENT) {
- ping_mdh = lp->lp_ping_mdh;
- LNetInvalidateMDHandle(&lp->lp_ping_mdh);
- }
- if (lp->lp_state & LNET_PEER_PUSH_SENT) {
- push_mdh = lp->lp_push_mdh;
- LNetInvalidateMDHandle(&lp->lp_push_mdh);
- }
- spin_unlock(&lp->lp_lock);
-
- if (!LNetMDHandleIsInvalid(ping_mdh))
- LNetMDUnlink(ping_mdh);
- if (!LNetMDHandleIsInvalid(push_mdh))
- LNetMDUnlink(push_mdh);
-}
-
-/*
* Wait for work to be queued or some other change that must be
* attended to. Returns non-zero if the discovery thread should shut
* down.
list_for_each_entry_safe(msg, tmp, &resend, msg_list) {
list_del_init(&msg->msg_list);
- rc = lnet_send(msg->msg_src_nid_param, msg,
- msg->msg_rtr_nid_param);
+ rc = lnet_send(&msg->msg_src_nid_param, msg,
+ &msg->msg_rtr_nid_param);
if (rc < 0) {
CNETERR("Error sending %s to %s: %d\n",
lnet_msgtyp2str(msg->msg_type),
- libcfs_id2str(msg->msg_target), rc);
+ libcfs_idstr(&msg->msg_target), rc);
lnet_finalize(msg, rc);
}
}
*/
spin_lock(&lp->lp_lock);
CDEBUG(D_NET, "peer %s(%p) state %#x\n",
- libcfs_nid2str(lp->lp_primary_nid), lp,
+ libcfs_nidstr(&lp->lp_primary_nid), lp,
lp->lp_state);
- if (lp->lp_state & LNET_PEER_DATA_PRESENT)
+ if (lp->lp_state & (LNET_PEER_MARK_DELETION |
+ LNET_PEER_MARK_DELETED))
+ rc = lnet_peer_deletion(lp);
+ else if (lp->lp_state & LNET_PEER_DATA_PRESENT)
rc = lnet_peer_data_present(lp);
else if (lp->lp_state & LNET_PEER_PING_FAILED)
rc = lnet_peer_ping_failed(lp);
else
rc = lnet_peer_discovered(lp);
CDEBUG(D_NET, "peer %s(%p) state %#x rc %d\n",
- libcfs_nid2str(lp->lp_primary_nid), lp,
+ libcfs_nidstr(&lp->lp_primary_nid), lp,
lp->lp_state, rc);
- spin_unlock(&lp->lp_lock);
- lnet_net_lock(LNET_LOCK_EX);
if (rc == LNET_REDISCOVER_PEER) {
+ spin_unlock(&lp->lp_lock);
+ lnet_net_lock(LNET_LOCK_EX);
list_move(&lp->lp_dc_list,
&the_lnet.ln_dc_request);
- } else if (rc) {
- lnet_peer_discovery_error(lp, rc);
+ } else if (rc ||
+ !(lp->lp_state & LNET_PEER_DISCOVERING)) {
+ spin_unlock(&lp->lp_lock);
+ lnet_net_lock(LNET_LOCK_EX);
+ lnet_peer_discovery_complete(lp, rc);
+ } else {
+ spin_unlock(&lp->lp_lock);
+ lnet_net_lock(LNET_LOCK_EX);
}
- if (!(lp->lp_state & LNET_PEER_DISCOVERING))
- lnet_peer_discovery_complete(lp);
+
if (the_lnet.ln_dc_state == LNET_DC_STATE_STOPPING)
break;
- if (lp->lp_state & LNET_PEER_MARK_DELETION) {
- struct list_head rlist;
- struct lnet_route *route, *tmp;
- int sensitivity = lp->lp_health_sensitivity;
-
- INIT_LIST_HEAD(&rlist);
-
- /*
- * remove the peer from the discovery work
- * queue if it's on there in preparation
- * of deleting it.
- */
- if (!list_empty(&lp->lp_dc_list))
- list_del(&lp->lp_dc_list);
-
- lnet_net_unlock(LNET_LOCK_EX);
-
- mutex_lock(&the_lnet.ln_api_mutex);
-
- lnet_net_lock(LNET_LOCK_EX);
- list_for_each_entry_safe(route, tmp,
- &lp->lp_routes,
- lr_gwlist)
- lnet_move_route(route, NULL, &rlist);
- lnet_net_unlock(LNET_LOCK_EX);
-
- /* delete the peer */
- lnet_peer_del(lp);
-
- list_for_each_entry_safe(route, tmp,
- &rlist, lr_list) {
- /* re-add these routes */
- lnet_add_route(route->lr_net,
- route->lr_hops,
- route->lr_nid,
- route->lr_priority,
- sensitivity);
- LIBCFS_FREE(route, sizeof(*route));
- }
- mutex_unlock(&the_lnet.ln_api_mutex);
-
- lnet_net_lock(LNET_LOCK_EX);
- }
}
lnet_net_unlock(LNET_LOCK_EX);
while (!list_empty(&the_lnet.ln_dc_request)) {
lp = list_first_entry(&the_lnet.ln_dc_request,
struct lnet_peer, lp_dc_list);
- lnet_peer_discovery_error(lp, -ESHUTDOWN);
- lnet_peer_discovery_complete(lp);
+ lnet_peer_discovery_complete(lp, -ESHUTDOWN);
}
lnet_net_unlock(LNET_LOCK_EX);
else
wake_up(&the_lnet.ln_dc_waitq);
+ mutex_unlock(&the_lnet.ln_api_mutex);
wait_event(the_lnet.ln_dc_waitq,
the_lnet.ln_dc_state == LNET_DC_STATE_SHUTDOWN);
+ mutex_lock(&the_lnet.ln_api_mutex);
LASSERT(list_empty(&the_lnet.ln_dc_request));
LASSERT(list_empty(&the_lnet.ln_dc_working));
aliveness = (lnet_is_peer_ni_alive(lp)) ? "up" : "down";
CDEBUG(D_WARNING, "%-24s %4d %5s %5d %5d %5d %5d %5d %ld\n",
- libcfs_nid2str(lp->lpni_nid), atomic_read(&lp->lpni_refcount),
+ libcfs_nidstr(&lp->lpni_nid), kref_read(&lp->lpni_kref),
aliveness, lp->lpni_net->net_tunables.lct_peer_tx_credits,
lp->lpni_rtrcredits, lp->lpni_minrtrcredits,
lp->lpni_txcredits, lp->lpni_mintxcredits, lp->lpni_txqnob);
struct list_head *peers = &peer_table->pt_hash[j];
list_for_each_entry(lp, peers, lpni_hashlist) {
+ if (!nid_is_nid4(&lp->lpni_nid))
+ continue;
if (peer_index-- > 0)
continue;
snprintf(aliveness, LNET_MAX_STR_LEN,
lnet_is_peer_ni_alive(lp) ? "up" : "down");
- *nid = lp->lpni_nid;
- *refcount = atomic_read(&lp->lpni_refcount);
+ *nid = lnet_nid_to_nid4(&lp->lpni_nid);
+ *refcount = kref_read(&lp->lpni_kref);
*ni_peer_tx_credits =
lp->lpni_net->net_tunables.lct_peer_tx_credits;
*peer_tx_credits = lp->lpni_txcredits;
__u32 size;
int rc;
- lp = lnet_find_peer(cfg->prcfg_prim_nid);
+ lp = lnet_find_peer4(cfg->prcfg_prim_nid);
if (!lp) {
rc = -ENOENT;
goto out_lp_decref;
}
- cfg->prcfg_prim_nid = lp->lp_primary_nid;
+ cfg->prcfg_prim_nid = lnet_nid_to_nid4(&lp->lp_primary_nid);
cfg->prcfg_mr = lnet_peer_is_multi_rail(lp);
- cfg->prcfg_cfg_nid = lp->lp_primary_nid;
+ cfg->prcfg_cfg_nid = lnet_nid_to_nid4(&lp->lp_primary_nid);
cfg->prcfg_count = lp->lp_nnis;
cfg->prcfg_size = size;
cfg->prcfg_state = lp->lp_state;
lpni = NULL;
rc = -EFAULT;
while ((lpni = lnet_get_next_peer_ni_locked(lp, NULL, lpni)) != NULL) {
- nid = lpni->lpni_nid;
+ if (!nid_is_nid4(&lpni->lpni_nid))
+ continue;
+ nid = lnet_nid_to_nid4(&lpni->lpni_nid);
if (copy_to_user(bulk, &nid, sizeof(nid)))
goto out_free_hstats;
bulk += sizeof(nid);
snprintf(lpni_info->cr_aliveness, LNET_MAX_STR_LEN,
lnet_is_peer_ni_alive(lpni) ? "up" : "down");
- lpni_info->cr_refcount = atomic_read(&lpni->lpni_refcount);
+ lpni_info->cr_refcount = kref_read(&lpni->lpni_kref);
lpni_info->cr_ni_peer_tx_credits = (lpni->lpni_net != NULL) ?
lpni->lpni_net->net_tunables.lct_peer_tx_credits : 0;
lpni_info->cr_peer_tx_credits = lpni->lpni_txcredits;
atomic_read(&lpni->lpni_hstats.hlt_remote_error);
lpni_hstats->hlpni_health_value =
atomic_read(&lpni->lpni_healthv);
+ lpni_hstats->hlpni_ping_count = lpni->lpni_ping_count;
+ lpni_hstats->hlpni_next_ping = lpni->lpni_next_ping;
if (copy_to_user(bulk, lpni_hstats, sizeof(*lpni_hstats)))
goto out_free_hstats;
bulk += sizeof(*lpni_hstats);
return rc;
}
+/* must hold net_lock/0 */
void
-lnet_peer_ni_add_to_recoveryq_locked(struct lnet_peer_ni *lpni)
+lnet_peer_ni_add_to_recoveryq_locked(struct lnet_peer_ni *lpni,
+ struct list_head *recovery_queue,
+ time64_t now)
{
/* the mt could've shutdown and cleaned up the queues */
if (the_lnet.ln_mt_state != LNET_MT_STATE_RUNNING)
return;
- if (list_empty(&lpni->lpni_recovery) &&
- atomic_read(&lpni->lpni_healthv) < LNET_MAX_HEALTH_VALUE) {
- CDEBUG(D_NET, "lpni %s added to recovery queue. Health = %d\n",
- libcfs_nid2str(lpni->lpni_nid),
- atomic_read(&lpni->lpni_healthv));
- list_add_tail(&lpni->lpni_recovery, &the_lnet.ln_mt_peerNIRecovq);
- lnet_peer_ni_addref_locked(lpni);
+ if (!list_empty(&lpni->lpni_recovery))
+ return;
+
+ if (atomic_read(&lpni->lpni_healthv) == LNET_MAX_HEALTH_VALUE)
+ return;
+
+ if (!lpni->lpni_last_alive) {
+ CDEBUG(D_NET,
+ "lpni %s(%p) not eligible for recovery last alive %lld\n",
+ libcfs_nidstr(&lpni->lpni_nid), lpni,
+ lpni->lpni_last_alive);
+ return;
+ }
+
+ if (lnet_recovery_limit &&
+ now > lpni->lpni_last_alive + lnet_recovery_limit) {
+ CDEBUG(D_NET, "lpni %s aged out last alive %lld\n",
+ libcfs_nidstr(&lpni->lpni_nid),
+ lpni->lpni_last_alive);
+ /* Reset the ping count so that if this peer NI is added back to
+ * the recovery queue we will send the first ping right away.
+ */
+ lpni->lpni_ping_count = 0;
+ return;
}
+
+ /* This peer NI is going on the recovery queue, so take a ref on it */
+ lnet_peer_ni_addref_locked(lpni);
+
+ lnet_peer_ni_set_next_ping(lpni, now);
+
+ CDEBUG(D_NET, "%s added to recovery queue. ping count: %u next ping: %lld last alive: %lld health: %d\n",
+ libcfs_nidstr(&lpni->lpni_nid),
+ lpni->lpni_ping_count,
+ lpni->lpni_next_ping,
+ lpni->lpni_last_alive,
+ atomic_read(&lpni->lpni_healthv));
+
+ list_add_tail(&lpni->lpni_recovery, recovery_queue);
}
/* Call with the ln_api_mutex held */
struct lnet_peer_ni *lpni;
int lncpt;
int cpt;
+ time64_t now;
if (the_lnet.ln_state != LNET_STATE_RUNNING)
return;
+ now = ktime_get_seconds();
+
if (!all) {
lnet_net_lock(LNET_LOCK_EX);
lpni = lnet_find_peer_ni_locked(nid);
lnet_net_unlock(LNET_LOCK_EX);
return;
}
- atomic_set(&lpni->lpni_healthv, value);
- lnet_peer_ni_add_to_recoveryq_locked(lpni);
+ lnet_set_lpni_healthv_locked(lpni, value);
+ lnet_peer_ni_add_to_recoveryq_locked(lpni,
+ &the_lnet.ln_mt_peerNIRecovq, now);
lnet_peer_ni_decref_locked(lpni);
lnet_net_unlock(LNET_LOCK_EX);
return;
lncpt = cfs_percpt_number(the_lnet.ln_peer_tables);
/*
- * Walk all the peers and reset the healhv for each one to the
- * maximum value.
+ * Walk all the peers and reset the health value for each one to the
+ * specified value.
*/
lnet_net_lock(LNET_LOCK_EX);
for (cpt = 0; cpt < lncpt; cpt++) {
list_for_each_entry(lpn, &lp->lp_peer_nets, lpn_peer_nets) {
list_for_each_entry(lpni, &lpn->lpn_peer_nis,
lpni_peer_nis) {
- atomic_set(&lpni->lpni_healthv, value);
- lnet_peer_ni_add_to_recoveryq_locked(lpni);
+ lnet_set_lpni_healthv_locked(lpni,
+ value);
+ lnet_peer_ni_add_to_recoveryq_locked(lpni,
+ &the_lnet.ln_mt_peerNIRecovq, now);
}
}
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff