# else /* 64-bit system */
/*
* 256 CPTs for thousands of CPUs, allowing more CPTs might make us
- * under risk of consuming all lh_cooke.
+ * under risk of consuming all lh_cookie.
*/
# define LNET_CPT_MAX_BITS 8
# endif /* BITS_PER_LONG == 32 */
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)
+{
+ 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_ptl_lock(ptl) cfs_spin_lock(&(ptl)->ptl_lock)
#define lnet_ptl_unlock(ptl) cfs_spin_unlock(&(ptl)->ptl_lock)
#define lnet_eq_wait_lock() cfs_spin_lock(&the_lnet.ln_eq_wait_lock)
#define lnet_eq_wait_unlock() cfs_spin_unlock(&the_lnet.ln_eq_wait_lock)
-#define LNET_LOCK() cfs_spin_lock(&the_lnet.ln_lock)
-#define LNET_UNLOCK() cfs_spin_unlock(&the_lnet.ln_lock)
+#define lnet_ni_lock(ni) cfs_spin_lock(&(ni)->ni_lock)
+#define lnet_ni_unlock(ni) cfs_spin_unlock(&(ni)->ni_lock)
#define LNET_MUTEX_LOCK(m) cfs_mutex_lock(m)
#define LNET_MUTEX_UNLOCK(m) cfs_mutex_unlock(m)
(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))
#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_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)
#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__ */
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 */
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);
}
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 */
}
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)
{
}
#endif
+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);
-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 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);
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_build_msg_event(lnet_msg_t *msg, lnet_event_kind_t ev_type);
-void lnet_msg_commit(lnet_msg_t *msg, int sending);
-void lnet_msg_decommit(lnet_msg_t *msg, int status);
+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);
+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);
void lnet_drop_delayed_msg_list(cfs_list_t *head, char *reason);
void lnet_recv_delayed_msg_list(cfs_list_t *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_parse_routes (char *route_str, int *im_a_router);
int lnet_parse_networks (cfs_list_t *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(void);
+void lnet_peer_tables_destroy(void);
+int lnet_peer_tables_create(void);
void lnet_debug_peer(lnet_nid_t nid);
#ifndef __KERNEL__