Whamcloud - gitweb
LU-7734 lnet: Multi-Rail local_ni/peer_ni selection
[fs/lustre-release.git] / lnet / lnet / peer.c
index 419372f..0276756 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <lnet/lib-lnet.h>
+#include <lnet/lib-dlc.h>
 
 int
-lnet_peer_table_create(void)
+lnet_peer_tables_create(void)
 {
        struct lnet_peer_table  *ptable;
-       cfs_list_t              *hash;
+       struct list_head        *hash;
+       int                     i;
        int                     j;
 
-       LIBCFS_ALLOC(ptable, sizeof(*ptable));
-       if (ptable == NULL) {
+       the_lnet.ln_peer_tables = cfs_percpt_alloc(lnet_cpt_table(),
+                                                  sizeof(*ptable));
+       if (the_lnet.ln_peer_tables == NULL) {
                CERROR("Failed to allocate cpu-partition peer tables\n");
                return -ENOMEM;
        }
 
-       the_lnet.ln_peer_table = ptable;
-
-       do { /* we will have per CPT peer-tables iterate them by then */
-               CFS_INIT_LIST_HEAD(&ptable->pt_deathrow);
-
-               LIBCFS_ALLOC(hash, LNET_PEER_HASH_SIZE * sizeof(*hash));
+       cfs_percpt_for_each(ptable, i, the_lnet.ln_peer_tables) {
+               LIBCFS_CPT_ALLOC(hash, lnet_cpt_table(), i,
+                                LNET_PEER_HASH_SIZE * sizeof(*hash));
                if (hash == NULL) {
                        CERROR("Failed to create peer hash table\n");
-                       lnet_peer_table_destroy();
+                       lnet_peer_tables_destroy();
                        return -ENOMEM;
                }
 
                for (j = 0; j < LNET_PEER_HASH_SIZE; j++)
-                       CFS_INIT_LIST_HEAD(&hash[j]);
+                       INIT_LIST_HEAD(&hash[j]);
                ptable->pt_hash = hash; /* sign of initialization */
-       } while (0);
+       }
 
        return 0;
 }
 
 void
-lnet_peer_table_destroy(void)
+lnet_peer_tables_destroy(void)
 {
        struct lnet_peer_table  *ptable;
-       cfs_list_t              *hash;
+       struct list_head        *hash;
+       int                     i;
        int                     j;
 
-       if (the_lnet.ln_peer_table == NULL)
+       if (the_lnet.ln_peer_tables == NULL)
                return;
 
-       ptable = the_lnet.ln_peer_table;
-
-       do { /* we will have per CPT peer-tables iterate them by then */
+       cfs_percpt_for_each(ptable, i, the_lnet.ln_peer_tables) {
                hash = ptable->pt_hash;
                if (hash == NULL) /* not intialized */
                        break;
 
-               LASSERT(cfs_list_empty(&ptable->pt_deathrow));
-
                ptable->pt_hash = NULL;
                for (j = 0; j < LNET_PEER_HASH_SIZE; j++)
-                       LASSERT(cfs_list_empty(&hash[j]));
+                       LASSERT(list_empty(&hash[j]));
 
                LIBCFS_FREE(hash, LNET_PEER_HASH_SIZE * sizeof(*hash));
-       } while (0);
+       }
 
-       LIBCFS_FREE(ptable, sizeof(*ptable));
-       the_lnet.ln_peer_table = NULL;
+       cfs_percpt_free(the_lnet.ln_peer_tables);
+       the_lnet.ln_peer_tables = NULL;
 }
 
-void
-lnet_peer_table_cleanup(void)
+static void
+lnet_peer_table_cleanup_locked(lnet_ni_t *ni, struct lnet_peer_table *ptable)
 {
-       struct lnet_peer_table  *ptable;
-       int                     j;
-
-       LASSERT(the_lnet.ln_shutdown);  /* i.e. no new peers */
-       ptable = the_lnet.ln_peer_table;
+       int                      i;
+       struct lnet_peer_ni     *lp;
+       struct lnet_peer_ni     *tmp;
+
+       for (i = 0; i < LNET_PEER_HASH_SIZE; i++) {
+               list_for_each_entry_safe(lp, tmp, &ptable->pt_hash[i],
+                                        lpni_hashlist) {
+                       if (ni != NULL && ni->ni_net != lp->lpni_net)
+                               continue;
+                       list_del_init(&lp->lpni_hashlist);
+                       /* Lose hash table's ref */
+                       ptable->pt_zombies++;
+                       lnet_peer_ni_decref_locked(lp);
+               }
+       }
+}
 
-       do { /* we will have per CPT peer-tables iterate them by then */
-               LNET_LOCK();
+static void
+lnet_peer_table_finalize_wait_locked(struct lnet_peer_table *ptable,
+                                    int cpt_locked)
+{
+       int     i;
 
-               for (j = 0; j < LNET_PEER_HASH_SIZE; j++) {
-                       cfs_list_t *peers = &ptable->pt_hash[j];
+       for (i = 3; ptable->pt_zombies != 0; i++) {
+               lnet_net_unlock(cpt_locked);
 
-                       while (!cfs_list_empty(peers)) {
-                               lnet_peer_t *lp = cfs_list_entry(peers->next,
-                                                                lnet_peer_t,
-                                                                lp_hashlist);
-                               cfs_list_del_init(&lp->lp_hashlist);
-                               /* lose hash table's ref */
-                               lnet_peer_decref_locked(lp);
-                       }
+               if (IS_PO2(i)) {
+                       CDEBUG(D_WARNING,
+                              "Waiting for %d zombies on peer table\n",
+                              ptable->pt_zombies);
                }
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule_timeout(cfs_time_seconds(1) >> 1);
+               lnet_net_lock(cpt_locked);
+       }
+}
 
-               LNET_UNLOCK();
-       } while (0);
+static void
+lnet_peer_table_del_rtrs_locked(lnet_ni_t *ni, struct lnet_peer_table *ptable,
+                               int cpt_locked)
+{
+       struct lnet_peer_ni     *lp;
+       struct lnet_peer_ni     *tmp;
+       lnet_nid_t              lpni_nid;
+       int                     i;
 
-       do { /* we will have per CPT peer-tables iterate them by then */
-               CFS_LIST_HEAD   (deathrow);
-               lnet_peer_t     *lp;
+       for (i = 0; i < LNET_PEER_HASH_SIZE; i++) {
+               list_for_each_entry_safe(lp, tmp, &ptable->pt_hash[i],
+                                        lpni_hashlist) {
+                       if (ni->ni_net != lp->lpni_net)
+                               continue;
 
-               LNET_LOCK();
+                       if (lp->lpni_rtr_refcount == 0)
+                               continue;
 
-               for (j = 3; ptable->pt_number != 0; j++) {
-                       LNET_UNLOCK();
+                       lpni_nid = lp->lpni_nid;
 
-                       if ((j & (j - 1)) == 0) {
-                               CDEBUG(D_WARNING,
-                                      "Waiting for %d peers on peer table\n",
-                                      ptable->pt_number);
-                       }
-                       cfs_pause(cfs_time_seconds(1) / 2);
-                       LNET_LOCK();
+                       lnet_net_unlock(cpt_locked);
+                       lnet_del_route(LNET_NIDNET(LNET_NID_ANY), lpni_nid);
+                       lnet_net_lock(cpt_locked);
                }
-               cfs_list_splice_init(&ptable->pt_deathrow, &deathrow);
+       }
+}
+
+void
+lnet_peer_tables_cleanup(lnet_ni_t *ni)
+{
+       int                             i;
+       struct lnet_peer_table          *ptable;
+
+       LASSERT(the_lnet.ln_shutdown || ni != 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) {
+               lnet_net_lock(LNET_LOCK_EX);
+               lnet_peer_table_del_rtrs_locked(ni, ptable, i);
+               lnet_net_unlock(LNET_LOCK_EX);
+       }
+
+       /* Start the cleanup process */
+       cfs_percpt_for_each(ptable, i, the_lnet.ln_peer_tables) {
+               lnet_net_lock(LNET_LOCK_EX);
+               lnet_peer_table_cleanup_locked(ni, ptable);
+               lnet_net_unlock(LNET_LOCK_EX);
+       }
+
+       /* Wait until all peers have been destroyed. */
+       cfs_percpt_for_each(ptable, i, the_lnet.ln_peer_tables) {
+               lnet_net_lock(LNET_LOCK_EX);
+               lnet_peer_table_finalize_wait_locked(ptable, i);
+               lnet_net_unlock(LNET_LOCK_EX);
+       }
+}
+
+static struct lnet_peer_ni *
+lnet_get_peer_ni_locked(struct lnet_peer_table *ptable, lnet_nid_t nid)
+{
+       struct list_head        *peers;
+       struct lnet_peer_ni     *lp;
 
-               LNET_UNLOCK();
+       LASSERT(!the_lnet.ln_shutdown);
 
-               while (!cfs_list_empty(&deathrow)) {
-                       lp = cfs_list_entry(deathrow.next,
-                                           lnet_peer_t, lp_hashlist);
-                       cfs_list_del(&lp->lp_hashlist);
-                       LIBCFS_FREE(lp, sizeof(*lp));
+       peers = &ptable->pt_hash[lnet_nid2peerhash(nid)];
+       list_for_each_entry(lp, peers, lpni_hashlist) {
+               if (lp->lpni_nid == nid) {
+                       lnet_peer_ni_addref_locked(lp);
+                       return lp;
                }
-       } while (0);
+       }
+
+       return NULL;
 }
 
-void
-lnet_destroy_peer_locked(lnet_peer_t *lp)
+struct lnet_peer_ni *
+lnet_find_peer_ni_locked(lnet_nid_t nid, int cpt)
 {
-       struct lnet_peer_table *ptable = the_lnet.ln_peer_table;
+       struct lnet_peer_ni *lpni;
+       struct lnet_peer_table *ptable;
 
-       LASSERT(lp->lp_refcount == 0);
-       LASSERT(lp->lp_rtr_refcount == 0);
-       LASSERT(cfs_list_empty(&lp->lp_txq));
-       LASSERT(cfs_list_empty(&lp->lp_hashlist));
-       LASSERT(lp->lp_txqnob == 0);
+       ptable = the_lnet.ln_peer_tables[cpt];
+       lpni = lnet_get_peer_ni_locked(ptable, nid);
 
-       LASSERT(ptable->pt_number > 0);
-       ptable->pt_number--;
+       return lpni;
+}
 
-       lnet_ni_decref_locked(lp->lp_ni);
-       lp->lp_ni = NULL;
+int
+lnet_find_or_create_peer_locked(lnet_nid_t dst_nid, int cpt, struct lnet_peer **peer)
+{
+       struct lnet_peer_ni *lpni;
+
+       lpni = lnet_find_peer_ni_locked(dst_nid, cpt);
+       if (!lpni) {
+               int rc;
+               rc = lnet_nid2peerni_locked(&lpni, dst_nid, cpt);
+               if (rc != 0)
+                       return rc;
+       }
+
+       *peer = lpni->lpni_peer_net->lpn_peer;
+       lnet_peer_ni_decref_locked(lpni);
 
-       cfs_list_add(&lp->lp_hashlist, &ptable->pt_deathrow);
+       return 0;
 }
 
-lnet_peer_t *
-lnet_find_peer_locked(lnet_nid_t nid)
+struct lnet_peer_ni *
+lnet_get_next_peer_ni_locked(struct lnet_peer *peer,
+                            struct lnet_peer_net *peer_net,
+                            struct lnet_peer_ni *prev)
 {
-       cfs_list_t      *peers;
-       lnet_peer_t     *lp;
+       struct lnet_peer_ni *lpni;
+       struct lnet_peer_net *net = peer_net;
+
+       if (!prev) {
+               if (!net)
+                       net = list_entry(peer->lp_peer_nets.next,
+                                        struct lnet_peer_net,
+                                        lpn_on_peer_list);
+               lpni = list_entry(net->lpn_peer_nis.next, struct lnet_peer_ni,
+                                 lpni_on_peer_net_list);
+
+               return lpni;
+       }
 
-       if (the_lnet.ln_shutdown)
-               return NULL;
+       if (prev->lpni_on_peer_net_list.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
+                * net.
+                */
+               if (net)
+                       return NULL;
+
+               /*
+                * we reached the end of this net ni list. move to the
+                * next net
+                */
+               if (prev->lpni_peer_net->lpn_on_peer_list.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,
+                                struct lnet_peer_net,
+                                lpn_on_peer_list);
+               /* get the ni on it */
+               lpni = list_entry(net->lpn_peer_nis.next, struct lnet_peer_ni,
+                                 lpni_on_peer_net_list);
+
+               return lpni;
+       }
 
-       peers = &the_lnet.ln_peer_table->pt_hash[lnet_nid2peerhash(nid)];
-       cfs_list_for_each_entry(lp, peers, lp_hashlist) {
-               if (lp->lp_nid == nid) {
-                       lnet_peer_addref_locked(lp);
-                       return lp;
+       /* there are more nis left */
+       lpni = list_entry(prev->lpni_on_peer_net_list.next,
+                         struct lnet_peer_ni, lpni_on_peer_net_list);
+
+       return lpni;
+}
+
+bool
+lnet_peer_is_ni_pref_locked(struct lnet_peer_ni *lpni, struct lnet_ni *ni)
+{
+       int i;
+
+       for (i = 0; i < lpni->lpni_pref_nnids; i++) {
+               if (lpni->lpni_pref_nids[i] == ni->ni_nid)
+                       return true;
+       }
+       return false;
+}
+
+static void
+lnet_try_destroy_peer_hierarchy_locked(struct lnet_peer_ni *lpni)
+{
+       struct lnet_peer_net *peer_net;
+       struct lnet_peer *peer;
+
+       /* 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;
+
+       peer_net = lpni->lpni_peer_net;
+       peer = lpni->lpni_peer_net->lpn_peer;
+
+       list_del_init(&lpni->lpni_on_peer_net_list);
+       lpni->lpni_peer_net = NULL;
+
+       /* 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));
                }
        }
+}
+
+static int
+lnet_build_peer_hierarchy(struct lnet_peer_ni *lpni)
+{
+       struct lnet_peer *peer;
+       struct lnet_peer_net *peer_net;
+       __u32 lpni_net = LNET_NIDNET(lpni->lpni_nid);
+
+       peer = NULL;
+       peer_net = NULL;
+
+       LIBCFS_ALLOC(peer, sizeof(*peer));
+       if (peer == NULL)
+               return -ENOMEM;
+
+       LIBCFS_ALLOC(peer_net, sizeof(*peer_net));
+       if (peer_net == NULL) {
+               LIBCFS_FREE(peer, sizeof(*peer));
+               return -ENOMEM;
+       }
+
+       INIT_LIST_HEAD(&peer->lp_on_lnet_peer_list);
+       INIT_LIST_HEAD(&peer->lp_peer_nets);
+       INIT_LIST_HEAD(&peer_net->lpn_on_peer_list);
+       INIT_LIST_HEAD(&peer_net->lpn_peer_nis);
+
+       /* build the hierarchy */
+       peer_net->lpn_net_id = lpni_net;
+       peer_net->lpn_peer = peer;
+       lpni->lpni_peer_net = peer_net;
+       peer->lp_primary_nid = lpni->lpni_nid;
+       list_add_tail(&peer_net->lpn_on_peer_list, &peer->lp_peer_nets);
+       list_add_tail(&lpni->lpni_on_peer_net_list, &peer_net->lpn_peer_nis);
+       list_add_tail(&peer->lp_on_lnet_peer_list, &the_lnet.ln_peers);
+
+       return 0;
+}
 
+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) {
+               if (peer_net->lpn_net_id == net_id)
+                       return peer_net;
+       }
        return NULL;
 }
 
+void
+lnet_destroy_peer_ni_locked(struct lnet_peer_ni *lpni)
+{
+       struct lnet_peer_table *ptable;
+
+       LASSERT(atomic_read(&lpni->lpni_refcount) == 0);
+       LASSERT(lpni->lpni_rtr_refcount == 0);
+       LASSERT(list_empty(&lpni->lpni_txq));
+       LASSERT(list_empty(&lpni->lpni_hashlist));
+       LASSERT(lpni->lpni_txqnob == 0);
+       LASSERT(lpni->lpni_peer_net != NULL);
+       LASSERT(lpni->lpni_peer_net->lpn_peer != NULL);
+
+       ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
+       LASSERT(ptable->pt_number > 0);
+       ptable->pt_number--;
+
+       lpni->lpni_net = NULL;
+
+       lnet_try_destroy_peer_hierarchy_locked(lpni);
+
+       LIBCFS_FREE(lpni, sizeof(*lpni));
+
+       LASSERT(ptable->pt_zombies > 0);
+       ptable->pt_zombies--;
+}
+
 int
-lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid)
+lnet_nid2peerni_locked(struct lnet_peer_ni **lpnip, lnet_nid_t nid, int cpt)
 {
-       struct lnet_peer_table  *ptable = the_lnet.ln_peer_table;
-       lnet_peer_t             *lp = NULL;
-       lnet_peer_t             *lp2;
-
-        lp = lnet_find_peer_locked(nid);
-        if (lp != NULL) {
-                *lpp = lp;
-                return 0;
-        }
-
-       if (!cfs_list_empty(&ptable->pt_deathrow)) {
-               lp = cfs_list_entry(ptable->pt_deathrow.next,
-                                   lnet_peer_t, lp_hashlist);
-               cfs_list_del(&lp->lp_hashlist);
+       struct lnet_peer_table  *ptable;
+       struct lnet_peer_ni     *lpni = NULL;
+       struct lnet_peer_ni     *lpni2;
+       int                     cpt2;
+       int                     rc = 0;
+
+       *lpnip = NULL;
+       if (the_lnet.ln_shutdown) /* it's shutting down */
+               return -ESHUTDOWN;
+
+       /*
+        * calculate cpt2 with the standard hash function
+        * This cpt2 becomes the slot where we'll find or create the peer.
+        */
+       cpt2 = lnet_nid_cpt_hash(nid, LNET_CPT_NUMBER);
+
+       /*
+        * Any changes to the peer tables happen under exclusive write
+        * lock. Any reads to the peer tables can be done via a standard
+        * CPT read lock.
+        */
+       if (cpt != LNET_LOCK_EX) {
+               lnet_net_unlock(cpt);
+               lnet_net_lock(LNET_LOCK_EX);
        }
 
-       LNET_UNLOCK();
-
-       if (lp != NULL)
-               memset(lp, 0, sizeof(*lp));
-       else
-               LIBCFS_ALLOC(lp, sizeof(*lp));
-
-       if (lp == NULL) {
-                *lpp = NULL;
-                LNET_LOCK();
-                return -ENOMEM;
-        }
-
-       CFS_INIT_LIST_HEAD(&lp->lp_txq);
-        CFS_INIT_LIST_HEAD(&lp->lp_rtrq);
-       CFS_INIT_LIST_HEAD(&lp->lp_routes);
-
-        lp->lp_notify = 0;
-        lp->lp_notifylnd = 0;
-        lp->lp_notifying = 0;
-        lp->lp_alive_count = 0;
-        lp->lp_timestamp = 0;
-        lp->lp_alive = !lnet_peers_start_down(); /* 1 bit!! */
-        lp->lp_last_alive = cfs_time_current(); /* assumes alive */
-        lp->lp_last_query = 0; /* haven't asked NI yet */
-        lp->lp_ping_timestamp = 0;
-       lp->lp_ping_version = LNET_PROTO_PING_UNKNOWN;
-        lp->lp_nid = nid;
-        lp->lp_refcount = 2;                    /* 1 for caller; 1 for hash */
-        lp->lp_rtr_refcount = 0;
-
-        LNET_LOCK();
-
-        lp2 = lnet_find_peer_locked(nid);
-        if (lp2 != NULL) {
-               cfs_list_add(&lp->lp_hashlist, &ptable->pt_deathrow);
-
-                if (the_lnet.ln_shutdown) {
-                        lnet_peer_decref_locked(lp2);
-                        *lpp = NULL;
-                        return -ESHUTDOWN;
-                }
-
-                *lpp = lp2;
-                return 0;
-        }
-                
-        lp->lp_ni = lnet_net2ni_locked(LNET_NIDNET(nid));
-        if (lp->lp_ni == NULL) {
-               cfs_list_add(&lp->lp_hashlist, &ptable->pt_deathrow);
-
-                *lpp = NULL;
-                return the_lnet.ln_shutdown ? -ESHUTDOWN : -EHOSTUNREACH;
-        }
-
-        lp->lp_txcredits    =
-        lp->lp_mintxcredits = lp->lp_ni->ni_peertxcredits;
-        lp->lp_rtrcredits    =
-        lp->lp_minrtrcredits = lnet_peer_buffer_credits(lp->lp_ni);
-
-        /* can't add peers after shutdown starts */
-        LASSERT (!the_lnet.ln_shutdown);
-
-       cfs_list_add_tail(&lp->lp_hashlist,
-                         &ptable->pt_hash[lnet_nid2peerhash(nid)]);
-       ptable->pt_version++;
+       ptable = the_lnet.ln_peer_tables[cpt2];
+       lpni = lnet_get_peer_ni_locked(ptable, nid);
+       if (lpni != NULL) {
+               *lpnip = lpni;
+               if (cpt != LNET_LOCK_EX) {
+                       lnet_net_unlock(LNET_LOCK_EX);
+                       lnet_net_lock(cpt);
+               }
+               return 0;
+       }
+
+       /*
+        * take extra refcount in case another thread has shutdown LNet
+        * and destroyed locks and peer-table before I finish the allocation
+        */
        ptable->pt_number++;
+       lnet_net_unlock(LNET_LOCK_EX);
+
+       LIBCFS_CPT_ALLOC(lpni, lnet_cpt_table(), cpt2, sizeof(*lpni));
+
+       if (lpni == NULL) {
+               rc = -ENOMEM;
+               lnet_net_lock(cpt);
+               goto out;
+       }
+
+       INIT_LIST_HEAD(&lpni->lpni_txq);
+       INIT_LIST_HEAD(&lpni->lpni_rtrq);
+       INIT_LIST_HEAD(&lpni->lpni_routes);
+
+       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;
+       lpni->lpni_nid = nid;
+       lpni->lpni_cpt = cpt2;
+       atomic_set(&lpni->lpni_refcount, 2);    /* 1 for caller; 1 for hash */
+
+       rc = lnet_build_peer_hierarchy(lpni);
+       if (rc != 0)
+               goto out;
+
+       lnet_net_lock(LNET_LOCK_EX);
+
+       if (the_lnet.ln_shutdown) {
+               rc = -ESHUTDOWN;
+               goto out;
+       }
+
+       lpni2 = lnet_get_peer_ni_locked(ptable, nid);
+       if (lpni2 != NULL) {
+               *lpnip = lpni2;
+               goto out;
+       }
+
+       lpni->lpni_net = lnet_get_net_locked(LNET_NIDNET(lpni->lpni_nid));
+       if (lpni->lpni_net) {
+               lpni->lpni_txcredits    =
+               lpni->lpni_mintxcredits =
+                       lpni->lpni_net->net_tunables.lct_peer_tx_credits;
+               lpni->lpni_rtrcredits    =
+               lpni->lpni_minrtrcredits =
+                       lnet_peer_buffer_credits(lpni->lpni_net);
+       } else {
+               CDEBUG(D_NET, "peer_ni %s is not directly connected\n",
+                      libcfs_nid2str(nid));
+       }
+
+       lnet_set_peer_ni_health_locked(lpni, true);
+
+       list_add_tail(&lpni->lpni_hashlist,
+                       &ptable->pt_hash[lnet_nid2peerhash(nid)]);
+       ptable->pt_version++;
+       *lpnip = lpni;
+
+       if (cpt != LNET_LOCK_EX) {
+               lnet_net_unlock(LNET_LOCK_EX);
+               lnet_net_lock(cpt);
+       }
 
-       *lpp = lp;
        return 0;
+out:
+       if (lpni != NULL) {
+               lnet_try_destroy_peer_hierarchy_locked(lpni);
+               LIBCFS_FREE(lpni, sizeof(*lpni));
+       }
+       ptable->pt_number--;
+       if (cpt != LNET_LOCK_EX) {
+               lnet_net_unlock(LNET_LOCK_EX);
+               lnet_net_lock(cpt);
+       }
+       return rc;
 }
 
 void
 lnet_debug_peer(lnet_nid_t nid)
 {
-        char        *aliveness = "NA";
-        int          rc;
-        lnet_peer_t *lp;
+       char                    *aliveness = "NA";
+       struct lnet_peer_ni     *lp;
+       int                     rc;
+       int                     cpt;
+
+       cpt = lnet_cpt_of_nid(nid, NULL);
+       lnet_net_lock(cpt);
+
+       rc = lnet_nid2peerni_locked(&lp, nid, cpt);
+       if (rc != 0) {
+               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";
 
-        LNET_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);
 
-        rc = lnet_nid2peer_locked(&lp, nid);
-        if (rc != 0) {
-                LNET_UNLOCK();
-                CDEBUG(D_WARNING, "No peer %s\n", libcfs_nid2str(nid));
-                return;
-        }
+       lnet_peer_ni_decref_locked(lp);
 
-        if (lnet_isrouter(lp) || lnet_peer_aliveness_enabled(lp))
-                aliveness = lp->lp_alive ? "up" : "down";
+       lnet_net_unlock(cpt);
+}
 
-        CDEBUG(D_WARNING, "%-24s %4d %5s %5d %5d %5d %5d %5d %ld\n",
-               libcfs_nid2str(lp->lp_nid), lp->lp_refcount,
-               aliveness, lp->lp_ni->ni_peertxcredits,
-               lp->lp_rtrcredits, lp->lp_minrtrcredits,
-               lp->lp_txcredits, lp->lp_mintxcredits, lp->lp_txqnob);
+int lnet_get_peer_info(__u32 peer_index, __u64 *nid,
+                      char aliveness[LNET_MAX_STR_LEN],
+                      __u32 *cpt_iter, __u32 *refcount,
+                      __u32 *ni_peer_tx_credits, __u32 *peer_tx_credits,
+                      __u32 *peer_rtr_credits, __u32 *peer_min_rtr_credits,
+                      __u32 *peer_tx_qnob)
+{
+       struct lnet_peer_table          *peer_table;
+       struct lnet_peer_ni             *lp;
+       int                             j;
+       int                             lncpt;
+       bool                            found = false;
+
+       /* get the number of CPTs */
+       lncpt = cfs_percpt_number(the_lnet.ln_peer_tables);
+
+       /* if the cpt number to be examined is >= the number of cpts in
+        * the system then indicate that there are no more cpts to examin
+        */
+       if (*cpt_iter >= lncpt)
+               return -ENOENT;
+
+       /* get the current table */
+       peer_table = the_lnet.ln_peer_tables[*cpt_iter];
+       /* if the ptable is NULL then there are no more cpts to examine */
+       if (peer_table == NULL)
+               return -ENOENT;
+
+       lnet_net_lock(*cpt_iter);
+
+       for (j = 0; j < LNET_PEER_HASH_SIZE && !found; j++) {
+               struct list_head *peers = &peer_table->pt_hash[j];
+
+               list_for_each_entry(lp, peers, lpni_hashlist) {
+                       if (peer_index-- > 0)
+                               continue;
+
+                       snprintf(aliveness, LNET_MAX_STR_LEN, "NA");
+                       if (lnet_isrouter(lp) ||
+                               lnet_peer_aliveness_enabled(lp))
+                               snprintf(aliveness, LNET_MAX_STR_LEN,
+                                        lp->lpni_alive ? "up" : "down");
+
+                       *nid = lp->lpni_nid;
+                       *refcount = atomic_read(&lp->lpni_refcount);
+                       *ni_peer_tx_credits =
+                               lp->lpni_net->net_tunables.lct_peer_tx_credits;
+                       *peer_tx_credits = lp->lpni_txcredits;
+                       *peer_rtr_credits = lp->lpni_rtrcredits;
+                       *peer_min_rtr_credits = lp->lpni_mintxcredits;
+                       *peer_tx_qnob = lp->lpni_txqnob;
+
+                       found = true;
+               }
+
+       }
+       lnet_net_unlock(*cpt_iter);
 
-        lnet_peer_decref_locked(lp);
+       *cpt_iter = lncpt;
 
-        LNET_UNLOCK();
+       return found ? 0 : -ENOENT;
 }