X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Finclude%2Flnet%2Flib-lnet.h;h=abd8dd7ad6a98fe742fc608356d9d6aa7abe7b06;hp=a3556e6305f97370dcad23d6748b78766ab2a5ed;hb=ffd8e881bb98bf3fce0716b46cc51b1922642f6e;hpb=3211f6862cbbe96642db540e6593f3c614f9528c

diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index a3556e6..abd8dd7 100644
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -56,6 +58,46 @@
 
 extern lnet_t  the_lnet;                        /* THE network */
 
+#if !defined(__KERNEL__) || defined(LNET_USE_LIB_FREELIST)
+/* 1 CPT, simplify implementation... */
+# define LNET_CPT_MAX_BITS      0
+
+#else /* KERNEL and no freelist */
+
+# if (BITS_PER_LONG == 32)
+/* 2 CPTs, allowing more CPTs might make us under memory pressure */
+#  define LNET_CPT_MAX_BITS     1
+
+# else /* 64-bit system */
+/*
+ * 256 CPTs for thousands of CPUs, allowing more CPTs might make us
+ * under risk of consuming all lh_cookie.
+ */
+#  define LNET_CPT_MAX_BITS     8
+# endif /* BITS_PER_LONG == 32 */
+#endif
+
+/* max allowed CPT number */
+#define LNET_CPT_MAX            (1 << LNET_CPT_MAX_BITS)
+
+#define LNET_CPT_NUMBER         (the_lnet.ln_cpt_number)
+#define LNET_CPT_BITS           (the_lnet.ln_cpt_bits)
+#define LNET_CPT_MASK           ((1ULL << LNET_CPT_BITS) - 1)
+
+/** exclusive lock */
+#define LNET_LOCK_EX            CFS_PERCPT_LOCK_EX
+
+static inline int lnet_is_route_alive(lnet_route_t *route)
+{
+	if (!route->lr_gateway->lp_alive)
+		return 0; /* gateway is down */
+	if ((route->lr_gateway->lp_ping_feats &
+	     LNET_PING_FEAT_NI_STATUS) == 0)
+		return 1; /* no NI status, assume it's alive */
+	/* has NI status, check # down NIs */
+	return route->lr_downis == 0;
+}
+
 static inline int lnet_is_wire_handle_none (lnet_handle_wire_t *wh)
 {
         return (wh->wh_interface_cookie == LNET_WIRE_HANDLE_COOKIE_NONE &&
@@ -86,19 +128,77 @@ static inline int lnet_md_unlinkable (lnet_libmd_t *md)
                 lnet_md_exhausted(md));
 }
 
-static inline unsigned int
-lnet_match_to_hash(lnet_process_id_t id, __u64 mbits)
+#define lnet_cpt_table()	(the_lnet.ln_cpt_table)
+#define lnet_cpt_current()	cfs_cpt_current(the_lnet.ln_cpt_table, 1)
+
+static inline int
+lnet_cpt_of_cookie(__u64 cookie)
+{
+	unsigned int cpt = (cookie >> LNET_COOKIE_TYPE_BITS) & LNET_CPT_MASK;
+
+	/* LNET_CPT_NUMBER doesn't have to be power2, which means we can
+	 * get illegal cpt from it's invalid cookie */
+	return cpt < LNET_CPT_NUMBER ? cpt : cpt % LNET_CPT_NUMBER;
+}
+
+static inline void
+lnet_res_lock(int cpt)
+{
+	cfs_percpt_lock(the_lnet.ln_res_lock, cpt);
+}
+
+static inline void
+lnet_res_unlock(int cpt)
+{
+	cfs_percpt_unlock(the_lnet.ln_res_lock, cpt);
+}
+
+static inline int
+lnet_res_lock_current(void)
+{
+	int cpt = lnet_cpt_current();
+
+	lnet_res_lock(cpt);
+	return cpt;
+}
+
+static inline void
+lnet_net_lock(int cpt)
+{
+	cfs_percpt_lock(the_lnet.ln_net_lock, cpt);
+}
+
+static inline void
+lnet_net_unlock(int cpt)
 {
-        mbits += id.nid + id.pid;
-        return cfs_hash_long((unsigned long)mbits, LNET_PORTAL_HASH_BITS);
+	cfs_percpt_unlock(the_lnet.ln_net_lock, cpt);
 }
 
