#include <lnet/lib-lnet.h>
#include <lnet/lib-dlc.h>
+unsigned lnet_peer_discovery_enabled = 1;
+module_param(lnet_peer_discovery_enabled, uint, 0644);
+MODULE_PARM_DESC(lnet_peer_discovery_enabled,
+ "Explicitly enable/disable peer discovery");
+
+/* Value indicating that recovery needs to re-check a peer immediately. */
+#define LNET_REDISCOVER_PEER (1)
+
+static int lnet_peer_queue_for_discovery(struct lnet_peer *lp);
+
static void
lnet_peer_remove_from_remote_list(struct lnet_peer_ni *lpni)
{
if (LNET_NIDNET(lpni->lpni_nid) == net->net_id) {
lpni->lpni_net = net;
+
+ spin_lock(&lpni->lpni_lock);
lpni->lpni_txcredits =
- lpni->lpni_mintxcredits =
lpni->lpni_net->net_tunables.lct_peer_tx_credits;
+ lpni->lpni_mintxcredits = lpni->lpni_txcredits;
lpni->lpni_rtrcredits =
- lpni->lpni_minrtrcredits =
lnet_peer_buffer_credits(lpni->lpni_net);
+ lpni->lpni_minrtrcredits = lpni->lpni_rtrcredits;
+ spin_unlock(&lpni->lpni_lock);
lnet_peer_remove_from_remote_list(lpni);
}
spin_lock_init(&ptable->pt_zombie_lock);
INIT_LIST_HEAD(&ptable->pt_zombie_list);
+ INIT_LIST_HEAD(&ptable->pt_peer_list);
+
for (j = 0; j < LNET_PEER_HASH_SIZE; j++)
INIT_LIST_HEAD(&hash[j]);
ptable->pt_hash = hash; /* sign of initialization */
INIT_LIST_HEAD(&lpni->lpni_rtrq);
INIT_LIST_HEAD(&lpni->lpni_routes);
INIT_LIST_HEAD(&lpni->lpni_hashlist);
- INIT_LIST_HEAD(&lpni->lpni_on_peer_net_list);
+ INIT_LIST_HEAD(&lpni->lpni_peer_nis);
INIT_LIST_HEAD(&lpni->lpni_on_remote_peer_ni_list);
+ spin_lock_init(&lpni->lpni_lock);
+
lpni->lpni_alive = !lnet_peers_start_down(); /* 1 bit!! */
lpni->lpni_last_alive = cfs_time_current(); /* assumes alive */
lpni->lpni_ping_feats = LNET_PING_FEAT_INVAL;
&the_lnet.ln_remote_peer_ni_list);
}
- /* TODO: update flags */
+ CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nid2str(lpni->lpni_nid));
return lpni;
}
if (!lpn)
return NULL;
- INIT_LIST_HEAD(&lpn->lpn_on_peer_list);
+ INIT_LIST_HEAD(&lpn->lpn_peer_nets);
INIT_LIST_HEAD(&lpn->lpn_peer_nis);
lpn->lpn_net_id = net_id;
+ CDEBUG(D_NET, "%p net %s\n", lpn, libcfs_net2str(lpn->lpn_net_id));
+
return lpn;
}
+void
+lnet_destroy_peer_net_locked(struct lnet_peer_net *lpn)
+{
+ struct lnet_peer *lp;
+
+ CDEBUG(D_NET, "%p net %s\n", lpn, libcfs_net2str(lpn->lpn_net_id));
+
+ LASSERT(atomic_read(&lpn->lpn_refcount) == 0);
+ LASSERT(list_empty(&lpn->lpn_peer_nis));
+ LASSERT(list_empty(&lpn->lpn_peer_nets));
+ lp = lpn->lpn_peer;
+ lpn->lpn_peer = NULL;
+ LIBCFS_FREE(lpn, sizeof(*lpn));
+
+ lnet_peer_decref_locked(lp);
+}
+
static struct lnet_peer *
lnet_peer_alloc(lnet_nid_t nid)
{
if (!lp)
return NULL;
- INIT_LIST_HEAD(&lp->lp_on_lnet_peer_list);
+ INIT_LIST_HEAD(&lp->lp_peer_list);
INIT_LIST_HEAD(&lp->lp_peer_nets);
+ INIT_LIST_HEAD(&lp->lp_dc_list);
+ init_waitqueue_head(&lp->lp_dc_waitq);
+ spin_lock_init(&lp->lp_lock);
lp->lp_primary_nid = nid;
+ lp->lp_cpt = lnet_nid_cpt_hash(nid, LNET_CPT_NUMBER);
- /* TODO: update flags */
+ CDEBUG(D_NET, "%p nid %s\n", lp, libcfs_nid2str(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));
+
+ LASSERT(atomic_read(&lp->lp_refcount) == 0);
+ LASSERT(list_empty(&lp->lp_peer_nets));
+ LASSERT(list_empty(&lp->lp_peer_list));
+ LASSERT(list_empty(&lp->lp_dc_list));
+
+ if (lp->lp_data)
+ lnet_ping_buffer_decref(lp->lp_data);
+
+ LIBCFS_FREE(lp, sizeof(*lp));
+}
+/*
+ * Detach a peer_ni from its peer_net. If this was the last peer_ni on
+ * that peer_net, detach the peer_net from the peer.
+ *
+ * Call with lnet_net_lock/EX held
+ */
static void
-lnet_try_destroy_peer_hierarchy_locked(struct lnet_peer_ni *lpni)
+lnet_peer_detach_peer_ni_locked(struct lnet_peer_ni *lpni)
{
- struct lnet_peer_net *peer_net;
- struct lnet_peer *peer;
+ struct lnet_peer_table *ptable;
+ struct lnet_peer_net *lpn;
+ struct lnet_peer *lp;
- /* TODO: could the below situation happen? accessing an already
- * destroyed peer? */
- if (lpni->lpni_peer_net == NULL ||
- lpni->lpni_peer_net->lpn_peer == NULL)
- return;
+ /*
+ * Belts and suspenders: gracefully handle teardown of a
+ * partially connected peer_ni.
+ */
+ lpn = lpni->lpni_peer_net;
- peer_net = lpni->lpni_peer_net;
- peer = lpni->lpni_peer_net->lpn_peer;
+ list_del_init(&lpni->lpni_peer_nis);
+ /*
+ * If there are no lpni's left, we detach lpn from
+ * lp_peer_nets, so it cannot be found anymore.
+ */
+ if (list_empty(&lpn->lpn_peer_nis))
+ list_del_init(&lpn->lpn_peer_nets);
- list_del_init(&lpni->lpni_on_peer_net_list);
- lpni->lpni_peer_net = NULL;
+ /* Update peer NID count. */
+ lp = lpn->lpn_peer;
+ ptable = the_lnet.ln_peer_tables[lp->lp_cpt];
+ lp->lp_nnis--;
+ ptable->pt_peer_nnids--;
- /* if peer_net is empty, then remove it from the peer */
- if (list_empty(&peer_net->lpn_peer_nis)) {
- list_del_init(&peer_net->lpn_on_peer_list);
- peer_net->lpn_peer = NULL;
- LIBCFS_FREE(peer_net, sizeof(*peer_net));
-
- /* if the peer is empty then remove it from the
- * the_lnet.ln_peers */
- if (list_empty(&peer->lp_peer_nets)) {
- list_del_init(&peer->lp_on_lnet_peer_list);
- LIBCFS_FREE(peer, sizeof(*peer));
- }
+ /*
+ * If there are no more peer nets, make the peer unfindable
+ * via the peer_tables.
+ *
+ * Otherwise, if the peer is DISCOVERED, tell discovery to
+ * take another look at it. This is a no-op if discovery for
+ * this peer did the detaching.
+ */
+ if (list_empty(&lp->lp_peer_nets)) {
+ list_del_init(&lp->lp_peer_list);
+ ptable->pt_peers--;
+ } else if (the_lnet.ln_dc_state != LNET_DC_STATE_RUNNING) {
+ /* Discovery isn't running, nothing to do here. */
+ } else if (lp->lp_state & LNET_PEER_DISCOVERED) {
+ lnet_peer_queue_for_discovery(lp);
+ 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));
}
/* called with lnet_net_lock LNET_LOCK_EX held */
-static void
+static int
lnet_peer_ni_del_locked(struct lnet_peer_ni *lpni)
{
struct lnet_peer_table *ptable = NULL;
+ /* don't remove a peer_ni if it's also a gateway */
+ if (lpni->lpni_rtr_refcount > 0) {
+ CERROR("Peer NI %s is a gateway. Can not delete it\n",
+ libcfs_nid2str(lpni->lpni_nid));
+ return -EBUSY;
+ }
+
lnet_peer_remove_from_remote_list(lpni);
/* remove peer ni from the hash list. */
/* decrement the ref count on the peer table */
ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
- LASSERT(atomic_read(&ptable->pt_number) > 0);
- atomic_dec(&ptable->pt_number);
+ LASSERT(ptable->pt_number > 0);
+ ptable->pt_number--;
/*
* The peer_ni can no longer be found with a lookup. But there
*
* The last reference may be lost in a place where the
* lnet_net_lock locks only a single cpt, and that cpt may not
- * be lpni->lpni_cpt. So the zombie list of this peer_table
+ * be lpni->lpni_cpt. So the zombie list of lnet_peer_table
* has its own lock.
*/
spin_lock(&ptable->pt_zombie_lock);
ptable->pt_zombies++;
spin_unlock(&ptable->pt_zombie_lock);
- /* no need to keep this peer on the hierarchy anymore */
- lnet_try_destroy_peer_hierarchy_locked(lpni);
+ /* no need to keep this peer_ni on the hierarchy anymore */
+ lnet_peer_detach_peer_ni_locked(lpni);
- /* decrement reference on peer */
+ /* remove hashlist reference on peer_ni */
lnet_peer_ni_decref_locked(lpni);
+
+ return 0;
}
-void lnet_peer_uninit()
+void lnet_peer_uninit(void)
{
struct lnet_peer_ni *lpni, *tmp;
lnet_net_unlock(LNET_LOCK_EX);
}
-static void
+static int
lnet_peer_del_locked(struct lnet_peer *peer)
{
struct lnet_peer_ni *lpni = NULL, *lpni2;
+ int rc = 0, rc2 = 0;
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(peer->lp_primary_nid));
lpni = lnet_get_next_peer_ni_locked(peer, NULL, lpni);
while (lpni != NULL) {
lpni2 = lnet_get_next_peer_ni_locked(peer, NULL, lpni);
- lnet_peer_ni_del_locked(lpni);
+ rc = lnet_peer_ni_del_locked(lpni);
+ if (rc != 0)
+ rc2 = rc;
lpni = lpni2;
}
+
+ return rc2;
+}
+
+static int
+lnet_peer_del(struct lnet_peer *peer)
+{
+ lnet_net_lock(LNET_LOCK_EX);
+ lnet_peer_del_locked(peer);
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ return 0;
+}
+
+/*
+ * Delete a NID from a peer. Call with ln_api_mutex held.
+ *
+ * Error codes:
+ * -EPERM: Non-DLC deletion from DLC-configured peer.
+ * -ENOENT: No lnet_peer_ni corresponding to the nid.
+ * -ECHILD: The lnet_peer_ni isn't connected to the peer.
+ * -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)
+{
+ struct lnet_peer_ni *lpni;
+ lnet_nid_t primary_nid = lp->lp_primary_nid;
+ int rc = 0;
+
+ if (!(flags & LNET_PEER_CONFIGURED)) {
+ if (lp->lp_state & LNET_PEER_CONFIGURED) {
+ rc = -EPERM;
+ goto out;
+ }
+ }
+ lpni = lnet_find_peer_ni_locked(nid);
+ if (!lpni) {
+ rc = -ENOENT;
+ goto out;
+ }
+ lnet_peer_ni_decref_locked(lpni);
+ if (lp != lpni->lpni_peer_net->lpn_peer) {
+ rc = -ECHILD;
+ 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) {
+ rc = -EBUSY;
+ goto out;
+ }
+
+ lnet_net_lock(LNET_LOCK_EX);
+ lnet_peer_ni_del_locked(lpni);
+ lnet_net_unlock(LNET_LOCK_EX);
+
+out:
+ CDEBUG(D_NET, "peer %s NID %s flags %#x: %d\n",
+ libcfs_nid2str(primary_nid), libcfs_nid2str(nid), flags, rc);
+
+ return rc;
}
static void
struct lnet_peer_table *ptable)
{
int i;
+ struct lnet_peer_ni *next;
struct lnet_peer_ni *lpni;
- struct lnet_peer_ni *tmp;
struct lnet_peer *peer;
for (i = 0; i < LNET_PEER_HASH_SIZE; i++) {
- list_for_each_entry_safe(lpni, tmp, &ptable->pt_hash[i],
+ list_for_each_entry_safe(lpni, next, &ptable->pt_hash[i],
lpni_hashlist) {
if (net != NULL && net != lpni->lpni_net)
continue;
- /*
- * check if by removing this peer ni we should be
- * removing the entire peer.
- */
peer = lpni->lpni_peer_net->lpn_peer;
-
- if (peer->lp_primary_nid == lpni->lpni_nid)
- lnet_peer_del_locked(peer);
- else
+ if (peer->lp_primary_nid != lpni->lpni_nid) {
lnet_peer_ni_del_locked(lpni);
+ continue;
+ }
+ /*
+ * Removing the primary NID implies removing
+ * the entire peer. Advance next beyond any
+ * peer_ni that belongs to the same peer.
+ */
+ list_for_each_entry_from(next, &ptable->pt_hash[i],
+ lpni_hashlist) {
+ if (next->lpni_peer_net->lpn_peer != peer)
+ break;
+ }
+ lnet_peer_del_locked(peer);
}
}
}
int i;
struct lnet_peer_table *ptable;
- LASSERT(the_lnet.ln_shutdown || net != NULL);
+ LASSERT(the_lnet.ln_state != LNET_STATE_SHUTDOWN || net != NULL);
/* If just deleting the peers for a NI, get rid of any routes these
* peers are gateways for. */
cfs_percpt_for_each(ptable, i, the_lnet.ln_peer_tables) {
struct list_head *peers;
struct lnet_peer_ni *lp;
- LASSERT(!the_lnet.ln_shutdown);
+ LASSERT(the_lnet.ln_state == LNET_STATE_RUNNING);
peers = &ptable->pt_hash[lnet_nid2peerhash(nid)];
list_for_each_entry(lp, peers, lpni_hashlist) {
}
struct lnet_peer *
-lnet_find_or_create_peer_locked(lnet_nid_t dst_nid, int cpt)
+lnet_find_peer(lnet_nid_t nid)
{
struct lnet_peer_ni *lpni;
- struct lnet_peer *lp;
+ struct lnet_peer *lp = NULL;
+ int cpt;
- lpni = lnet_find_peer_ni_locked(dst_nid);
- if (!lpni) {
- lpni = lnet_nid2peerni_locked(dst_nid, cpt);
- if (IS_ERR(lpni))
- return ERR_CAST(lpni);
+ cpt = lnet_net_lock_current();
+ lpni = lnet_find_peer_ni_locked(nid);
+ if (lpni) {
+ lp = lpni->lpni_peer_net->lpn_peer;
+ lnet_peer_addref_locked(lp);
+ lnet_peer_ni_decref_locked(lpni);
}
-
- lp = lpni->lpni_peer_net->lpn_peer;
- lnet_peer_ni_decref_locked(lpni);
+ lnet_net_unlock(cpt);
return lp;
}
lnet_get_peer_ni_idx_locked(int idx, struct lnet_peer_net **lpn,
struct lnet_peer **lp)
{
+ struct lnet_peer_table *ptable;
struct lnet_peer_ni *lpni;
+ int lncpt;
+ int cpt;
+
+ lncpt = cfs_percpt_number(the_lnet.ln_peer_tables);
+
+ for (cpt = 0; cpt < lncpt; cpt++) {
+ ptable = the_lnet.ln_peer_tables[cpt];
+ if (ptable->pt_peer_nnids > idx)
+ break;
+ idx -= ptable->pt_peer_nnids;
+ }
+ if (cpt >= lncpt)
+ return NULL;
- list_for_each_entry((*lp), &the_lnet.ln_peers, lp_on_lnet_peer_list) {
- list_for_each_entry((*lpn), &((*lp)->lp_peer_nets), lpn_on_peer_list) {
+ list_for_each_entry((*lp), &ptable->pt_peer_list, lp_peer_list) {
+ if ((*lp)->lp_nnis <= idx) {
+ idx -= (*lp)->lp_nnis;
+ continue;
+ }
+ list_for_each_entry((*lpn), &((*lp)->lp_peer_nets),
+ lpn_peer_nets) {
list_for_each_entry(lpni, &((*lpn)->lpn_peer_nis),
- lpni_on_peer_net_list)
+ lpni_peer_nis) {
if (idx-- == 0)
return lpni;
+ }
}
}
struct lnet_peer_net *net = peer_net;
if (!prev) {
- if (!net)
+ if (!net) {
+ if (list_empty(&peer->lp_peer_nets))
+ return NULL;
+
net = list_entry(peer->lp_peer_nets.next,
struct lnet_peer_net,
- lpn_on_peer_list);
+ lpn_peer_nets);
+ }
lpni = list_entry(net->lpn_peer_nis.next, struct lnet_peer_ni,
- lpni_on_peer_net_list);
+ lpni_peer_nis);
return lpni;
}
- if (prev->lpni_on_peer_net_list.next ==
- &prev->lpni_peer_net->lpn_peer_nis) {
+ if (prev->lpni_peer_nis.next == &prev->lpni_peer_net->lpn_peer_nis) {
/*
* if you reached the end of the peer ni list and the peer
* net is specified then there are no more peer nis in that
* we reached the end of this net ni list. move to the
* next net
*/
- if (prev->lpni_peer_net->lpn_on_peer_list.next ==
+ if (prev->lpni_peer_net->lpn_peer_nets.next ==
&peer->lp_peer_nets)
/* no more nets and no more NIs. */
return NULL;
/* get the next net */
- net = list_entry(prev->lpni_peer_net->lpn_on_peer_list.next,
+ net = list_entry(prev->lpni_peer_net->lpn_peer_nets.next,
struct lnet_peer_net,
- lpn_on_peer_list);
+ lpn_peer_nets);
/* get the ni on it */
lpni = list_entry(net->lpn_peer_nis.next, struct lnet_peer_ni,
- lpni_on_peer_net_list);
+ lpni_peer_nis);
return lpni;
}
/* there are more nis left */
- lpni = list_entry(prev->lpni_on_peer_net_list.next,
- struct lnet_peer_ni, lpni_on_peer_net_list);
+ lpni = list_entry(prev->lpni_peer_nis.next,
+ struct lnet_peer_ni, lpni_peer_nis);
return lpni;
}
+/*
+ * 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_ni_pref_locked(struct lnet_peer_ni *lpni, struct lnet_ni *ni)
+lnet_peer_is_pref_nid_locked(struct lnet_peer_ni *lpni, lnet_nid_t nid)
{
int i;
+ 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] == ni->ni_nid)
+ if (lpni->lpni_pref.nids[i] == nid)
return true;
}
return false;
}
+/*
+ * Set a single ni as preferred, provided no preferred ni is already
+ * 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)
+{
+ int rc = 0;
+
+ spin_lock(&lpni->lpni_lock);
+ if (nid == LNET_NID_ANY) {
+ 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_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);
+ return rc;
+}
+
+/*
+ * Clear the preferred NID from a non-multi-rail peer_ni, provided
+ * this preference was set by lnet_peer_ni_set_non_mr_pref_nid().
+ */
+int
+lnet_peer_ni_clr_non_mr_pref_nid(struct lnet_peer_ni *lpni)
+{
+ int rc = 0;
+
+ spin_lock(&lpni->lpni_lock);
+ if (lpni->lpni_state & LNET_PEER_NI_NON_MR_PREF) {
+ lpni->lpni_pref_nnids = 0;
+ lpni->lpni_state &= ~LNET_PEER_NI_NON_MR_PREF;
+ } else if (lpni->lpni_pref_nnids == 0) {
+ rc = -ENOENT;
+ } else {
+ rc = -EPERM;
+ }
+ spin_unlock(&lpni->lpni_lock);
+
+ CDEBUG(D_NET, "peer %s: %d\n",
+ libcfs_nid2str(lpni->lpni_nid), rc);
+ return rc;
+}
+
+/*
+ * Clear the preferred NIDs from a non-multi-rail peer.
+ */
+void
+lnet_peer_clr_non_mr_pref_nids(struct lnet_peer *lp)
+{
+ struct lnet_peer_ni *lpni = NULL;
+
+ while ((lpni = lnet_get_next_peer_ni_locked(lp, NULL, lpni)) != NULL)
+ lnet_peer_ni_clr_non_mr_pref_nid(lpni);
+}
+
+int
+lnet_peer_add_pref_nid(struct lnet_peer_ni *lpni, lnet_nid_t 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;
+ int rc = 0;
+
+ if (nid == LNET_NID_ANY) {
+ rc = -EINVAL;
+ goto out;
+ }
+
+ if (lpni->lpni_pref_nnids == 1 && 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) {
+ 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; i < lpni->lpni_pref_nnids; i++) {
+ if (lpni->lpni_pref.nids[i] == nid) {
+ LIBCFS_FREE(nids, size);
+ rc = -EEXIST;
+ goto out;
+ }
+ nids[i] = lpni->lpni_pref.nids[i];
+ }
+ nids[i] = nid;
+ }
+
+ lnet_net_lock(LNET_LOCK_EX);
+ spin_lock(&lpni->lpni_lock);
+ if (lpni->lpni_pref_nnids == 0) {
+ lpni->lpni_pref.nid = nid;
+ } else {
+ oldnids = lpni->lpni_pref.nids;
+ lpni->lpni_pref.nids = 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);
+ LIBCFS_FREE(oldnids, sizeof(*oldnids) * size);
+ }
+out:
+ if (rc == -EEXIST && (lpni->lpni_state & LNET_PEER_NI_NON_MR_PREF)) {
+ spin_lock(&lpni->lpni_lock);
+ 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(lp->lp_primary_nid), libcfs_nid2str(nid), rc);
+ return rc;
+}
+
+int
+lnet_peer_del_pref_nid(struct lnet_peer_ni *lpni, lnet_nid_t 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;
+ int rc = 0;
+
+ if (lpni->lpni_pref_nnids == 0) {
+ rc = -ENOENT;
+ goto out;
+ }
+
+ 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) {
+ 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;
+ }
+ }
+
+ 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;
+ }
+ 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);
+ LIBCFS_FREE(oldnids, sizeof(*oldnids) * size);
+ }
+out:
+ CDEBUG(D_NET, "peer %s nid %s: %d\n",
+ libcfs_nid2str(lp->lp_primary_nid), libcfs_nid2str(nid), rc);
+ return rc;
+}
+
lnet_nid_t
lnet_peer_primary_nid(lnet_nid_t nid)
{
return primary_nid;
}
+lnet_nid_t
+LNetPrimaryNID(lnet_nid_t nid)
+{
+ struct lnet_peer *lp;
+ struct lnet_peer_ni *lpni;
+ lnet_nid_t primary_nid = nid;
+ int rc = 0;
+ int cpt;
+
+ cpt = lnet_net_lock_current();
+ lpni = lnet_nid2peerni_locked(nid, LNET_NID_ANY, 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)) {
+ rc = lnet_discover_peer_locked(lpni, cpt);
+ if (rc)
+ goto out_decref;
+ lp = lpni->lpni_peer_net->lpn_peer;
+ }
+ primary_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;
+}
+EXPORT_SYMBOL(LNetPrimaryNID);
+
struct lnet_peer_net *
lnet_peer_get_net_locked(struct lnet_peer *peer, __u32 net_id)
{
struct lnet_peer_net *peer_net;
- list_for_each_entry(peer_net, &peer->lp_peer_nets, lpn_on_peer_list) {
+ list_for_each_entry(peer_net, &peer->lp_peer_nets, lpn_peer_nets) {
if (peer_net->lpn_net_id == net_id)
return peer_net;
}
return NULL;
}
+/*
+ * Attach a peer_ni to a peer_net and peer. This function assumes
+ * peer_ni is not already attached to the peer_net/peer. The peer_ni
+ * 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.
+ */
static int
-lnet_peer_setup_hierarchy(struct lnet_peer *lp, struct lnet_peer_ni *lpni,
- lnet_nid_t nid)
+lnet_peer_attach_peer_ni(struct lnet_peer *lp,
+ struct lnet_peer_net *lpn,
+ struct lnet_peer_ni *lpni,
+ unsigned flags)
{
- struct lnet_peer_net *lpn = NULL;
struct lnet_peer_table *ptable;
- __u32 net_id = LNET_NIDNET(nid);
-
- /*
- * Create the peer_ni, peer_net, and peer if they don't exist
- * yet.
- */
- if (lp) {
- lpn = lnet_peer_get_net_locked(lp, net_id);
- } else {
- lp = lnet_peer_alloc(nid);
- if (!lp)
- goto out_enomem;
- }
-
- if (!lpn) {
- lpn = lnet_peer_net_alloc(net_id);
- if (!lpn)
- goto out_maybe_free_lp;
- }
-
- if (!lpni) {
- lpni = lnet_peer_ni_alloc(nid);
- if (!lpni)
- goto out_maybe_free_lpn;
- }
/* 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);
+
ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
- list_add_tail(&lpni->lpni_hashlist,
- &ptable->pt_hash[lnet_nid2peerhash(nid)]);
+ list_add_tail(&lpni->lpni_hashlist, &ptable->pt_hash[hash]);
ptable->pt_version++;
- atomic_inc(&ptable->pt_number);
+ ptable->pt_number++;
+ /* This is the 1st refcount on lpni. */
atomic_inc(&lpni->lpni_refcount);
}
/* Detach the peer_ni from an existing peer, if necessary. */
- if (lpni->lpni_peer_net && lpni->lpni_peer_net->lpn_peer != lp)
- lnet_try_destroy_peer_hierarchy_locked(lpni);
+ if (lpni->lpni_peer_net) {
+ LASSERT(lpni->lpni_peer_net != lpn);
+ LASSERT(lpni->lpni_peer_net->lpn_peer != lp);
+ lnet_peer_detach_peer_ni_locked(lpni);
+ lnet_peer_net_decref_locked(lpni->lpni_peer_net);
+ lpni->lpni_peer_net = NULL;
+ }
/* Add peer_ni to peer_net */
lpni->lpni_peer_net = lpn;
- list_add_tail(&lpni->lpni_on_peer_net_list, &lpn->lpn_peer_nis);
+ list_add_tail(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
+ lnet_peer_net_addref_locked(lpn);
/* Add peer_net to peer */
if (!lpn->lpn_peer) {
lpn->lpn_peer = lp;
- list_add_tail(&lpn->lpn_on_peer_list, &lp->lp_peer_nets);
+ list_add_tail(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+ lnet_peer_addref_locked(lp);
+ }
+
+ /* Add peer to global peer list, if necessary */
+ ptable = the_lnet.ln_peer_tables[lp->lp_cpt];
+ if (list_empty(&lp->lp_peer_list)) {
+ list_add_tail(&lp->lp_peer_list, &ptable->pt_peer_list);
+ ptable->pt_peers++;
+ }
+
+
+ /* Update peer state */
+ spin_lock(&lp->lp_lock);
+ if (flags & LNET_PEER_CONFIGURED) {
+ if (!(lp->lp_state & LNET_PEER_CONFIGURED))
+ lp->lp_state |= LNET_PEER_CONFIGURED;
+ }
+ if (flags & LNET_PEER_MULTI_RAIL) {
+ if (!(lp->lp_state & LNET_PEER_MULTI_RAIL)) {
+ lp->lp_state |= LNET_PEER_MULTI_RAIL;
+ lnet_peer_clr_non_mr_pref_nids(lp);
+ }
}
+ spin_unlock(&lp->lp_lock);
- /* Add peer to global peer list */
- if (list_empty(&lp->lp_on_lnet_peer_list))
- list_add_tail(&lp->lp_on_lnet_peer_list, &the_lnet.ln_peers);
+ lp->lp_nnis++;
+ the_lnet.ln_peer_tables[lp->lp_cpt]->pt_peer_nnids++;
lnet_net_unlock(LNET_LOCK_EX);
- return 0;
+ CDEBUG(D_NET, "peer %s NID %s flags %#x\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nid2str(lpni->lpni_nid), flags);
-out_maybe_free_lpn:
- if (list_empty(&lpn->lpn_on_peer_list))
- LIBCFS_FREE(lpn, sizeof(*lpn));
-out_maybe_free_lp:
- if (list_empty(&lp->lp_on_lnet_peer_list))
- LIBCFS_FREE(lp, sizeof(*lp));
-out_enomem:
- return -ENOMEM;
+ return 0;
}
+/*
+ * Create a new peer, with nid as its primary nid.
+ *
+ * Call with the lnet_api_mutex held.
+ */
static int
-lnet_add_prim_lpni(lnet_nid_t nid)
+lnet_peer_add(lnet_nid_t nid, unsigned flags)
{
- int rc;
- struct lnet_peer *peer;
+ struct lnet_peer *lp;
+ struct lnet_peer_net *lpn;
struct lnet_peer_ni *lpni;
+ int rc = 0;
LASSERT(nid != LNET_NID_ANY);
/*
- * lookup the NID and its peer
- * if the peer doesn't exist, create it.
- * if this is a non-MR peer then change its state to MR and exit.
- * if this is an MR peer and it's a primary NI: NO-OP.
- * if this is an MR peer and it's not a primary NI. Operation not
- * allowed.
- *
- * The adding and deleting of peer nis is being serialized through
- * the api_mutex. So we can look up peers with the mutex locked
- * safely. Only when we need to change the ptable, do we need to
- * exclusively lock the lnet_net_lock()
+ * No need for the lnet_net_lock here, because the
+ * lnet_api_mutex is held.
*/
lpni = lnet_find_peer_ni_locked(nid);
- if (!lpni) {
- rc = lnet_peer_setup_hierarchy(NULL, NULL, nid);
- if (rc != 0)
- return rc;
- lpni = lnet_find_peer_ni_locked(nid);
+ if (lpni) {
+ /* A peer with this NID already exists. */
+ lp = lpni->lpni_peer_net->lpn_peer;
+ lnet_peer_ni_decref_locked(lpni);
+ /*
+ * This is an error if the peer was configured and the
+ * primary NID differs or an attempt is made to change
+ * the Multi-Rail flag. Otherwise the assumption is
+ * that an existing peer is being modified.
+ */
+ if (lp->lp_state & LNET_PEER_CONFIGURED) {
+ if (lp->lp_primary_nid != nid)
+ rc = -EEXIST;
+ else if ((lp->lp_state ^ flags) & LNET_PEER_MULTI_RAIL)
+ rc = -EPERM;
+ goto out;
+ }
+ /* Delete and recreate as a configured peer. */
+ lnet_peer_del(lp);
}
- LASSERT(lpni);
-
- lnet_peer_ni_decref_locked(lpni);
-
- peer = lpni->lpni_peer_net->lpn_peer;
-
- /*
- * If we found a lpni with the same nid as the NID we're trying to
- * create, then we're trying to create an already existing lpni
- * that belongs to a different peer
- */
- if (peer->lp_primary_nid != nid)
- return -EEXIST;
+ /* Create peer, peer_net, and peer_ni. */
+ rc = -ENOMEM;
+ lp = lnet_peer_alloc(nid);
+ if (!lp)
+ goto out;
+ lpn = lnet_peer_net_alloc(LNET_NIDNET(nid));
+ if (!lpn)
+ goto out_free_lp;
+ lpni = lnet_peer_ni_alloc(nid);
+ if (!lpni)
+ goto out_free_lpn;
- /*
- * if we found an lpni that is not a multi-rail, which could occur
- * if lpni is already created as a non-mr lpni or we just created
- * it, then make sure you indicate that this lpni is a primary mr
- * capable peer.
- *
- * TODO: update flags if necessary
- */
- if (!peer->lp_multi_rail && peer->lp_primary_nid == nid)
- peer->lp_multi_rail = true;
+ return 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));
+out:
+ CDEBUG(D_NET, "peer %s NID flags %#x: %d\n",
+ libcfs_nid2str(nid), flags, rc);
return rc;
}
+/*
+ * Add a NID to a peer. Call with ln_api_mutex held.
+ *
+ * Error codes:
+ * -EPERM: Non-DLC addition to a DLC-configured peer.
+ * -EEXIST: The NID was configured by DLC for a different peer.
+ * -ENOMEM: Out of memory.
+ * -ENOTUNIQ: Adding a second peer NID on a single network on a
+ * non-multi-rail peer.
+ */
static int
-lnet_add_peer_ni_to_prim_lpni(lnet_nid_t key_nid, lnet_nid_t nid)
+lnet_peer_add_nid(struct lnet_peer *lp, lnet_nid_t nid, unsigned flags)
{
- struct lnet_peer *peer, *primary_peer;
- struct lnet_peer_ni *lpni = NULL, *klpni = NULL;
+ struct lnet_peer_net *lpn;
+ struct lnet_peer_ni *lpni;
+ int rc = 0;
- LASSERT(key_nid != LNET_NID_ANY && nid != LNET_NID_ANY);
+ LASSERT(lp);
+ LASSERT(nid != LNET_NID_ANY);
+
+ /* A configured peer can only be updated through configuration. */
+ if (!(flags & LNET_PEER_CONFIGURED)) {
+ if (lp->lp_state & LNET_PEER_CONFIGURED) {
+ rc = -EPERM;
+ goto out;
+ }
+ }
/*
- * key nid must be created by this point. If not then this
- * operation is not permitted
+ * The MULTI_RAIL flag can be set but not cleared, because
+ * that would leave the peer struct in an invalid state.
*/
- klpni = lnet_find_peer_ni_locked(key_nid);
- if (!klpni)
- return -ENOENT;
-
- lnet_peer_ni_decref_locked(klpni);
-
- primary_peer = klpni->lpni_peer_net->lpn_peer;
+ if (flags & LNET_PEER_MULTI_RAIL) {
+ spin_lock(&lp->lp_lock);
+ if (!(lp->lp_state & LNET_PEER_MULTI_RAIL)) {
+ lp->lp_state |= LNET_PEER_MULTI_RAIL;
+ lnet_peer_clr_non_mr_pref_nids(lp);
+ }
+ spin_unlock(&lp->lp_lock);
+ } else if (lp->lp_state & LNET_PEER_MULTI_RAIL) {
+ rc = -EPERM;
+ goto out;
+ }
lpni = lnet_find_peer_ni_locked(nid);
if (lpni) {
- lnet_peer_ni_decref_locked(lpni);
-
- peer = lpni->lpni_peer_net->lpn_peer;
/*
- * lpni already exists in the system but it belongs to
- * a different peer. We can't re-added it
+ * A peer_ni already exists. This is only a problem if
+ * it is not connected to this peer and was configured
+ * by DLC.
*/
- if (peer->lp_primary_nid != key_nid && peer->lp_multi_rail) {
- CERROR("Cannot add NID %s owned by peer %s to peer %s\n",
- libcfs_nid2str(lpni->lpni_nid),
- libcfs_nid2str(peer->lp_primary_nid),
- libcfs_nid2str(key_nid));
- return -EEXIST;
- } else if (peer->lp_primary_nid == key_nid) {
- /*
- * found a peer_ni that is already part of the
- * peer. This is a no-op operation.
- */
- return 0;
+ lnet_peer_ni_decref_locked(lpni);
+ if (lpni->lpni_peer_net->lpn_peer == lp)
+ goto out;
+ if (lnet_peer_ni_is_configured(lpni)) {
+ rc = -EEXIST;
+ goto out;
+ }
+ /* If this is the primary NID, destroy the peer. */
+ if (lnet_peer_ni_is_primary(lpni)) {
+ lnet_peer_del(lpni->lpni_peer_net->lpn_peer);
+ lpni = lnet_peer_ni_alloc(nid);
+ if (!lpni) {
+ rc = -ENOMEM;
+ goto out;
+ }
+ }
+ } else {
+ lpni = lnet_peer_ni_alloc(nid);
+ if (!lpni) {
+ rc = -ENOMEM;
+ goto out;
}
-
- /*
- * TODO: else if (peer->lp_primary_nid != key_nid &&
- * !peer->lp_multi_rail)
- * peer is not an MR peer and it will be moved in the next
- * step to klpni, so update its flags accordingly.
- * lnet_move_peer_ni()
- */
-
- /*
- * TODO: call lnet_update_peer() from here to update the
- * flags. This is the case when the lpni you're trying to
- * add is already part of the peer. This could've been
- * added by the DD previously, so go ahead and do any
- * updates to the state if necessary
- */
-
}
/*
- * When we get here we either have found an existing lpni, which
- * we can switch to the new peer. Or we need to create one and
- * add it to the new peer
+ * Get the peer_net. Check that we're not adding a second
+ * peer_ni on a peer_net of a non-multi-rail peer.
*/
- return lnet_peer_setup_hierarchy(primary_peer, lpni, nid);
+ lpn = lnet_peer_get_net_locked(lp, LNET_NIDNET(nid));
+ if (!lpn) {
+ lpn = lnet_peer_net_alloc(LNET_NIDNET(nid));
+ if (!lpn) {
+ rc = -ENOMEM;
+ goto out_free_lpni;
+ }
+ } else if (!(lp->lp_state & LNET_PEER_MULTI_RAIL)) {
+ rc = -ENOTUNIQ;
+ 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));
+out:
+ CDEBUG(D_NET, "peer %s NID %s flags %#x: %d\n",
+ libcfs_nid2str(lp->lp_primary_nid), libcfs_nid2str(nid),
+ flags, rc);
+ return rc;
}
/*
- * lpni creation initiated due to traffic either sending or receiving.
+ * Update the primary NID of a peer, if possible.
+ *
+ * Call with the lnet_api_mutex held.
*/
static int
-lnet_peer_ni_traffic_add(lnet_nid_t nid)
+lnet_peer_set_primary_nid(struct lnet_peer *lp, lnet_nid_t nid, unsigned flags)
{
- struct lnet_peer_ni *lpni;
+ lnet_nid_t old = lp->lp_primary_nid;
int rc = 0;
- if (nid == LNET_NID_ANY)
- return -EINVAL;
-
- /* lnet_net_lock is not needed here because ln_api_lock is held */
- lpni = lnet_find_peer_ni_locked(nid);
- if (lpni) {
- /*
- * TODO: lnet_update_primary_nid() but not all of it
- * only indicate if we're converting this to MR capable
- * Can happen due to DD
- */
- lnet_peer_ni_decref_locked(lpni);
- } else {
- rc = lnet_peer_setup_hierarchy(NULL, NULL, nid);
- }
-
+ if (lp->lp_primary_nid == nid)
+ goto out;
+ rc = lnet_peer_add_nid(lp, nid, flags);
+ if (rc)
+ goto out;
+ lp->lp_primary_nid = nid;
+out:
+ CDEBUG(D_NET, "peer %s NID %s: %d\n",
+ libcfs_nid2str(old), libcfs_nid2str(nid), rc);
return rc;
-
}
+/*
+ * lpni creation initiated due to traffic either sending or receiving.
+ */
static int
-lnet_peer_ni_add_non_mr(lnet_nid_t nid)
+lnet_peer_ni_traffic_add(lnet_nid_t nid, lnet_nid_t pref)
{
+ struct lnet_peer *lp;
+ struct lnet_peer_net *lpn;
struct lnet_peer_ni *lpni;
+ unsigned flags = 0;
+ int rc = 0;
+
+ if (nid == LNET_NID_ANY) {
+ rc = -EINVAL;
+ goto out;
+ }
+ /* lnet_net_lock is not needed here because ln_api_lock is held */
lpni = lnet_find_peer_ni_locked(nid);
if (lpni) {
- CERROR("Cannot add %s as non-mr when it already exists\n",
- libcfs_nid2str(nid));
+ /*
+ * We must have raced with another thread. Since we
+ * know next to nothing about a peer_ni created by
+ * traffic, we just assume everything is ok and
+ * return.
+ */
lnet_peer_ni_decref_locked(lpni);
- return -EEXIST;
+ goto out;
}
- return lnet_peer_setup_hierarchy(NULL, NULL, nid);
+ /* Create peer, peer_net, and peer_ni. */
+ rc = -ENOMEM;
+ lp = lnet_peer_alloc(nid);
+ if (!lp)
+ goto out;
+ lpn = lnet_peer_net_alloc(LNET_NIDNET(nid));
+ if (!lpn)
+ goto out_free_lp;
+ 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);
+
+ return 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));
+out:
+ CDEBUG(D_NET, "peer %s: %d\n", libcfs_nid2str(nid), rc);
+ return rc;
}
/*
+ * Implementation of IOC_LIBCFS_ADD_PEER_NI.
+ *
* This API handles the following combinations:
- * Create a primary NI if only the key_nid is provided
- * Create or add an lpni to a primary NI. Primary NI must've already
- * been created
- * Create a non-MR peer.
+ * Create a peer with its primary NI if only the prim_nid is provided
+ * Add a NID to a peer identified by the prim_nid. The peer identified
+ * by the prim_nid must already exist.
+ * The peer being created may be non-MR.
+ *
+ * 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_to_peer(lnet_nid_t key_nid, lnet_nid_t nid, bool mr)
+lnet_add_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid, bool mr)
{
+ struct lnet_peer *lp = NULL;
+ struct lnet_peer_ni *lpni;
+ unsigned flags;
+
+ /* The prim_nid must always be specified */
+ if (prim_nid == LNET_NID_ANY)
+ return -EINVAL;
+
+ flags = LNET_PEER_CONFIGURED;
+ if (mr)
+ flags |= LNET_PEER_MULTI_RAIL;
+
/*
- * Caller trying to setup an MR like peer hierarchy but
- * specifying it to be non-MR. This is not allowed.
+ * If nid isn't specified, we must create a new peer with
+ * prim_nid as its primary nid.
*/
- if (key_nid != LNET_NID_ANY &&
- nid != LNET_NID_ANY && !mr)
- return -EPERM;
+ if (nid == LNET_NID_ANY)
+ return lnet_peer_add(prim_nid, flags);
+
+ /* Look up the prim_nid, which must exist. */
+ lpni = lnet_find_peer_ni_locked(prim_nid);
+ if (!lpni)
+ return -ENOENT;
+ lnet_peer_ni_decref_locked(lpni);
+ lp = lpni->lpni_peer_net->lpn_peer;
- /* Add the primary NID of a peer */
- if (key_nid != LNET_NID_ANY &&
- nid == LNET_NID_ANY && mr)
- return lnet_add_prim_lpni(key_nid);
+ /* Peer must have been configured. */
+ if (!(lp->lp_state & LNET_PEER_CONFIGURED)) {
+ CDEBUG(D_NET, "peer %s was not configured\n",
+ libcfs_nid2str(prim_nid));
+ return -ENOENT;
+ }
- /* Add a NID to an existing peer */
- if (key_nid != LNET_NID_ANY &&
- nid != LNET_NID_ANY && mr)
- return lnet_add_peer_ni_to_prim_lpni(key_nid, nid);
+ /* Primary NID must match */
+ if (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));
+ return -ENODEV;
+ }
- /* Add a non-MR peer NI */
- if (((key_nid != LNET_NID_ANY &&
- nid == LNET_NID_ANY) ||
- (key_nid == LNET_NID_ANY &&
- nid != LNET_NID_ANY)) && !mr)
- return lnet_peer_ni_add_non_mr(key_nid != LNET_NID_ANY ?
- key_nid : nid);
+ /* 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_nid2str(prim_nid));
+ return -EPERM;
+ }
- return 0;
+ return lnet_peer_add_nid(lp, nid, flags);
}
+/*
+ * Implementation of IOC_LIBCFS_DEL_PEER_NI.
+ *
+ * This API handles the following combinations:
+ * Delete a NI from a peer if both prim_nid and nid are provided.
+ * Delete a peer if only prim_nid is provided.
+ * Delete a peer if its primary nid is provided.
+ *
+ * The caller must hold ln_api_mutex. This prevents the peer from
+ * being modified/deleted by a different thread.
+ */
int
-lnet_del_peer_ni_from_peer(lnet_nid_t key_nid, lnet_nid_t nid)
+lnet_del_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid)
{
- lnet_nid_t local_nid;
- struct lnet_peer *peer;
+ struct lnet_peer *lp;
struct lnet_peer_ni *lpni;
+ unsigned flags;
- if (key_nid == LNET_NID_ANY)
+ if (prim_nid == LNET_NID_ANY)
return -EINVAL;
- local_nid = (nid != LNET_NID_ANY) ? nid : key_nid;
-
- lpni = lnet_find_peer_ni_locked(local_nid);
+ lpni = lnet_find_peer_ni_locked(prim_nid);
if (!lpni)
- return -EINVAL;
+ return -ENOENT;
lnet_peer_ni_decref_locked(lpni);
+ lp = lpni->lpni_peer_net->lpn_peer;
- peer = lpni->lpni_peer_net->lpn_peer;
- LASSERT(peer != NULL);
-
- if (peer->lp_primary_nid == lpni->lpni_nid) {
- /*
- * deleting the primary ni is equivalent to deleting the
- * entire peer
- */
- lnet_net_lock(LNET_LOCK_EX);
- lnet_peer_del_locked(peer);
- lnet_net_unlock(LNET_LOCK_EX);
-
- return 0;
+ if (prim_nid != 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));
+ return -ENODEV;
}
- lnet_net_lock(LNET_LOCK_EX);
- lnet_peer_ni_del_locked(lpni);
- lnet_net_unlock(LNET_LOCK_EX);
+ if (nid == LNET_NID_ANY || nid == lp->lp_primary_nid)
+ return lnet_peer_del(lp);
- return 0;
+ flags = LNET_PEER_CONFIGURED;
+ if (lp->lp_state & LNET_PEER_MULTI_RAIL)
+ flags |= LNET_PEER_MULTI_RAIL;
+
+ return lnet_peer_del_nid(lp, nid, flags);
}
void
lnet_destroy_peer_ni_locked(struct lnet_peer_ni *lpni)
{
struct lnet_peer_table *ptable;
+ struct lnet_peer_net *lpn;
+
+ CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nid2str(lpni->lpni_nid));
LASSERT(atomic_read(&lpni->lpni_refcount) == 0);
LASSERT(lpni->lpni_rtr_refcount == 0);
LASSERT(list_empty(&lpni->lpni_txq));
LASSERT(lpni->lpni_txqnob == 0);
+ lpn = lpni->lpni_peer_net;
+ lpni->lpni_peer_net = NULL;
lpni->lpni_net = NULL;
/* remove the peer ni from the zombie list */
ptable->pt_zombies--;
spin_unlock(&ptable->pt_zombie_lock);
+ if (lpni->lpni_pref_nnids > 1) {
+ LIBCFS_FREE(lpni->lpni_pref.nids,
+ sizeof(*lpni->lpni_pref.nids) * lpni->lpni_pref_nnids);
+ }
LIBCFS_FREE(lpni, sizeof(*lpni));
+
+ lnet_peer_net_decref_locked(lpn);
}
struct lnet_peer_ni *
-lnet_nid2peerni_locked(lnet_nid_t nid, int cpt)
+lnet_nid2peerni_ex(lnet_nid_t nid, int cpt)
{
- struct lnet_peer_table *ptable;
- struct lnet_peer_ni *lpni = NULL;
- int cpt2;
- int rc;
+ struct lnet_peer_ni *lpni = NULL;
+ int rc;
- if (the_lnet.ln_shutdown) /* it's shutting down */
+ if (the_lnet.ln_state != LNET_STATE_RUNNING)
return ERR_PTR(-ESHUTDOWN);
/*
- * calculate cpt2 with the standard hash function
- * This cpt2 is the slot where we'll find or create the peer.
+ * find if a peer_ni already exists.
+ * If so then just return that.
*/
- cpt2 = lnet_nid_cpt_hash(nid, LNET_CPT_NUMBER);
- ptable = the_lnet.ln_peer_tables[cpt2];
- lpni = lnet_get_peer_ni_locked(ptable, nid);
+ lpni = lnet_find_peer_ni_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;
+ }
+
+ lpni = lnet_find_peer_ni_locked(nid);
+ LASSERT(lpni);
+
+out_net_relock:
+ lnet_net_lock(cpt);
+
+ return lpni;
+}
+
+/*
+ * Get a peer_ni for the given nid, create it if necessary. Takes a
+ * hold on the peer_ni.
+ */
+struct lnet_peer_ni *
+lnet_nid2peerni_locked(lnet_nid_t nid, lnet_nid_t 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);
if (lpni)
return lpni;
- /* Slow path: serialized using the ln_api_mutex. */
+ /*
+ * Slow path:
+ * use the lnet_api_mutex to serialize the creation of the peer_ni
+ * and the creation/deletion of the local ni/net. When a local ni is
+ * created, if there exists a set of peer_nis on that network,
+ * they need to be traversed and updated. When a local NI is
+ * deleted, which could result in a network being deleted, then
+ * all peer nis on that network need to be removed as well.
+ *
+ * Creation through traffic should also be serialized with
+ * creation through DLC.
+ */
lnet_net_unlock(cpt);
mutex_lock(&the_lnet.ln_api_mutex);
/*
* Shutdown is only set under the ln_api_lock, so a single
* check here is sufficent.
- *
- * lnet_add_nid_to_peer() also handles the case where we've
- * raced and a different thread added the NID.
*/
- if (the_lnet.ln_shutdown) {
+ if (the_lnet.ln_state != LNET_STATE_RUNNING) {
lpni = ERR_PTR(-ESHUTDOWN);
goto out_mutex_unlock;
}
- rc = lnet_peer_ni_traffic_add(nid);
+ rc = lnet_peer_ni_traffic_add(nid, pref);
if (rc) {
lpni = ERR_PTR(rc);
goto out_mutex_unlock;
}
- lpni = lnet_get_peer_ni_locked(ptable, nid);
+ lpni = lnet_find_peer_ni_locked(nid);
LASSERT(lpni);
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))
+ lnet_peer_ni_decref_locked(lpni);
+ lpni = ERR_PTR(-ESHUTDOWN);
+ }
+
return lpni;
}
-void
-lnet_debug_peer(lnet_nid_t nid)
+/*
+ * Peer Discovery
+ */
+
+bool
+lnet_peer_is_uptodate(struct lnet_peer *lp)
{
- char *aliveness = "NA";
- struct lnet_peer_ni *lp;
- int cpt;
+ bool rc;
+
+ spin_lock(&lp->lp_lock);
+ if (lnet_peer_needs_push(lp)) {
+ rc = false;
+ } else if (lp->lp_state & LNET_PEER_DISCOVERING) {
+ rc = false;
+ } else if (lp->lp_state & LNET_PEER_DISCOVERED) {
+ if (lp->lp_state & LNET_PEER_NIDS_UPTODATE)
+ rc = true;
+ else
+ rc = false;
+ } else if (lp->lp_state & LNET_PEER_UNDISCOVERED) {
+ if (lnet_peer_discovery_enabled)
+ rc = false;
+ else
+ rc = true;
+ } else {
+ rc = false;
+ }
+ spin_unlock(&lp->lp_lock);
- cpt = lnet_cpt_of_nid(nid, NULL);
- lnet_net_lock(cpt);
+ return rc;
+}
- lp = lnet_nid2peerni_locked(nid, cpt);
- if (IS_ERR(lp)) {
- lnet_net_unlock(cpt);
- CDEBUG(D_WARNING, "No peer %s\n", libcfs_nid2str(nid));
+/*
+ * 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
+ * -EALREADY if the peer was already queued.
+ */
+static int lnet_peer_queue_for_discovery(struct lnet_peer *lp)
+{
+ int rc;
+
+ spin_lock(&lp->lp_lock);
+ if (!(lp->lp_state & LNET_PEER_DISCOVERING))
+ lp->lp_state |= LNET_PEER_DISCOVERING;
+ if (!(lp->lp_state & LNET_PEER_QUEUED)) {
+ lp->lp_state |= LNET_PEER_QUEUED;
+ spin_unlock(&lp->lp_lock);
+ lnet_peer_addref_locked(lp);
+ list_add_tail(&lp->lp_dc_list, &the_lnet.ln_dc_request);
+ wake_up(&the_lnet.ln_dc_waitq);
+ rc = 0;
+ } else {
+ spin_unlock(&lp->lp_lock);
+ rc = -EALREADY;
+ }
+
+ CDEBUG(D_NET, "Queue peer %s: %d\n",
+ libcfs_nid2str(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)
+{
+ CDEBUG(D_NET, "Dequeue peer %s\n",
+ libcfs_nid2str(lp->lp_primary_nid));
+
+ spin_lock(&lp->lp_lock);
+ LASSERT(lp->lp_state & LNET_PEER_QUEUED);
+ lp->lp_state &= ~LNET_PEER_QUEUED;
+ spin_unlock(&lp->lp_lock);
+ list_del_init(&lp->lp_dc_list);
+ wake_up_all(&lp->lp_dc_waitq);
+ lnet_peer_decref_locked(lp);
+}
+
+/*
+ * Handle inbound push.
+ * Like any event handler, called with lnet_res_lock/CPT held.
+ */
+void lnet_peer_push_event(struct lnet_event *ev)
+{
+ struct lnet_ping_buffer *pbuf = ev->md.user_ptr;
+ struct lnet_peer *lp;
+
+ /* lnet_find_peer() adds a refcount */
+ lp = lnet_find_peer(ev->source.nid);
+ if (!lp) {
+ CERROR("Push Put from unknown %s (source %s)\n",
+ libcfs_nid2str(ev->initiator.nid),
+ libcfs_nid2str(ev->source.nid));
return;
}
- if (lnet_isrouter(lp) || lnet_peer_aliveness_enabled(lp))
- aliveness = lp->lpni_alive ? "up" : "down";
+ /* Ensure peer state remains consistent while we modify it. */
+ spin_lock(&lp->lp_lock);
- CDEBUG(D_WARNING, "%-24s %4d %5s %5d %5d %5d %5d %5d %ld\n",
- libcfs_nid2str(lp->lpni_nid), atomic_read(&lp->lpni_refcount),
- 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);
+ /*
+ * If some kind of error happened the contents of the message
+ * cannot be used. Clear the NIDS_UPTODATE and set the
+ * PING_REQUIRED flag to trigger a ping.
+ */
+ if (ev->status) {
+ lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
+ lp->lp_state |= LNET_PEER_PING_REQUIRED;
+ 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));
+ goto out;
+ }
- lnet_peer_ni_decref_locked(lp);
+ /*
+ * A push with invalid or corrupted info. Clear the UPTODATE
+ * flag to trigger a ping.
+ */
+ if (lnet_ping_info_validate(&pbuf->pb_info)) {
+ lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
+ lp->lp_state |= LNET_PEER_PING_REQUIRED;
+ CDEBUG(D_NET, "Corrupted Push from %s\n",
+ libcfs_nid2str(lp->lp_primary_nid));
+ goto out;
+ }
- lnet_net_unlock(cpt);
-}
+ /*
+ * Make sure we'll allocate the correct size ping buffer when
+ * pinging the peer.
+ */
+ if (lp->lp_data_nnis < pbuf->pb_info.pi_nnis)
+ lp->lp_data_nnis = pbuf->pb_info.pi_nnis;
+
+ /*
+ * A non-Multi-Rail peer is not supposed to be capable of
+ * sending a push.
+ */
+ 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));
+ goto out;
+ }
+
+ /*
+ * Set the MULTIRAIL flag. Complain if the peer was DLC
+ * configured without it. This is the one place where
+ * discovery will override DLC.
+ */
+ if (!(lp->lp_state & LNET_PEER_MULTI_RAIL)) {
+ if (lp->lp_state & LNET_PEER_CONFIGURED) {
+ CERROR("Push says %s is Multi-Rail, DLC says not\n",
+ libcfs_nid2str(lp->lp_primary_nid));
+ }
+ lp->lp_state |= LNET_PEER_MULTI_RAIL;
+ lnet_peer_clr_non_mr_pref_nids(lp);
+ }
+
+ /*
+ * Check for truncation of the Put message. Clear the
+ * NIDS_UPTODATE flag and set PING_REQUIRED to trigger a ping,
+ * and tell discovery to allocate a bigger buffer.
+ */
+ if (pbuf->pb_nnis < pbuf->pb_info.pi_nnis) {
+ if (the_lnet.ln_push_target_nnis < pbuf->pb_info.pi_nnis)
+ the_lnet.ln_push_target_nnis = pbuf->pb_info.pi_nnis;
+ lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
+ lp->lp_state |= LNET_PEER_PING_REQUIRED;
+ CDEBUG(D_NET, "Truncated Push from %s (%d nids)\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ pbuf->pb_info.pi_nnis);
+ goto out;
+ }
+
+ /*
+ * Check whether the Put data is stale. Stale data can just be
+ * dropped.
+ */
+ if (pbuf->pb_info.pi_nnis > 1 &&
+ lp->lp_primary_nid == pbuf->pb_info.pi_ni[1].ns_nid &&
+ LNET_PING_BUFFER_SEQNO(pbuf) < lp->lp_peer_seqno) {
+ CDEBUG(D_NET, "Stale Push from %s: got %u have %u\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ LNET_PING_BUFFER_SEQNO(pbuf),
+ lp->lp_peer_seqno);
+ goto out;
+ }
+
+ /*
+ * Check whether the Put data is new, in which case we clear
+ * the UPTODATE flag and prepare to process it.
+ *
+ * If the Put data is current, and the peer is UPTODATE then
+ * we assome everything is all right and drop the data as
+ * stale.
+ */
+ if (LNET_PING_BUFFER_SEQNO(pbuf) > lp->lp_peer_seqno) {
+ lp->lp_peer_seqno = LNET_PING_BUFFER_SEQNO(pbuf);
+ lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
+ } else if (lp->lp_state & LNET_PEER_NIDS_UPTODATE) {
+ CDEBUG(D_NET, "Stale Push from %s: got %u have %u\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ LNET_PING_BUFFER_SEQNO(pbuf),
+ lp->lp_peer_seqno);
+ goto out;
+ }
+
+ /*
+ * If there is data present that hasn't been processed yet,
+ * we'll replace it if the Put contained newer data and it
+ * fits. We're racing with a Ping or earlier Push in this
+ * case.
+ */
+ if (lp->lp_state & LNET_PEER_DATA_PRESENT) {
+ if (LNET_PING_BUFFER_SEQNO(pbuf) >
+ LNET_PING_BUFFER_SEQNO(lp->lp_data) &&
+ pbuf->pb_info.pi_nnis <= lp->lp_data->pb_nnis) {
+ 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),
+ LNET_PING_BUFFER_SEQNO(pbuf),
+ LNET_PING_BUFFER_SEQNO(lp->lp_data));
+ }
+ goto out;
+ }
+
+ /*
+ * Allocate a buffer to copy the data. On a failure we drop
+ * the Push and set PING_REQUIRED to force the discovery
+ * thread to fix the problem by pinging the peer.
+ */
+ lp->lp_data = lnet_ping_buffer_alloc(lp->lp_data_nnis, GFP_ATOMIC);
+ if (!lp->lp_data) {
+ lp->lp_state |= LNET_PEER_PING_REQUIRED;
+ CDEBUG(D_NET, "Cannot allocate Push buffer for %s %u\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ LNET_PING_BUFFER_SEQNO(pbuf));
+ goto out;
+ }
+
+ /* Success */
+ memcpy(&lp->lp_data->pb_info, &pbuf->pb_info,
+ 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),
+ LNET_PING_BUFFER_SEQNO(pbuf));
+
+out:
+ /*
+ * Queue the peer for discovery, and wake the discovery thread
+ * if the peer was already queued, because its status changed.
+ */
+ spin_unlock(&lp->lp_lock);
+ lnet_net_lock(LNET_LOCK_EX);
+ if (lnet_peer_queue_for_discovery(lp))
+ wake_up(&the_lnet.ln_dc_waitq);
+ /* Drop refcount from lookup */
+ lnet_peer_decref_locked(lp);
+ lnet_net_unlock(LNET_LOCK_EX);
+}
+
+/*
+ * Clear the discovery error state, unless we're already discovering
+ * this peer, in which case the error is current.
+ */
+static void lnet_peer_clear_discovery_error(struct lnet_peer *lp)
+{
+ spin_lock(&lp->lp_lock);
+ if (!(lp->lp_state & LNET_PEER_DISCOVERING))
+ lp->lp_dc_error = 0;
+ spin_unlock(&lp->lp_lock);
+}
+
+/*
+ * Peer discovery slow path. The ln_api_mutex is held on entry, and
+ * dropped/retaken within this function. An lnet_peer_ni is passed in
+ * because discovery could tear down an lnet_peer.
+ */
+int
+lnet_discover_peer_locked(struct lnet_peer_ni *lpni, int cpt)
+{
+ DEFINE_WAIT(wait);
+ struct lnet_peer *lp;
+ int rc = 0;
+
+again:
+ lnet_net_unlock(cpt);
+ lnet_net_lock(LNET_LOCK_EX);
+ lp = lpni->lpni_peer_net->lpn_peer;
+ lnet_peer_clear_discovery_error(lp);
+
+ /*
+ * We're willing to be interrupted. The lpni can become a
+ * zombie if we race with DLC, so we must check for that.
+ */
+ for (;;) {
+ prepare_to_wait(&lp->lp_dc_waitq, &wait, TASK_INTERRUPTIBLE);
+ if (signal_pending(current))
+ break;
+ if (the_lnet.ln_dc_state != LNET_DC_STATE_RUNNING)
+ break;
+ if (lp->lp_dc_error)
+ break;
+ if (lnet_peer_is_uptodate(lp))
+ break;
+ lnet_peer_queue_for_discovery(lp);
+ lnet_peer_addref_locked(lp);
+ lnet_net_unlock(LNET_LOCK_EX);
+ schedule();
+ finish_wait(&lp->lp_dc_waitq, &wait);
+ lnet_net_lock(LNET_LOCK_EX);
+ lnet_peer_decref_locked(lp);
+ /* Peer may have changed */
+ lp = lpni->lpni_peer_net->lpn_peer;
+ }
+ finish_wait(&lp->lp_dc_waitq, &wait);
+
+ lnet_net_unlock(LNET_LOCK_EX);
+ lnet_net_lock(cpt);
+
+ if (signal_pending(current))
+ rc = -EINTR;
+ else if (the_lnet.ln_dc_state != LNET_DC_STATE_RUNNING)
+ rc = -ESHUTDOWN;
+ else if (lp->lp_dc_error)
+ rc = lp->lp_dc_error;
+ else if (!lnet_peer_is_uptodate(lp))
+ goto again;
+
+ CDEBUG(D_NET, "peer %s NID %s: %d\n",
+ (lp ? libcfs_nid2str(lp->lp_primary_nid) : "(none)"),
+ libcfs_nid2str(lpni->lpni_nid), rc);
+
+ return rc;
+}
+
+/* Handle an incoming ack for a push. */
+static void
+lnet_discovery_event_ack(struct lnet_peer *lp, struct lnet_event *ev)
+{
+ struct lnet_ping_buffer *pbuf;
+
+ pbuf = LNET_PING_INFO_TO_BUFFER(ev->md.start);
+ spin_lock(&lp->lp_lock);
+ lp->lp_state &= ~LNET_PEER_PUSH_SENT;
+ lp->lp_push_error = ev->status;
+ if (ev->status)
+ lp->lp_state |= LNET_PEER_PUSH_FAILED;
+ else
+ lp->lp_node_seqno = LNET_PING_BUFFER_SEQNO(pbuf);
+ spin_unlock(&lp->lp_lock);
+
+ CDEBUG(D_NET, "peer %s ev->status %d\n",
+ libcfs_nid2str(lp->lp_primary_nid), ev->status);
+}
+
+/* Handle a Reply message. This is the reply to a Ping message. */
+static void
+lnet_discovery_event_reply(struct lnet_peer *lp, struct lnet_event *ev)
+{
+ struct lnet_ping_buffer *pbuf;
+ int rc;
+
+ spin_lock(&lp->lp_lock);
+
+ /*
+ * If some kind of error happened the contents of message
+ * cannot be used. Set PING_FAILED to trigger a retry.
+ */
+ if (ev->status) {
+ lp->lp_state |= LNET_PEER_PING_FAILED;
+ 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));
+ goto out;
+ }
+
+ pbuf = LNET_PING_INFO_TO_BUFFER(ev->md.start);
+ if (pbuf->pb_info.pi_magic == __swab32(LNET_PROTO_PING_MAGIC))
+ lnet_swap_pinginfo(pbuf);
+
+ /*
+ * A reply with invalid or corrupted info. Set PING_FAILED to
+ * trigger a retry.
+ */
+ rc = lnet_ping_info_validate(&pbuf->pb_info);
+ if (rc) {
+ 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);
+ goto out;
+ }
+
+ /*
+ * Update the MULTI_RAIL flag based on the reply. If the peer
+ * was configured with DLC then the setting should match what
+ * DLC put in. Once MULTIRAIL has been set it is not expected
+ * to be unset.
+ */
+ if (pbuf->pb_info.pi_features & LNET_PING_FEAT_MULTI_RAIL) {
+ if (lp->lp_state & LNET_PEER_MULTI_RAIL) {
+ /* Everything's fine */
+ } 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));
+ }
+ 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));
+ } else {
+ CERROR("Multi-Rail state vanished from %s\n",
+ libcfs_nid2str(lp->lp_primary_nid));
+ }
+ }
+
+ /*
+ * Make sure we'll allocate the correct size ping buffer when
+ * pinging the peer.
+ */
+ if (lp->lp_data_nnis < pbuf->pb_info.pi_nnis)
+ lp->lp_data_nnis = pbuf->pb_info.pi_nnis;
+
+ /*
+ * Check for truncation of the Reply. Clear PING_SENT and set
+ * PING_FAILED to trigger a retry.
+ */
+ if (pbuf->pb_nnis < pbuf->pb_info.pi_nnis) {
+ if (the_lnet.ln_push_target_nnis < pbuf->pb_info.pi_nnis)
+ the_lnet.ln_push_target_nnis = pbuf->pb_info.pi_nnis;
+ 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),
+ pbuf->pb_info.pi_nnis);
+ goto out;
+ }
+
+ /*
+ * Check the sequence numbers in the reply. These are only
+ * available if the reply came from a Multi-Rail peer.
+ */
+ 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) {
+ if (LNET_PING_BUFFER_SEQNO(pbuf) < lp->lp_peer_seqno) {
+ CDEBUG(D_NET, "Stale Reply from %s: got %u have %u\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ LNET_PING_BUFFER_SEQNO(pbuf),
+ lp->lp_peer_seqno);
+ goto out;
+ }
+
+ if (LNET_PING_BUFFER_SEQNO(pbuf) > lp->lp_peer_seqno)
+ lp->lp_peer_seqno = LNET_PING_BUFFER_SEQNO(pbuf);
+ }
+
+ /* We're happy with the state of the data in the buffer. */
+ CDEBUG(D_NET, "peer %s data present %u\n",
+ libcfs_nid2str(lp->lp_primary_nid), lp->lp_peer_seqno);
+ if (lp->lp_state & LNET_PEER_DATA_PRESENT)
+ lnet_ping_buffer_decref(lp->lp_data);
+ else
+ lp->lp_state |= LNET_PEER_DATA_PRESENT;
+ lnet_ping_buffer_addref(pbuf);
+ lp->lp_data = pbuf;
+out:
+ lp->lp_state &= ~LNET_PEER_PING_SENT;
+ spin_unlock(&lp->lp_lock);
+}
+
+/*
+ * Send event handling. Only matters for error cases, where we clean
+ * up state on the peer and peer_ni that would otherwise be updated in
+ * the REPLY event handler for a successful Ping, and the ACK event
+ * handler for a successful Push.
+ */
+static int
+lnet_discovery_event_send(struct lnet_peer *lp, struct lnet_event *ev)
+{
+ int rc = 0;
+
+ if (!ev->status)
+ goto out;
+
+ LASSERT(lp->lp_state & LNET_PEER_QUEUED);
+ spin_lock(&lp->lp_lock);
+ if (ev->msg_type == LNET_MSG_GET) {
+ lp->lp_state &= ~LNET_PEER_PING_SENT;
+ lp->lp_state |= LNET_PEER_PING_FAILED;
+ lp->lp_ping_error = ev->status;
+ } else { /* ev->msg_type == LNET_MSG_PUT */
+ lp->lp_state &= ~LNET_PEER_PUSH_SENT;
+ lp->lp_state |= LNET_PEER_PUSH_FAILED;
+ lp->lp_push_error = ev->status;
+ }
+ spin_unlock(&lp->lp_lock);
+ rc = LNET_REDISCOVER_PEER;
+out:
+ CDEBUG(D_NET, "%s Send to %s: %d\n",
+ (ev->msg_type == LNET_MSG_GET ? "Ping" : "Push"),
+ libcfs_nid2str(ev->target.nid), rc);
+ return rc;
+}
+
+/*
+ * Event handler for the discovery EQ.
+ *
+ * Called with lnet_res_lock(cpt) held. The cpt is the
+ * lnet_cpt_of_cookie() of the md handle cookie.
+ */
+static void lnet_discovery_event_handler(lnet_event_t *event)
+{
+ struct lnet_peer *lp = event->md.user_ptr;
+ struct lnet_ping_buffer *pbuf;
+ int rc;
+
+ /* discovery needs to take another look */
+ rc = LNET_REDISCOVER_PEER;
+
+ switch (event->type) {
+ case LNET_EVENT_ACK:
+ lnet_discovery_event_ack(lp, event);
+ break;
+ case LNET_EVENT_REPLY:
+ lnet_discovery_event_reply(lp, event);
+ break;
+ case LNET_EVENT_SEND:
+ /* Only send failure triggers a retry. */
+ rc = lnet_discovery_event_send(lp, event);
+ break;
+ case LNET_EVENT_UNLINK:
+ /* Valid event, nothing to do here. */
+ break;
+ default:
+ /* Invalid events. */
+ LBUG();
+ }
+ lnet_net_lock(LNET_LOCK_EX);
+ if (event->unlinked) {
+ pbuf = LNET_PING_INFO_TO_BUFFER(event->md.start);
+ lnet_ping_buffer_decref(pbuf);
+ lnet_peer_decref_locked(lp);
+ }
+ if (rc == LNET_REDISCOVER_PEER) {
+ list_move_tail(&lp->lp_dc_list, &the_lnet.ln_dc_request);
+ wake_up(&the_lnet.ln_dc_waitq);
+ }
+ lnet_net_unlock(LNET_LOCK_EX);
+}
+
+/*
+ * Build a peer from incoming data.
+ *
+ * The NIDs in the incoming data are supposed to be structured as follows:
+ * - loopback
+ * - primary NID
+ * - other NIDs in same net
+ * - NIDs in second net
+ * - NIDs in third net
+ * - ...
+ * This due to the way the list of NIDs in the data is created.
+ *
+ * Note that this function will mark the peer uptodate unless an
+ * ENOMEM is encontered. All other errors are due to a conflict
+ * between the DLC configuration and what discovery sees. We treat DLC
+ * as binding, and therefore set the NIDS_UPTODATE flag to prevent the
+ * peer from becoming stuck in discovery.
+ */
+static int lnet_peer_merge_data(struct lnet_peer *lp,
+ struct lnet_ping_buffer *pbuf)
+{
+ struct lnet_peer_ni *lpni;
+ lnet_nid_t *curnis = NULL;
+ lnet_nid_t *addnis = NULL;
+ lnet_nid_t *delnis = NULL;
+ unsigned flags;
+ int ncurnis;
+ int naddnis;
+ int ndelnis;
+ int nnis = 0;
+ int i;
+ int j;
+ int rc;
+
+ flags = LNET_PEER_DISCOVERED;
+ if (pbuf->pb_info.pi_features & LNET_PING_FEAT_MULTI_RAIL)
+ flags |= LNET_PEER_MULTI_RAIL;
+
+ nnis = MAX(lp->lp_nnis, pbuf->pb_info.pi_nnis);
+ LIBCFS_ALLOC(curnis, nnis * sizeof(lnet_nid_t));
+ LIBCFS_ALLOC(addnis, nnis * sizeof(lnet_nid_t));
+ LIBCFS_ALLOC(delnis, nnis * sizeof(lnet_nid_t));
+ if (!curnis || !addnis || !delnis) {
+ rc = -ENOMEM;
+ goto out;
+ }
+ ncurnis = 0;
+ naddnis = 0;
+ ndelnis = 0;
+
+ /* 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;
+
+ /*
+ * Check for NIDs in pbuf not present in curnis[].
+ * The loop starts at 1 to skip the loopback NID.
+ */
+ for (i = 1; i < pbuf->pb_info.pi_nnis; i++) {
+ for (j = 0; j < ncurnis; j++)
+ if (pbuf->pb_info.pi_ni[i].ns_nid == curnis[j])
+ break;
+ if (j == ncurnis)
+ addnis[naddnis++] = pbuf->pb_info.pi_ni[i].ns_nid;
+ }
+ /*
+ * Check for NIDs in curnis[] not present in pbuf.
+ * The nested loop starts at 1 to skip the loopback NID.
+ *
+ * But never add the loopback NID to delnis[]: if it is
+ * present in curnis[] then this peer is for this node.
+ */
+ for (i = 0; i < ncurnis; i++) {
+ if (LNET_NETTYP(LNET_NIDNET(curnis[i])) == LOLND)
+ continue;
+ for (j = 1; j < pbuf->pb_info.pi_nnis; j++)
+ if (curnis[i] == pbuf->pb_info.pi_ni[j].ns_nid)
+ break;
+ if (j == pbuf->pb_info.pi_nnis)
+ delnis[ndelnis++] = curnis[i];
+ }
+
+ for (i = 0; i < naddnis; i++) {
+ rc = lnet_peer_add_nid(lp, addnis[i], flags);
+ if (rc) {
+ CERROR("Error adding NID %s to peer %s: %d\n",
+ libcfs_nid2str(addnis[i]),
+ libcfs_nid2str(lp->lp_primary_nid), rc);
+ if (rc == -ENOMEM)
+ goto out;
+ }
+ }
+ for (i = 0; i < ndelnis; i++) {
+ rc = lnet_peer_del_nid(lp, delnis[i], flags);
+ if (rc) {
+ CERROR("Error deleting NID %s from peer %s: %d\n",
+ libcfs_nid2str(delnis[i]),
+ libcfs_nid2str(lp->lp_primary_nid), rc);
+ if (rc == -ENOMEM)
+ goto out;
+ }
+ }
+ /*
+ * Errors other than -ENOMEM are due to peers having been
+ * configured with DLC. Ignore these because DLC overrides
+ * Discovery.
+ */
+ rc = 0;
+out:
+ LIBCFS_FREE(curnis, nnis * sizeof(lnet_nid_t));
+ LIBCFS_FREE(addnis, nnis * sizeof(lnet_nid_t));
+ LIBCFS_FREE(delnis, nnis * sizeof(lnet_nid_t));
+ lnet_ping_buffer_decref(pbuf);
+ CDEBUG(D_NET, "peer %s: %d\n", libcfs_nid2str(lp->lp_primary_nid), rc);
+
+ if (rc) {
+ spin_lock(&lp->lp_lock);
+ lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
+ lp->lp_state |= LNET_PEER_PING_REQUIRED;
+ spin_unlock(&lp->lp_lock);
+ }
+ return rc;
+}
+
+/*
+ * The data in pbuf says lp is its primary peer, but the data was
+ * received by a different peer. Try to update lp with the data.
+ */
+static int
+lnet_peer_set_primary_data(struct lnet_peer *lp, struct lnet_ping_buffer *pbuf)
+{
+ lnet_handle_md_t mdh;
+
+ /* Queue lp for discovery, and force it on the request queue. */
+ lnet_net_lock(LNET_LOCK_EX);
+ if (lnet_peer_queue_for_discovery(lp))
+ list_move(&lp->lp_dc_list, &the_lnet.ln_dc_request);
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ LNetInvalidateHandle(&mdh);
+
+ /*
+ * Decide whether we can move the peer to the DATA_PRESENT state.
+ *
+ * We replace stale data for a multi-rail peer, repair PING_FAILED
+ * status, and preempt PING_REQUIRED.
+ *
+ * If after that we have DATA_PRESENT, we merge it into this peer.
+ */
+ spin_lock(&lp->lp_lock);
+ if (lp->lp_state & LNET_PEER_MULTI_RAIL) {
+ if (lp->lp_peer_seqno < LNET_PING_BUFFER_SEQNO(pbuf)) {
+ lp->lp_peer_seqno = LNET_PING_BUFFER_SEQNO(pbuf);
+ } else if (lp->lp_state & LNET_PEER_DATA_PRESENT) {
+ lp->lp_state &= ~LNET_PEER_DATA_PRESENT;
+ lnet_ping_buffer_decref(pbuf);
+ pbuf = lp->lp_data;
+ lp->lp_data = NULL;
+ }
+ }
+ if (lp->lp_state & LNET_PEER_DATA_PRESENT) {
+ lnet_ping_buffer_decref(lp->lp_data);
+ lp->lp_data = NULL;
+ lp->lp_state &= ~LNET_PEER_DATA_PRESENT;
+ }
+ if (lp->lp_state & LNET_PEER_PING_FAILED) {
+ mdh = lp->lp_ping_mdh;
+ LNetInvalidateHandle(&lp->lp_ping_mdh);
+ lp->lp_state &= ~LNET_PEER_PING_FAILED;
+ lp->lp_ping_error = 0;
+ }
+ if (lp->lp_state & LNET_PEER_PING_REQUIRED) {
+ lp->lp_state &= ~LNET_PEER_PING_REQUIRED;
+ }
+ lp->lp_state |= LNET_PEER_NIDS_UPTODATE;
+ spin_unlock(&lp->lp_lock);
+
+ if (!LNetHandleIsInvalid(mdh))
+ LNetMDUnlink(mdh);
+
+ if (pbuf)
+ return lnet_peer_merge_data(lp, pbuf);
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+ return 0;
+}
+
+/*
+ * Update a peer using the data received.
+ */
+static int lnet_peer_data_present(struct lnet_peer *lp)
+__must_hold(&lp->lp_lock)
+{
+ struct lnet_ping_buffer *pbuf;
+ struct lnet_peer_ni *lpni;
+ lnet_nid_t nid = LNET_NID_ANY;
+ unsigned flags;
+ int rc = 0;
+
+ pbuf = lp->lp_data;
+ lp->lp_data = NULL;
+ lp->lp_state &= ~LNET_PEER_DATA_PRESENT;
+ lp->lp_state |= LNET_PEER_NIDS_UPTODATE;
+ spin_unlock(&lp->lp_lock);
+
+ /*
+ * Modifications of peer structures are done while holding the
+ * ln_api_mutex. A global lock is required because we may be
+ * modifying multiple peer structures, and a mutex greatly
+ * simplifies memory management.
+ *
+ * The actual changes to the data structures must also protect
+ * against concurrent lookups, for which the lnet_net_lock in
+ * LNET_LOCK_EX mode is used.
+ */
+ mutex_lock(&the_lnet.ln_api_mutex);
+ if (the_lnet.ln_state != LNET_STATE_RUNNING) {
+ rc = -ESHUTDOWN;
+ goto out;
+ }
+
+ /*
+ * If this peer is not on the peer list then it is being torn
+ * 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))
+ goto out;
+
+ flags = LNET_PEER_DISCOVERED;
+ if (pbuf->pb_info.pi_features & LNET_PING_FEAT_MULTI_RAIL)
+ flags |= LNET_PEER_MULTI_RAIL;
+
+ /*
+ * Check whether the primary NID in the message matches the
+ * primary NID of the peer. If it does, update the peer, if
+ * it it does not, check whether there is already a peer with
+ * that primary NID. If no such peer exists, try to update
+ * the primary NID of the current peer (allowed if it was
+ * created due to message traffic) and complete the update.
+ * If the peer did exist, hand off the data to it.
+ *
+ * The peer for the loopback interface is a special case: this
+ * is the peer for the local node, and we want to set its
+ * primary NID to the correct value here.
+ */
+ if (pbuf->pb_info.pi_nnis > 1)
+ nid = pbuf->pb_info.pi_ni[1].ns_nid;
+ if (LNET_NETTYP(LNET_NIDNET(lp->lp_primary_nid)) == LOLND) {
+ rc = lnet_peer_set_primary_nid(lp, nid, flags);
+ if (!rc)
+ rc = lnet_peer_merge_data(lp, pbuf);
+ } else if (lp->lp_primary_nid == nid) {
+ rc = lnet_peer_merge_data(lp, pbuf);
+ } else {
+ lpni = lnet_find_peer_ni_locked(nid);
+ if (!lpni) {
+ 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_nid2str(nid), rc);
+ } else {
+ rc = lnet_peer_merge_data(lp, pbuf);
+ }
+ } else {
+ rc = lnet_peer_set_primary_data(
+ lpni->lpni_peer_net->lpn_peer, pbuf);
+ lnet_peer_ni_decref_locked(lpni);
+ }
+ }
+out:
+ CDEBUG(D_NET, "peer %s: %d\n", libcfs_nid2str(lp->lp_primary_nid), rc);
+ mutex_unlock(&the_lnet.ln_api_mutex);
+
+ spin_lock(&lp->lp_lock);
+ /* Tell discovery to re-check the peer immediately. */
+ if (!rc)
+ rc = LNET_REDISCOVER_PEER;
+ return rc;
+}
+
+/*
+ * A ping failed. Clear the PING_FAILED state and set the
+ * PING_REQUIRED state, to ensure a retry even if discovery is
+ * disabled. This avoids being left with incorrect state.
+ */
+static int lnet_peer_ping_failed(struct lnet_peer *lp)
+__must_hold(&lp->lp_lock)
+{
+ lnet_handle_md_t mdh;
+ int rc;
+
+ mdh = lp->lp_ping_mdh;
+ LNetInvalidateHandle(&lp->lp_ping_mdh);
+ lp->lp_state &= ~LNET_PEER_PING_FAILED;
+ lp->lp_state |= LNET_PEER_PING_REQUIRED;
+ rc = lp->lp_ping_error;
+ lp->lp_ping_error = 0;
+ spin_unlock(&lp->lp_lock);
+
+ LNetMDUnlink(mdh);
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+
+ 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_is_peer_ni_healthy_locked(lpni))
+ continue;
+ 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_is_peer_ni_healthy_locked(lpni))
+ continue;
+ 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_md_t md = { NULL };
+ lnet_process_id_t id;
+ struct lnet_ping_buffer *pbuf;
+ int nnis;
+ int rc;
+ int cpt;
+
+ lp->lp_state |= LNET_PEER_PING_SENT;
+ lp->lp_state &= ~LNET_PEER_PING_REQUIRED;
+ spin_unlock(&lp->lp_lock);
+
+ nnis = MAX(lp->lp_data_nnis, LNET_MIN_INTERFACES);
+ pbuf = lnet_ping_buffer_alloc(nnis, GFP_NOFS);
+ if (!pbuf) {
+ rc = -ENOMEM;
+ goto fail_error;
+ }
+
+ /* initialize md content */
+ md.start = &pbuf->pb_info;
+ md.length = LNET_PING_INFO_SIZE(nnis);
+ md.threshold = 2; /* GET/REPLY */
+ md.max_size = 0;
+ md.options = LNET_MD_TRUNCATE;
+ md.user_ptr = lp;
+ md.eq_handle = the_lnet.ln_dc_eqh;
+
+ rc = LNetMDBind(md, LNET_UNLINK, &lp->lp_ping_mdh);
+ if (rc != 0) {
+ lnet_ping_buffer_decref(pbuf);
+ CERROR("Can't bind 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);
+ lnet_net_unlock(cpt);
+
+ if (id.nid == LNET_NID_ANY) {
+ rc = -EHOSTUNREACH;
+ goto fail_unlink_md;
+ }
+
+ rc = LNetGet(LNET_NID_ANY, lp->lp_ping_mdh, id,
+ LNET_RESERVED_PORTAL,
+ LNET_PROTO_PING_MATCHBITS, 0);
+
+ if (rc)
+ goto fail_unlink_md;
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+
+ spin_lock(&lp->lp_lock);
+ return 0;
+
+fail_unlink_md:
+ LNetMDUnlink(lp->lp_ping_mdh);
+ LNetInvalidateHandle(&lp->lp_ping_mdh);
+fail_error:
+ CDEBUG(D_NET, "peer %s: %d\n", libcfs_nid2str(lp->lp_primary_nid), rc);
+ /*
+ * The errors that get us here are considered hard errors and
+ * cause Discovery to terminate. Se we clear PING_SENT, but do
+ * not set either PING_FAILED or PING_REQUIRED.
+ */
+ spin_lock(&lp->lp_lock);
+ lp->lp_state &= ~LNET_PEER_PING_SENT;
+ return rc;
+}
+
+/*
+ * This function exists because you cannot call LNetMDUnlink() from an
+ * event handler.
+ */
+static int lnet_peer_push_failed(struct lnet_peer *lp)
+__must_hold(&lp->lp_lock)
+{
+ lnet_handle_md_t mdh;
+ int rc;
+
+ mdh = lp->lp_push_mdh;
+ LNetInvalidateHandle(&lp->lp_push_mdh);
+ lp->lp_state &= ~LNET_PEER_PUSH_FAILED;
+ rc = lp->lp_push_error;
+ lp->lp_push_error = 0;
+ spin_unlock(&lp->lp_lock);
+
+ LNetMDUnlink(mdh);
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+ spin_lock(&lp->lp_lock);
+ return rc ? rc : LNET_REDISCOVER_PEER;
+}
+
+/* Active side of push. */
+static int lnet_peer_send_push(struct lnet_peer *lp)
+__must_hold(&lp->lp_lock)
+{
+ struct lnet_ping_buffer *pbuf;
+ lnet_process_id_t id;
+ lnet_md_t md;
+ int cpt;
+ int rc;
+
+ LASSERT(lp->lp_state & LNET_PEER_MULTI_RAIL);
+
+ lp->lp_state |= LNET_PEER_PUSH_SENT;
+ spin_unlock(&lp->lp_lock);
+
+ cpt = lnet_net_lock_current();
+ pbuf = the_lnet.ln_ping_target;
+ lnet_ping_buffer_addref(pbuf);
+ lnet_net_unlock(cpt);
+
+ /* Push source MD */
+ md.start = &pbuf->pb_info;
+ md.length = LNET_PING_INFO_SIZE(pbuf->pb_nnis);
+ md.threshold = 2; /* Put/Ack */
+ md.max_size = 0;
+ md.options = 0;
+ md.eq_handle = the_lnet.ln_dc_eqh;
+ md.user_ptr = lp;
+
+ 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);
+ 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,
+ LNET_PROTO_PING_MATCHBITS, 0, 0);
+
+ if (rc)
+ goto fail_unlink;
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+
+ spin_lock(&lp->lp_lock);
+ return 0;
+
+fail_unlink:
+ LNetMDUnlink(lp->lp_push_mdh);
+ LNetInvalidateHandle(&lp->lp_push_mdh);
+fail_error:
+ CDEBUG(D_NET, "peer %s: %d\n", libcfs_nid2str(lp->lp_primary_nid), rc);
+ /*
+ * The errors that get us here are considered hard errors and
+ * cause Discovery to terminate. Se we clear PUSH_SENT, but do
+ * not set PUSH_FAILED.
+ */
+ spin_lock(&lp->lp_lock);
+ lp->lp_state &= ~LNET_PEER_PUSH_SENT;
+ return rc;
+}
+
+/*
+ * 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_UNDISCOVERED;
+ spin_unlock(&lp->lp_lock);
+}
+
+/*
+ * Mark the peer as undiscovered because discovery was disabled.
+ */
+static int lnet_peer_undiscovered(struct lnet_peer *lp)
+__must_hold(&lp->lp_lock)
+{
+
+ lp->lp_state &= ~(LNET_PEER_DISCOVERED | LNET_PEER_DISCOVERING);
+ lp->lp_state |= LNET_PEER_UNDISCOVERED;
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+
+ return 0;
+}
+
+/*
+ * 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;
+
+ CDEBUG(D_NET, "peer %s\n", libcfs_nid2str(lp->lp_primary_nid));
+
+ return 0;
+}
+
+/*
+ * 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.
+ */
+static int lnet_peer_discovery_wait_for_work(void)
+{
+ int cpt;
+ int rc = 0;
+
+ DEFINE_WAIT(wait);
+
+ cpt = lnet_net_lock_current();
+ for (;;) {
+ prepare_to_wait(&the_lnet.ln_dc_waitq, &wait,
+ TASK_INTERRUPTIBLE);
+ if (the_lnet.ln_dc_state == LNET_DC_STATE_STOPPING)
+ break;
+ if (lnet_push_target_resize_needed())
+ break;
+ if (!list_empty(&the_lnet.ln_dc_request))
+ break;
+ lnet_net_unlock(cpt);
+ schedule();
+ finish_wait(&the_lnet.ln_dc_waitq, &wait);
+ cpt = lnet_net_lock_current();
+ }
+ finish_wait(&the_lnet.ln_dc_waitq, &wait);
+
+ if (the_lnet.ln_dc_state == LNET_DC_STATE_STOPPING)
+ rc = -ESHUTDOWN;
+
+ lnet_net_unlock(cpt);
+
+ CDEBUG(D_NET, "woken: %d\n", rc);
+
+ CDEBUG(D_NET, "%d\n", rc);
+
+ return rc;
+}
+
+/* The discovery thread. */
+static int lnet_peer_discovery(void *arg)
+{
+ struct lnet_peer *lp;
+ int rc;
+
+ CDEBUG(D_NET, "started\n");
+ cfs_block_allsigs();
+
+ for (;;) {
+ if (lnet_peer_discovery_wait_for_work())
+ break;
+
+ if (lnet_push_target_resize_needed())
+ lnet_push_target_resize();
+
+ lnet_net_lock(LNET_LOCK_EX);
+ if (the_lnet.ln_dc_state == LNET_DC_STATE_STOPPING)
+ break;
+ while (!list_empty(&the_lnet.ln_dc_request)) {
+ lp = list_first_entry(&the_lnet.ln_dc_request,
+ struct lnet_peer, lp_dc_list);
+ list_move(&lp->lp_dc_list, &the_lnet.ln_dc_working);
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ spin_lock(&lp->lp_lock);
+ CDEBUG(D_NET, "peer %s state %#x\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ lp->lp_state);
+ 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 if (lp->lp_state & LNET_PEER_PUSH_FAILED)
+ rc = lnet_peer_push_failed(lp);
+ else if (lp->lp_state & LNET_PEER_PING_REQUIRED)
+ rc = lnet_peer_send_ping(lp);
+ else if (!lnet_peer_discovery_enabled)
+ rc = lnet_peer_undiscovered(lp);
+ else if (!(lp->lp_state & LNET_PEER_NIDS_UPTODATE))
+ rc = lnet_peer_send_ping(lp);
+ else if (lnet_peer_needs_push(lp))
+ rc = lnet_peer_send_push(lp);
+ else
+ rc = lnet_peer_discovered(lp);
+ CDEBUG(D_NET, "peer %s state %#x rc %d\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ lp->lp_state, rc);
+ spin_unlock(&lp->lp_lock);
+
+ lnet_net_lock(LNET_LOCK_EX);
+ if (rc == LNET_REDISCOVER_PEER) {
+ list_move(&lp->lp_dc_list,
+ &the_lnet.ln_dc_request);
+ } else if (rc) {
+ lnet_peer_discovery_error(lp, rc);
+ }
+ if (!(lp->lp_state & LNET_PEER_DISCOVERING))
+ lnet_peer_discovery_complete(lp);
+ if (the_lnet.ln_dc_state == LNET_DC_STATE_STOPPING)
+ break;
+ }
+ lnet_net_unlock(LNET_LOCK_EX);
+ }
+
+ CDEBUG(D_NET, "stopping\n");
+ /*
+ * Clean up before telling lnet_peer_discovery_stop() that
+ * we're done. Use wake_up() below to somewhat reduce the
+ * size of the thundering herd if there are multiple threads
+ * waiting on discovery of a single peer.
+ */
+ LNetEQFree(the_lnet.ln_dc_eqh);
+ LNetInvalidateHandle(&the_lnet.ln_dc_eqh);
+
+ lnet_net_lock(LNET_LOCK_EX);
+ list_for_each_entry(lp, &the_lnet.ln_dc_request, lp_dc_list) {
+ lnet_peer_discovery_error(lp, -ESHUTDOWN);
+ lnet_peer_discovery_complete(lp);
+ }
+ list_for_each_entry(lp, &the_lnet.ln_dc_working, lp_dc_list) {
+ lnet_peer_discovery_error(lp, -ESHUTDOWN);
+ lnet_peer_discovery_complete(lp);
+ }
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ the_lnet.ln_dc_state = LNET_DC_STATE_SHUTDOWN;
+ wake_up(&the_lnet.ln_dc_waitq);
+
+ CDEBUG(D_NET, "stopped\n");
+
+ return 0;
+}
+
+/* ln_api_mutex is held on entry. */
+int lnet_peer_discovery_start(void)
+{
+ struct task_struct *task;
+ int rc;
+
+ if (the_lnet.ln_dc_state != LNET_DC_STATE_SHUTDOWN)
+ return -EALREADY;
+
+ INIT_LIST_HEAD(&the_lnet.ln_dc_request);
+ INIT_LIST_HEAD(&the_lnet.ln_dc_working);
+ init_waitqueue_head(&the_lnet.ln_dc_waitq);
+
+ rc = LNetEQAlloc(0, lnet_discovery_event_handler, &the_lnet.ln_dc_eqh);
+ if (rc != 0) {
+ CERROR("Can't allocate discovery EQ: %d\n", rc);
+ return rc;
+ }
+
+ the_lnet.ln_dc_state = LNET_DC_STATE_RUNNING;
+ task = kthread_run(lnet_peer_discovery, NULL, "lnet_discovery");
+ if (IS_ERR(task)) {
+ rc = PTR_ERR(task);
+ CERROR("Can't start peer discovery thread: %d\n", rc);
+
+ LNetEQFree(the_lnet.ln_dc_eqh);
+ LNetInvalidateHandle(&the_lnet.ln_dc_eqh);
+
+ the_lnet.ln_dc_state = LNET_DC_STATE_SHUTDOWN;
+ }
+
+ CDEBUG(D_NET, "discovery start: %d\n", rc);
+
+ return rc;
+}
+
+/* ln_api_mutex is held on entry. */
+void lnet_peer_discovery_stop(void)
+{
+ if (the_lnet.ln_dc_state == LNET_DC_STATE_SHUTDOWN)
+ return;
+
+ LASSERT(the_lnet.ln_dc_state == LNET_DC_STATE_RUNNING);
+ the_lnet.ln_dc_state = LNET_DC_STATE_STOPPING;
+ wake_up(&the_lnet.ln_dc_waitq);
+
+ wait_event(the_lnet.ln_dc_waitq,
+ the_lnet.ln_dc_state == LNET_DC_STATE_SHUTDOWN);
+
+ LASSERT(list_empty(&the_lnet.ln_dc_request));
+ LASSERT(list_empty(&the_lnet.ln_dc_working));
+
+ CDEBUG(D_NET, "discovery stopped\n");
+}
+
+/* Debugging */
+
+void
+lnet_debug_peer(lnet_nid_t nid)
+{
+ char *aliveness = "NA";
+ struct lnet_peer_ni *lp;
+ int cpt;
+
+ cpt = lnet_cpt_of_nid(nid, NULL);
+ lnet_net_lock(cpt);
+
+ lp = lnet_nid2peerni_locked(nid, LNET_NID_ANY, cpt);
+ if (IS_ERR(lp)) {
+ lnet_net_unlock(cpt);
+ CDEBUG(D_WARNING, "No peer %s\n", libcfs_nid2str(nid));
+ return;
+ }
+
+ if (lnet_isrouter(lp) || lnet_peer_aliveness_enabled(lp))
+ aliveness = lp->lpni_alive ? "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),
+ 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);
+
+ lnet_peer_ni_decref_locked(lp);
+
+ lnet_net_unlock(cpt);
+}
+
+/* Gathering information for userspace. */
int lnet_get_peer_ni_info(__u32 peer_index, __u64 *nid,
char aliveness[LNET_MAX_STR_LEN],
return found ? 0 : -ENOENT;
}
+/* ln_api_mutex is held, which keeps the peer list stable */
int lnet_get_peer_info(__u32 idx, lnet_nid_t *primary_nid, lnet_nid_t *nid,
bool *mr, struct lnet_peer_ni_credit_info *peer_ni_info,
struct lnet_ioctl_element_stats *peer_ni_stats)
return -ENOENT;
*primary_nid = lp->lp_primary_nid;
- *mr = lp->lp_multi_rail;
+ *mr = lnet_peer_is_multi_rail(lp);
*nid = lpni->lpni_nid;
snprintf(peer_ni_info->cr_aliveness, LNET_MAX_STR_LEN, "NA");
if (lnet_isrouter(lpni) ||
lpni->lpni_net->net_tunables.lct_peer_tx_credits : 0;
peer_ni_info->cr_peer_tx_credits = lpni->lpni_txcredits;
peer_ni_info->cr_peer_rtr_credits = lpni->lpni_rtrcredits;
- peer_ni_info->cr_peer_min_rtr_credits = lpni->lpni_mintxcredits;
+ peer_ni_info->cr_peer_min_rtr_credits = lpni->lpni_minrtrcredits;
+ peer_ni_info->cr_peer_min_tx_credits = lpni->lpni_mintxcredits;
peer_ni_info->cr_peer_tx_qnob = lpni->lpni_txqnob;
peer_ni_stats->send_count = atomic_read(&lpni->lpni_stats.send_count);