+static inline int
+lnet_net_lock_current(void)
+{
+	int cpt = lnet_cpt_current();
+
+	lnet_net_lock(cpt);
+	return cpt;
+}
+
+#define LNET_LOCK()		lnet_net_lock(LNET_LOCK_EX)
+#define LNET_UNLOCK()		lnet_net_unlock(LNET_LOCK_EX)
+
 #ifdef __KERNEL__
-#define LNET_LOCK()        cfs_spin_lock(&the_lnet.ln_lock)
-#define LNET_UNLOCK()      cfs_spin_unlock(&the_lnet.ln_lock)
-#define LNET_MUTEX_LOCK(m)   cfs_mutex_lock(m)
-#define LNET_MUTEX_UNLOCK(m) cfs_mutex_unlock(m)
-#else
+
+#define lnet_ptl_lock(ptl)	spin_lock(&(ptl)->ptl_lock)
+#define lnet_ptl_unlock(ptl)	spin_unlock(&(ptl)->ptl_lock)
+#define lnet_eq_wait_lock()	spin_lock(&the_lnet.ln_eq_wait_lock)
+#define lnet_eq_wait_unlock()	spin_unlock(&the_lnet.ln_eq_wait_lock)
+#define lnet_ni_lock(ni)	spin_lock(&(ni)->ni_lock)
+#define lnet_ni_unlock(ni)	spin_unlock(&(ni)->ni_lock)
+#define LNET_MUTEX_LOCK(m)	mutex_lock(m)
+#define LNET_MUTEX_UNLOCK(m)	mutex_unlock(m)
+
+#else /* !__KERNEL__ */
+
 # ifndef HAVE_LIBPTHREAD
 #define LNET_SINGLE_THREADED_LOCK(l)            \
 do {                                            \
@@ -112,17 +212,40 @@ do {                                            \
         (l) = 0;                                \
 } while (0)
 
-#define LNET_LOCK()        LNET_SINGLE_THREADED_LOCK(the_lnet.ln_lock)
-#define LNET_UNLOCK()      LNET_SINGLE_THREADED_UNLOCK(the_lnet.ln_lock)
-#define LNET_MUTEX_LOCK(m)     LNET_SINGLE_THREADED_LOCK(*(m))
-#define LNET_MUTEX_UNLOCK(m)   LNET_SINGLE_THREADED_UNLOCK(*(m))
-# else
-#define LNET_LOCK()        pthread_mutex_lock(&the_lnet.ln_lock)
-#define LNET_UNLOCK()      pthread_mutex_unlock(&the_lnet.ln_lock)
-#define LNET_MUTEX_LOCK(m)     pthread_mutex_lock(m)
-#define LNET_MUTEX_UNLOCK(m)   pthread_mutex_unlock(m)
-# endif
-#endif
+#define LNET_MUTEX_LOCK(m)	LNET_SINGLE_THREADED_LOCK(*(m))
+#define LNET_MUTEX_UNLOCK(m)	LNET_SINGLE_THREADED_UNLOCK(*(m))
+
+#define lnet_ptl_lock(ptl)			\
+	LNET_SINGLE_THREADED_LOCK((ptl)->ptl_lock)
+#define lnet_ptl_unlock(ptl)			\
+	LNET_SINGLE_THREADED_UNLOCK((ptl)->ptl_lock)
+
+#define lnet_eq_wait_lock()			\
+	LNET_SINGLE_THREADED_LOCK(the_lnet.ln_eq_wait_lock)
+#define lnet_eq_wait_unlock()			\
+	LNET_SINGLE_THREADED_UNLOCK(the_lnet.ln_eq_wait_lock)
+
+#define lnet_ni_lock(ni)			\
+	LNET_SINGLE_THREADED_LOCK((ni)->ni_lock)
+#define lnet_ni_unlock(ni)			\
+	LNET_SINGLE_THREADED_UNLOCK((ni)->ni_lock)
+
+# else /* HAVE_LIBPTHREAD */
+
+#define LNET_MUTEX_LOCK(m)	pthread_mutex_lock(m)
+#define LNET_MUTEX_UNLOCK(m)	pthread_mutex_unlock(m)
+
+#define lnet_ptl_lock(ptl)	pthread_mutex_lock(&(ptl)->ptl_lock)
+#define lnet_ptl_unlock(ptl)	pthread_mutex_unlock(&(ptl)->ptl_lock)
+
+#define lnet_eq_wait_lock()	pthread_mutex_lock(&the_lnet.ln_eq_wait_lock)
+#define lnet_eq_wait_unlock()	pthread_mutex_unlock(&the_lnet.ln_eq_wait_lock)
+
+#define lnet_ni_lock(ni)	pthread_mutex_lock(&(ni)->ni_lock)
+#define lnet_ni_unlock(ni)	pthread_mutex_unlock(&(ni)->ni_lock)
+
+# endif /* HAVE_LIBPTHREAD */
+#endif /* __KERNEL__ */
 
 #define MAX_PORTALS     64
 
@@ -141,24 +264,24 @@ void lnet_freelist_fini(lnet_freelist_t *fl);
 static inline void *
 lnet_freelist_alloc (lnet_freelist_t *fl)
 {
-        /* ALWAYS called with liblock held */
-        lnet_freeobj_t *o;
+	/* ALWAYS called with liblock held */
+	lnet_freeobj_t *o;
 
-        if (cfs_list_empty (&fl->fl_list))
-                return (NULL);
+	if (list_empty(&fl->fl_list))
+		return NULL;
 
-        o = cfs_list_entry (fl->fl_list.next, lnet_freeobj_t, fo_list);
-        cfs_list_del (&o->fo_list);
-        return ((void *)&o->fo_contents);
+	o = list_entry(fl->fl_list.next, lnet_freeobj_t, fo_list);
+	list_del(&o->fo_list);
+	return (void *)&o->fo_contents;
 }
 
 static inline void
 lnet_freelist_free (lnet_freelist_t *fl, void *obj)
 {
-        /* ALWAYS called with liblock held */
-        lnet_freeobj_t *o = cfs_list_entry (obj, lnet_freeobj_t, fo_contents);
+	/* ALWAYS called with liblock held */
+	lnet_freeobj_t *o = list_entry(obj, lnet_freeobj_t, fo_contents);
 
-        cfs_list_add (&o->fo_list, &fl->fl_list);
+	list_add(&o->fo_list, &fl->fl_list);
 }
 
 
@@ -169,9 +292,11 @@ lnet_eq_alloc (void)
 	struct lnet_res_container *rec = &the_lnet.ln_eq_container;
 	lnet_eq_t		  *eq;
 
-	LNET_LOCK();
+	LASSERT(LNET_CPT_NUMBER == 1);
+
+	lnet_res_lock(0);
 	eq = (lnet_eq_t *)lnet_freelist_alloc(&rec->rec_freelist);
-	LNET_UNLOCK();
+	lnet_res_unlock(0);
 
 	return eq;
 }
@@ -182,30 +307,33 @@ lnet_eq_free_locked(lnet_eq_t *eq)
 	/* ALWAYS called with resource lock held */
 	struct lnet_res_container *rec = &the_lnet.ln_eq_container;
 
+	LASSERT(LNET_CPT_NUMBER == 1);
 	lnet_freelist_free(&rec->rec_freelist, eq);
 }
 
 static inline void
 lnet_eq_free(lnet_eq_t *eq)
 {
-	LNET_LOCK();
+	lnet_res_lock(0);
 	lnet_eq_free_locked(eq);
-	LNET_UNLOCK();
+	lnet_res_unlock(0);
 }
 
 static inline lnet_libmd_t *
 lnet_md_alloc (lnet_md_t *umd)
 {
 	/* NEVER called with resource lock held */
-	struct lnet_res_container *rec = &the_lnet.ln_md_container;
+	struct lnet_res_container *rec = the_lnet.ln_md_containers[0];
 	lnet_libmd_t		  *md;
 
-	LNET_LOCK();
+	LASSERT(LNET_CPT_NUMBER == 1);
+
+	lnet_res_lock(0);
 	md = (lnet_libmd_t *)lnet_freelist_alloc(&rec->rec_freelist);
-	LNET_UNLOCK();
+	lnet_res_unlock(0);
 
 	if (md != NULL)
-		CFS_INIT_LIST_HEAD(&md->md_list);
+		INIT_LIST_HEAD(&md->md_list);
 
 	return md;
 }
@@ -214,29 +342,32 @@ static inline void
 lnet_md_free_locked(lnet_libmd_t *md)
 {
 	/* ALWAYS called with resource lock held */
-	struct lnet_res_container *rec = &the_lnet.ln_md_container;
+	struct lnet_res_container *rec = the_lnet.ln_md_containers[0];
 
+	LASSERT(LNET_CPT_NUMBER == 1);
 	lnet_freelist_free(&rec->rec_freelist, md);
 }
 
 static inline void
 lnet_md_free(lnet_libmd_t *md)
 {
-	LNET_LOCK();
+	lnet_res_lock(0);
 	lnet_md_free_locked(md);
-	LNET_UNLOCK();
+	lnet_res_unlock(0);
 }
 
 static inline lnet_me_t *
 lnet_me_alloc(void)
 {
 	/* NEVER called with resource lock held */
-	struct lnet_res_container *rec = &the_lnet.ln_me_container;
+	struct lnet_res_container *rec = the_lnet.ln_me_containers[0];
 	lnet_me_t		  *me;
 
-	LNET_LOCK();
+	LASSERT(LNET_CPT_NUMBER == 1);
+
+	lnet_res_lock(0);
 	me = (lnet_me_t *)lnet_freelist_alloc(&rec->rec_freelist);
-	LNET_UNLOCK();
+	lnet_res_unlock(0);
 
 	return me;
 }
@@ -245,36 +376,36 @@ static inline void
 lnet_me_free_locked(lnet_me_t *me)
 {
 	/* ALWAYS called with resource lock held */
-	struct lnet_res_container *rec = &the_lnet.ln_me_container;
+	struct lnet_res_container *rec = the_lnet.ln_me_containers[0];
 
+	LASSERT(LNET_CPT_NUMBER == 1);
 	lnet_freelist_free(&rec->rec_freelist, me);
 }
 
 static inline void
 lnet_me_free(lnet_me_t *me)
 {
-	LNET_LOCK();
+	lnet_res_lock(0);
 	lnet_me_free_locked(me);
-	LNET_UNLOCK();
+	lnet_res_unlock(0);
 }
 
 static inline lnet_msg_t *
 lnet_msg_alloc (void)
 {
 	/* NEVER called with network lock held */
-	struct lnet_msg_container *msc = &the_lnet.ln_msg_container;
+	struct lnet_msg_container *msc = the_lnet.ln_msg_containers[0];
 	lnet_msg_t		  *msg;
 
-	LNET_LOCK();
+	LASSERT(LNET_CPT_NUMBER == 1);
+
+	lnet_net_lock(0);
 	msg = (lnet_msg_t *)lnet_freelist_alloc(&msc->msc_freelist);
-	LNET_UNLOCK();
+	lnet_net_unlock(0);
 
 	if (msg != NULL) {
 		/* NULL pointers, clear flags etc */
 		memset(msg, 0, sizeof(*msg));
-#ifdef CRAY_XT3
-		msg->msg_ev.uid = LNET_UID_ANY;
-#endif
 	}
 	return msg;
 }
@@ -283,8 +414,9 @@ static inline void
 lnet_msg_free_locked(lnet_msg_t *msg)
 {
 	/* ALWAYS called with network lock held */
-	struct lnet_msg_container *msc = &the_lnet.ln_msg_container;
+	struct lnet_msg_container *msc = the_lnet.ln_msg_containers[0];
 
+	LASSERT(LNET_CPT_NUMBER == 1);
 	LASSERT(!msg->msg_onactivelist);
 	lnet_freelist_free(&msc->msc_freelist, msg);
 }
@@ -292,9 +424,9 @@ lnet_msg_free_locked(lnet_msg_t *msg)
 static inline void
 lnet_msg_free (lnet_msg_t *msg)
 {
-	LNET_LOCK();
+	lnet_net_lock(0);
 	lnet_msg_free_locked(msg);
-	LNET_UNLOCK();
+	lnet_net_unlock(0);
 }
 
 #else /* !LNET_USE_LIB_FREELIST */
@@ -335,14 +467,14 @@ lnet_md_alloc (lnet_md_t *umd)
 
         LIBCFS_ALLOC(md, size);
 
-        if (md != NULL) {
-                /* Set here in case of early free */
-                md->md_options = umd->options;
-                md->md_niov = niov;
-                CFS_INIT_LIST_HEAD(&md->md_list);
-        }
+	if (md != NULL) {
+		/* Set here in case of early free */
+		md->md_options = umd->options;
+		md->md_niov = niov;
+		INIT_LIST_HEAD(&md->md_list);
+	}
 
-        return (md);
+	return md;
 }
 
 static inline void
@@ -385,12 +517,6 @@ lnet_msg_alloc(void)
         LIBCFS_ALLOC(msg, sizeof(*msg));
 
         /* no need to zero, LIBCFS_ALLOC does for us */
-
-#ifdef CRAY_XT3
-        if (msg != NULL) {
-                msg->msg_ev.uid = LNET_UID_ANY;
-        }
-#endif
         return (msg);
 }
 
@@ -417,7 +543,8 @@ static inline void
 lnet_res_lh_invalidate(lnet_libhandle_t *lh)
 {
 	/* ALWAYS called with resource lock held */
-	cfs_list_del(&lh->lh_hash_chain);
+	/* NB: cookie is still useful, don't reset it */
+	list_del(&lh->lh_hash_chain);
 }
 
 static inline void
@@ -455,8 +582,11 @@ lnet_handle2md(lnet_handle_md_t *handle)
 {
 	/* ALWAYS called with resource lock held */
 	lnet_libhandle_t *lh;
+	int		 cpt;
 
-	lh = lnet_res_lh_lookup(&the_lnet.ln_md_container, handle->cookie);
+	cpt = lnet_cpt_of_cookie(handle->cookie);
+	lh = lnet_res_lh_lookup(the_lnet.ln_md_containers[cpt],
+				handle->cookie);
 	if (lh == NULL)
 		return NULL;
 
@@ -468,11 +598,13 @@ lnet_wire_handle2md(lnet_handle_wire_t *wh)
 {
 	/* ALWAYS called with resource lock held */
 	lnet_libhandle_t *lh;
+	int		 cpt;
 
 	if (wh->wh_interface_cookie != the_lnet.ln_interface_cookie)
 		return NULL;
 
-	lh = lnet_res_lh_lookup(&the_lnet.ln_md_container,
+	cpt = lnet_cpt_of_cookie(wh->wh_object_cookie);
+	lh = lnet_res_lh_lookup(the_lnet.ln_md_containers[cpt],
 				wh->wh_object_cookie);
 	if (lh == NULL)
 		return NULL;
@@ -491,70 +623,17 @@ lnet_handle2me(lnet_handle_me_t *handle)
 {
 	/* ALWAYS called with resource lock held */
 	lnet_libhandle_t *lh;
+	int		 cpt;
 
-	lh = lnet_res_lh_lookup(&the_lnet.ln_me_container, handle->cookie);
+	cpt = lnet_cpt_of_cookie(handle->cookie);
+	lh = lnet_res_lh_lookup(the_lnet.ln_me_containers[cpt],
+				handle->cookie);
 	if (lh == NULL)
 		return NULL;
 
 	return lh_entry(lh, lnet_me_t, me_lh);
 }
 
-static inline int
-lnet_portal_is_lazy(lnet_portal_t *ptl)
-{
-        return !!(ptl->ptl_options & LNET_PTL_LAZY);
-}
-
-static inline int
-lnet_portal_is_unique(lnet_portal_t *ptl)
-{
-        return !!(ptl->ptl_options & LNET_PTL_MATCH_UNIQUE); 
-}
-
-static inline int
-lnet_portal_is_wildcard(lnet_portal_t *ptl)
-{
-        return !!(ptl->ptl_options & LNET_PTL_MATCH_WILDCARD);
-}
-
-static inline void
-lnet_portal_setopt(lnet_portal_t *ptl, int opt)
-{
-        ptl->ptl_options |= opt;
-}
-
-static inline void
-lnet_portal_unsetopt(lnet_portal_t *ptl, int opt)
-{
-        ptl->ptl_options &= ~opt;
-}
-
-static inline int
-lnet_match_is_unique(lnet_process_id_t match_id,
-                     __u64 match_bits, __u64 ignore_bits)
-{
-        return ignore_bits == 0 &&
-               match_id.nid != LNET_NID_ANY &&
-               match_id.pid != LNET_PID_ANY;
-}
-
-static inline cfs_list_t *
-lnet_portal_me_head(int index, lnet_process_id_t id, __u64 mbits)
-{
-        lnet_portal_t *ptl = &the_lnet.ln_portals[index];
-
-        if (lnet_portal_is_wildcard(ptl)) {
-                return &ptl->ptl_mlist;
-        } else if (lnet_portal_is_unique(ptl)) {
-                LASSERT (ptl->ptl_mhash != NULL);
-                return &ptl->ptl_mhash[lnet_match_to_hash(id, mbits)];
-        }
-        return NULL;
-}
-
-cfs_list_t *lnet_portal_mhash_alloc(void);
-void lnet_portal_mhash_free(cfs_list_t *mhash);
-
 static inline void
 lnet_peer_addref_locked(lnet_peer_t *lp)
 {
@@ -580,41 +659,53 @@ lnet_isrouter(lnet_peer_t *lp)
 }
 
 static inline void
-lnet_ni_addref_locked(lnet_ni_t *ni)
+lnet_ni_addref_locked(lnet_ni_t *ni, int cpt)
 {
-        LASSERT (ni->ni_refcount > 0);
-        ni->ni_refcount++;
+	LASSERT(cpt >= 0 && cpt < LNET_CPT_NUMBER);
+	LASSERT(*ni->ni_refs[cpt] >= 0);
+
+	(*ni->ni_refs[cpt])++;
 }
 
 static inline void
 lnet_ni_addref(lnet_ni_t *ni)
 {
-        LNET_LOCK();
-        lnet_ni_addref_locked(ni);
-        LNET_UNLOCK();
+	lnet_net_lock(0);
+	lnet_ni_addref_locked(ni, 0);
+	lnet_net_unlock(0);
 }
 
 static inline void
-lnet_ni_decref_locked(lnet_ni_t *ni)
+lnet_ni_decref_locked(lnet_ni_t *ni, int cpt)
 {
-        LASSERT (ni->ni_refcount > 0);
-        ni->ni_refcount--;
-        if (ni->ni_refcount == 0)
-                cfs_list_add_tail(&ni->ni_list, &the_lnet.ln_zombie_nis);
+	LASSERT(cpt >= 0 && cpt < LNET_CPT_NUMBER);
+	LASSERT(*ni->ni_refs[cpt] > 0);
+
+	(*ni->ni_refs[cpt])--;
 }
 
 static inline void
 lnet_ni_decref(lnet_ni_t *ni)
 {
-        LNET_LOCK();
-        lnet_ni_decref_locked(ni);
-        LNET_UNLOCK();
+	lnet_net_lock(0);
+	lnet_ni_decref_locked(ni, 0);
+	lnet_net_unlock(0);
 }
 
+void lnet_ni_free(lnet_ni_t *ni);
+
 static inline int
 lnet_nid2peerhash(lnet_nid_t nid)
 {
-	return cfs_hash_long(nid, LNET_PEER_HASH_BITS);
+	return hash_long(nid, LNET_PEER_HASH_BITS);
+}
+
+static inline struct list_head *
+lnet_net2rnethash(__u32 net)
+{
+	return &the_lnet.ln_remote_nets_hash[(LNET_NETNUM(net) +
+		LNET_NETTYP(net)) &
+		((1U << the_lnet.ln_remote_nets_hbits) - 1)];
 }
 
 extern lnd_t the_lolnd;
@@ -638,54 +729,98 @@ do {                                                                    \
 } while (0)
 #endif
 
-#ifdef CRAY_XT3
-inline static void
-lnet_set_msg_uid(lnet_ni_t *ni, lnet_msg_t *msg, lnet_uid_t uid)
-{
-        LASSERT (msg->msg_ev.uid == LNET_UID_ANY);
-        msg->msg_ev.uid = uid;
-}
-#endif
-
-extern lnet_ni_t *lnet_nid2ni_locked (lnet_nid_t nid);
-extern lnet_ni_t *lnet_net2ni_locked (__u32 net);
-static inline lnet_ni_t *
-lnet_net2ni (__u32 net)
-{
-        lnet_ni_t *ni;
-
-        LNET_LOCK();
-        ni = lnet_net2ni_locked(net);
-        LNET_UNLOCK();
-
-        return ni;
-}
+extern int lnet_cpt_of_nid_locked(lnet_nid_t nid);
+extern int lnet_cpt_of_nid(lnet_nid_t nid);
+extern lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt);
+extern lnet_ni_t *lnet_net2ni_locked(__u32 net, int cpt);
+extern lnet_ni_t *lnet_net2ni(__u32 net);
 
 int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, cfs_time_t when);
 void lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, cfs_time_t when);
-int lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway_nid);
+int lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway_nid,
+		   unsigned int priority);
 int lnet_check_routes(void);
 int lnet_del_route(__u32 net, lnet_nid_t gw_nid);
 void lnet_destroy_routes(void);
 int lnet_get_route(int idx, __u32 *net, __u32 *hops,
-                   lnet_nid_t *gateway, __u32 *alive);
+		   lnet_nid_t *gateway, __u32 *alive, __u32 *priority);
 void lnet_proc_init(void);
 void lnet_proc_fini(void);
-void lnet_init_rtrpools(void);
-int  lnet_alloc_rtrpools(int im_a_router);
-void lnet_free_rtrpools(void);
+int  lnet_rtrpools_alloc(int im_a_router);
+void lnet_rtrpools_free(void);
 lnet_remotenet_t *lnet_find_net_locked (__u32 net);
 
 int lnet_islocalnid(lnet_nid_t nid);
 int lnet_islocalnet(__u32 net);
 
+void lnet_msg_attach_md(lnet_msg_t *msg, lnet_libmd_t *md,
+			unsigned int offset, unsigned int mlen);
+void lnet_msg_detach_md(lnet_msg_t *msg, int status);
 void lnet_build_unlink_event(lnet_libmd_t *md, lnet_event_t *ev);
-void lnet_enq_event_locked(lnet_eq_t *eq, lnet_event_t *ev);
+void lnet_build_msg_event(lnet_msg_t *msg, lnet_event_kind_t ev_type);
+void lnet_msg_commit(lnet_msg_t *msg, int cpt);
+void lnet_msg_decommit(lnet_msg_t *msg, int cpt, int status);
+
+void lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev);
 void lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target,
                     unsigned int offset, unsigned int len);
-int lnet_send(lnet_nid_t nid, lnet_msg_t *msg);
-void lnet_return_credits_locked (lnet_msg_t *msg);
-void lnet_match_blocked_msg(lnet_libmd_t *md);
+int lnet_send(lnet_nid_t nid, lnet_msg_t *msg, lnet_nid_t rtr_nid);
+void lnet_return_tx_credits_locked(lnet_msg_t *msg);
+void lnet_return_rx_credits_locked(lnet_msg_t *msg);
+
+/* portals functions */
+/* portals attributes */
+static inline int
+lnet_ptl_is_lazy(lnet_portal_t *ptl)
+{
+	return !!(ptl->ptl_options & LNET_PTL_LAZY);
+}
+
+static inline int
+lnet_ptl_is_unique(lnet_portal_t *ptl)
+{
+	return !!(ptl->ptl_options & LNET_PTL_MATCH_UNIQUE);
+}
+
+static inline int
+lnet_ptl_is_wildcard(lnet_portal_t *ptl)
+{
+	return !!(ptl->ptl_options & LNET_PTL_MATCH_WILDCARD);
+}
+
+static inline void
+lnet_ptl_setopt(lnet_portal_t *ptl, int opt)
+{
+	ptl->ptl_options |= opt;
+}
+
+static inline void
+lnet_ptl_unsetopt(lnet_portal_t *ptl, int opt)
+{
+	ptl->ptl_options &= ~opt;
+}
+
+/* match-table functions */
+struct list_head *lnet_mt_match_head(struct lnet_match_table *mtable,
+			       lnet_process_id_t id, __u64 mbits);
+struct lnet_match_table *lnet_mt_of_attach(unsigned int index,
+					   lnet_process_id_t id, __u64 mbits,
+					   __u64 ignore_bits,
+					   lnet_ins_pos_t pos);
+int lnet_mt_match_md(struct lnet_match_table *mtable,
+		     struct lnet_match_info *info, struct lnet_msg *msg);
+
+/* portals match/attach functions */
+void lnet_ptl_attach_md(lnet_me_t *me, lnet_libmd_t *md,
+			struct list_head *matches, struct list_head *drops);
+void lnet_ptl_detach_md(lnet_me_t *me, lnet_libmd_t *md);
+int lnet_ptl_match_md(struct lnet_match_info *info, struct lnet_msg *msg);
+
+/* initialized and finalize portals */
+int lnet_portals_create(void);
+void lnet_portals_destroy(void);
+
+/* message functions */
 int lnet_parse (lnet_ni_t *ni, lnet_hdr_t *hdr,
                 lnet_nid_t fromnid, void *private, int rdma_req);
 void lnet_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
@@ -693,14 +828,21 @@ void lnet_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
 lnet_msg_t *lnet_create_reply_msg (lnet_ni_t *ni, lnet_msg_t *get_msg);
 void lnet_set_reply_msg_len(lnet_ni_t *ni, lnet_msg_t *msg, unsigned int len);
 void lnet_finalize(lnet_ni_t *ni, lnet_msg_t *msg, int rc);
+void lnet_drop_delayed_msg_list(struct list_head *head, char *reason);
+void lnet_recv_delayed_msg_list(struct list_head *head);
 
-int lnet_msg_container_setup(struct lnet_msg_container *container);
+int lnet_msg_container_setup(struct lnet_msg_container *container, int cpt);
 void lnet_msg_container_cleanup(struct lnet_msg_container *container);
+void lnet_msg_containers_destroy(void);
+int lnet_msg_containers_create(void);
 
 char *lnet_msgtyp2str (int type);
 void lnet_print_hdr (lnet_hdr_t * hdr);
 int lnet_fail_nid(lnet_nid_t nid, unsigned int threshold);
 
+void lnet_counters_get(lnet_counters_t *counters);
+void lnet_counters_reset(void);
+
 unsigned int lnet_iov_nob (unsigned int niov, struct iovec *iov);
 int lnet_extract_iov (int dst_niov, struct iovec *dst,
                       int src_niov, struct iovec *src,
@@ -804,22 +946,22 @@ int lnet_peer_buffer_credits(lnet_ni_t *ni);
 int lnet_router_checker_start(void);
 void lnet_router_checker_stop(void);
 void lnet_swap_pinginfo(lnet_ping_info_t *info);
-int lnet_router_down_ni(lnet_peer_t *rtr, __u32 net);
 
 int lnet_ping_target_init(void);
 void lnet_ping_target_fini(void);
 int lnet_ping(lnet_process_id_t id, int timeout_ms,
               lnet_process_id_t *ids, int n_ids);
 
-int lnet_parse_ip2nets (char **networksp, char *ip2nets);
-int lnet_parse_routes (char *route_str, int *im_a_router);
-int lnet_parse_networks (cfs_list_t *nilist, char *networks);
+int lnet_parse_ip2nets(char **networksp, char *ip2nets);
+int lnet_parse_routes(char *route_str, int *im_a_router);
+int lnet_parse_networks(struct list_head *nilist, char *networks);
 
-int lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid);
-lnet_peer_t *lnet_find_peer_locked (lnet_nid_t nid);
-void lnet_peer_table_cleanup(void);
-void lnet_peer_table_destroy(void);
-int lnet_peer_table_create(void);
+int lnet_nid2peer_locked(lnet_peer_t **lpp, lnet_nid_t nid, int cpt);
+lnet_peer_t *lnet_find_peer_locked(struct lnet_peer_table *ptable,
+				   lnet_nid_t nid);
+void lnet_peer_tables_cleanup(lnet_ni_t *ni);
+void lnet_peer_tables_destroy(void);
+int lnet_peer_tables_create(void);
 void lnet_debug_peer(lnet_nid_t nid);
 
 #ifndef __KERNEL__