X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Finclude%2Flnet%2Flib-lnet.h;h=6f16f49deda19a64fe708c8efc832a775c90ba2e;hp=ec80e0c4f26ad17da08e7872c6686216d8427025;hb=279bbc81e03dc74d273ec12b4d9e703ca94404c4;hpb=bb0a44845815bc7559e929f9754590e883bfbd95 diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index ec80e0c..6f16f49 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +24,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -58,13 +56,42 @@ 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_cooke. + */ +# 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_wire_handle_none (lnet_handle_wire_t *wh) { - return (wh->wh_interface_cookie == LNET_WIRE_HANDLE_NONE.wh_interface_cookie && - wh->wh_object_cookie == LNET_WIRE_HANDLE_NONE.wh_object_cookie); + return (wh->wh_interface_cookie == LNET_WIRE_HANDLE_COOKIE_NONE && + wh->wh_object_cookie == LNET_WIRE_HANDLE_COOKIE_NONE); } -static inline int lnet_md_exhausted (lnet_libmd_t *md) +static inline int lnet_md_exhausted (lnet_libmd_t *md) { return (md->md_threshold == 0 || ((md->md_options & LNET_MD_MAX_SIZE) != 0 && @@ -88,12 +115,53 @@ static inline int lnet_md_unlinkable (lnet_libmd_t *md) lnet_md_exhausted(md)); } +#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; +} + #ifdef __KERNEL__ -#define LNET_LOCK() spin_lock(&the_lnet.ln_lock) -#define LNET_UNLOCK() spin_unlock(&the_lnet.ln_lock) -#define LNET_MUTEX_DOWN(m) mutex_down(m) -#define LNET_MUTEX_UP(m) mutex_up(m) -#else + +#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_MUTEX_LOCK(m) cfs_mutex_lock(m) +#define LNET_MUTEX_UNLOCK(m) cfs_mutex_unlock(m) + +#else /* !__KERNEL__ */ + # ifndef HAVE_LIBPTHREAD #define LNET_SINGLE_THREADED_LOCK(l) \ do { \ @@ -107,26 +175,50 @@ 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_DOWN(m) LNET_SINGLE_THREADED_LOCK(*(m)) -#define LNET_MUTEX_UP(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_DOWN(m) pthread_mutex_lock(m) -#define LNET_MUTEX_UP(m) pthread_mutex_unlock(m) -# endif -#endif +#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_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) + +# 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_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) + +# endif /* HAVE_LIBPTHREAD */ +#endif /* __KERNEL__ */ #define MAX_PORTALS 64 +/* these are only used by code with LNET_USE_LIB_FREELIST, but we still + * exported them to !LNET_USE_LIB_FREELIST for easy implemetation */ +#define LNET_FL_MAX_MES 2048 +#define LNET_FL_MAX_MDS 2048 +#define LNET_FL_MAX_EQS 512 +#define LNET_FL_MAX_MSGS 2048 /* Outstanding messages */ + #ifdef LNET_USE_LIB_FREELIST -#define MAX_MES 2048 -#define MAX_MDS 2048 -#define MAX_MSGS 2048 /* Outstanding messages */ -#define MAX_EQS 512 +int lnet_freelist_init(lnet_freelist_t *fl, int n, int size); +void lnet_freelist_fini(lnet_freelist_t *fl); static inline void * lnet_freelist_alloc (lnet_freelist_t *fl) @@ -134,11 +226,11 @@ lnet_freelist_alloc (lnet_freelist_t *fl) /* ALWAYS called with liblock held */ lnet_freeobj_t *o; - if (list_empty (&fl->fl_list)) + if (cfs_list_empty (&fl->fl_list)) return (NULL); - - o = list_entry (fl->fl_list.next, lnet_freeobj_t, fo_list); - list_del (&o->fo_list); + + o = cfs_list_entry (fl->fl_list.next, lnet_freeobj_t, fo_list); + cfs_list_del (&o->fo_list); return ((void *)&o->fo_contents); } @@ -146,104 +238,157 @@ static inline void lnet_freelist_free (lnet_freelist_t *fl, void *obj) { /* ALWAYS called with liblock held */ - lnet_freeobj_t *o = list_entry (obj, lnet_freeobj_t, fo_contents); - - list_add (&o->fo_list, &fl->fl_list); + lnet_freeobj_t *o = cfs_list_entry (obj, lnet_freeobj_t, fo_contents); + + cfs_list_add (&o->fo_list, &fl->fl_list); } static inline lnet_eq_t * lnet_eq_alloc (void) { - /* NEVER called with liblock held */ - lnet_eq_t *eq; - - LNET_LOCK(); - eq = (lnet_eq_t *)lnet_freelist_alloc(&the_lnet.ln_free_eqs); - LNET_UNLOCK(); + /* NEVER called with resource lock held */ + struct lnet_res_container *rec = &the_lnet.ln_eq_container; + lnet_eq_t *eq; - return (eq); + LASSERT(LNET_CPT_NUMBER == 1); + + lnet_res_lock(0); + eq = (lnet_eq_t *)lnet_freelist_alloc(&rec->rec_freelist); + lnet_res_unlock(0); + + return eq; } static inline void -lnet_eq_free (lnet_eq_t *eq) +lnet_eq_free_locked(lnet_eq_t *eq) { - /* ALWAYS called with liblock held */ - lnet_freelist_free(&the_lnet.ln_free_eqs, 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_res_lock(0); + lnet_eq_free_locked(eq); + lnet_res_unlock(0); } static inline lnet_libmd_t * lnet_md_alloc (lnet_md_t *umd) { - /* NEVER called with liblock held */ - lnet_libmd_t *md; - - LNET_LOCK(); - md = (lnet_libmd_t *)lnet_freelist_alloc(&the_lnet.ln_free_mds); - LNET_UNLOCK(); + /* NEVER called with resource lock held */ + struct lnet_res_container *rec = the_lnet.ln_md_containers[0]; + lnet_libmd_t *md; - if (md != NULL) - CFS_INIT_LIST_HEAD(&md->md_list); + LASSERT(LNET_CPT_NUMBER == 1); - return (md); + lnet_res_lock(0); + md = (lnet_libmd_t *)lnet_freelist_alloc(&rec->rec_freelist); + lnet_res_unlock(0); + + if (md != NULL) + CFS_INIT_LIST_HEAD(&md->md_list); + + return md; } static inline void -lnet_md_free (lnet_libmd_t *md) +lnet_md_free_locked(lnet_libmd_t *md) { - /* ALWAYS called with liblock held */ - lnet_freelist_free (&the_lnet.ln_free_mds, md); + /* ALWAYS called with resource lock held */ + 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_res_lock(0); + lnet_md_free_locked(md); + lnet_res_unlock(0); } static inline lnet_me_t * -lnet_me_alloc (void) +lnet_me_alloc(void) { - /* NEVER called with liblock held */ - lnet_me_t *me; - - LNET_LOCK(); - me = (lnet_me_t *)lnet_freelist_alloc(&the_lnet.ln_free_mes); - LNET_UNLOCK(); - - return (me); + /* NEVER called with resource lock held */ + struct lnet_res_container *rec = the_lnet.ln_me_containers[0]; + lnet_me_t *me; + + LASSERT(LNET_CPT_NUMBER == 1); + + lnet_res_lock(0); + me = (lnet_me_t *)lnet_freelist_alloc(&rec->rec_freelist); + lnet_res_unlock(0); + + return me; } static inline void -lnet_me_free (lnet_me_t *me) +lnet_me_free_locked(lnet_me_t *me) { - /* ALWAYS called with liblock held */ - lnet_freelist_free (&the_lnet.ln_free_mes, me); + /* ALWAYS called with resource lock held */ + 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_res_lock(0); + lnet_me_free_locked(me); + lnet_res_unlock(0); } static inline lnet_msg_t * lnet_msg_alloc (void) { - /* NEVER called with liblock held */ - lnet_msg_t *msg; - - LNET_LOCK(); - msg = (lnet_msg_t *)lnet_freelist_alloc(&the_lnet.ln_free_msgs); - LNET_UNLOCK(); + /* NEVER called with network lock held */ + struct lnet_msg_container *msc = &the_lnet.ln_msg_container; + lnet_msg_t *msg; - if (msg != NULL) { - /* NULL pointers, clear flags etc */ - memset (msg, 0, sizeof (*msg)); + LNET_LOCK(); + msg = (lnet_msg_t *)lnet_freelist_alloc(&msc->msc_freelist); + LNET_UNLOCK(); + + if (msg != NULL) { + /* NULL pointers, clear flags etc */ + memset(msg, 0, sizeof(*msg)); #ifdef CRAY_XT3 - msg->msg_ev.uid = LNET_UID_ANY; + msg->msg_ev.uid = LNET_UID_ANY; #endif - } - return(msg); + } + return msg; +} + +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; + + LASSERT(!msg->msg_onactivelist); + lnet_freelist_free(&msc->msc_freelist, msg); } static inline void lnet_msg_free (lnet_msg_t *msg) { - /* ALWAYS called with liblock held */ - LASSERT (!msg->msg_onactivelist); - lnet_freelist_free(&the_lnet.ln_free_msgs, msg); + LNET_LOCK(); + lnet_msg_free_locked(msg); + LNET_UNLOCK(); } -#else +#else /* !LNET_USE_LIB_FREELIST */ static inline lnet_eq_t * lnet_eq_alloc (void) @@ -256,10 +401,10 @@ lnet_eq_alloc (void) } static inline void -lnet_eq_free (lnet_eq_t *eq) +lnet_eq_free(lnet_eq_t *eq) { - /* ALWAYS called with liblock held */ - LIBCFS_FREE(eq, sizeof(*eq)); + /* ALWAYS called with resource lock held */ + LIBCFS_FREE(eq, sizeof(*eq)); } static inline lnet_libmd_t * @@ -267,7 +412,7 @@ lnet_md_alloc (lnet_md_t *umd) { /* NEVER called with liblock held */ lnet_libmd_t *md; - int size; + unsigned int size; unsigned int niov; if ((umd->options & LNET_MD_KIOV) != 0) { @@ -287,22 +432,22 @@ lnet_md_alloc (lnet_md_t *umd) md->md_niov = niov; CFS_INIT_LIST_HEAD(&md->md_list); } - + return (md); } -static inline void -lnet_md_free (lnet_libmd_t *md) +static inline void +lnet_md_free(lnet_libmd_t *md) { - /* ALWAYS called with liblock held */ - int size; + /* ALWAYS called with resource lock held */ + unsigned int size; - if ((md->md_options & LNET_MD_KIOV) != 0) - size = offsetof(lnet_libmd_t, md_iov.kiov[md->md_niov]); - else - size = offsetof(lnet_libmd_t, md_iov.iov[md->md_niov]); + if ((md->md_options & LNET_MD_KIOV) != 0) + size = offsetof(lnet_libmd_t, md_iov.kiov[md->md_niov]); + else + size = offsetof(lnet_libmd_t, md_iov.iov[md->md_niov]); - LIBCFS_FREE(md, size); + LIBCFS_FREE(md, size); } static inline lnet_me_t * @@ -315,11 +460,11 @@ lnet_me_alloc (void) return (me); } -static inline void +static inline void lnet_me_free(lnet_me_t *me) { - /* ALWAYS called with liblock held */ - LIBCFS_FREE(me, sizeof(*me)); + /* ALWAYS called with resource lock held */ + LIBCFS_FREE(me, sizeof(*me)); } static inline lnet_msg_t * @@ -330,34 +475,48 @@ lnet_msg_alloc(void) LIBCFS_ALLOC(msg, sizeof(*msg)); - if (msg != NULL) { - /* NULL pointers, clear flags etc */ - memset (msg, 0, 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 } +#endif return (msg); } -static inline void +static inline void lnet_msg_free(lnet_msg_t *msg) { - /* ALWAYS called with liblock held */ - LASSERT (!msg->msg_onactivelist); - LIBCFS_FREE(msg, sizeof(*msg)); + /* ALWAYS called with network lock held */ + LASSERT(!msg->msg_onactivelist); + LIBCFS_FREE(msg, sizeof(*msg)); } -#endif -extern lnet_libhandle_t *lnet_lookup_cookie (__u64 cookie, int type); -extern void lnet_initialise_handle (lnet_libhandle_t *lh, int type); -extern void lnet_invalidate_handle (lnet_libhandle_t *lh); +#define lnet_eq_free_locked(eq) lnet_eq_free(eq) +#define lnet_md_free_locked(md) lnet_md_free(md) +#define lnet_me_free_locked(me) lnet_me_free(me) +#define lnet_msg_free_locked(msg) lnet_msg_free(msg) + +#endif /* LNET_USE_LIB_FREELIST */ + +lnet_libhandle_t *lnet_res_lh_lookup(struct lnet_res_container *rec, + __u64 cookie); +void lnet_res_lh_initialize(struct lnet_res_container *rec, + lnet_libhandle_t *lh); +static inline void +lnet_res_lh_invalidate(lnet_libhandle_t *lh) +{ + /* ALWAYS called with resource lock held */ + /* NB: cookie is still useful, don't reset it */ + cfs_list_del(&lh->lh_hash_chain); +} static inline void lnet_eq2handle (lnet_handle_eq_t *handle, lnet_eq_t *eq) { if (eq == NULL) { - *handle = LNET_EQ_NONE; + LNetInvalidateHandle(handle); return; } @@ -365,15 +524,16 @@ lnet_eq2handle (lnet_handle_eq_t *handle, lnet_eq_t *eq) } static inline lnet_eq_t * -lnet_handle2eq (lnet_handle_eq_t *handle) +lnet_handle2eq(lnet_handle_eq_t *handle) { - /* ALWAYS called with liblock held */ - lnet_libhandle_t *lh = lnet_lookup_cookie(handle->cookie, - LNET_COOKIE_TYPE_EQ); - if (lh == NULL) - return (NULL); + /* ALWAYS called with resource lock held */ + lnet_libhandle_t *lh; - return (lh_entry (lh, lnet_eq_t, eq_lh)); + lh = lnet_res_lh_lookup(&the_lnet.ln_eq_container, handle->cookie); + if (lh == NULL) + return NULL; + + return lh_entry(lh, lnet_eq_t, eq_lh); } static inline void @@ -383,32 +543,38 @@ lnet_md2handle (lnet_handle_md_t *handle, lnet_libmd_t *md) } static inline lnet_libmd_t * -lnet_handle2md (lnet_handle_md_t *handle) +lnet_handle2md(lnet_handle_md_t *handle) { - /* ALWAYS called with liblock held */ - lnet_libhandle_t *lh = lnet_lookup_cookie(handle->cookie, - LNET_COOKIE_TYPE_MD); - if (lh == NULL) - return (NULL); + /* ALWAYS called with resource lock held */ + lnet_libhandle_t *lh; + int cpt; - return (lh_entry (lh, lnet_libmd_t, md_lh)); + 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; + + return lh_entry(lh, lnet_libmd_t, md_lh); } static inline lnet_libmd_t * -lnet_wire_handle2md (lnet_handle_wire_t *wh) +lnet_wire_handle2md(lnet_handle_wire_t *wh) { - /* ALWAYS called with liblock held */ - lnet_libhandle_t *lh; - - if (wh->wh_interface_cookie != the_lnet.ln_interface_cookie) - return (NULL); - - lh = lnet_lookup_cookie(wh->wh_object_cookie, - LNET_COOKIE_TYPE_MD); - if (lh == NULL) - return (NULL); + /* ALWAYS called with resource lock held */ + lnet_libhandle_t *lh; + int cpt; + + if (wh->wh_interface_cookie != the_lnet.ln_interface_cookie) + return NULL; - return (lh_entry (lh, lnet_libmd_t, md_lh)); + 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; + + return lh_entry(lh, lnet_libmd_t, md_lh); } static inline void @@ -418,15 +584,19 @@ lnet_me2handle (lnet_handle_me_t *handle, lnet_me_t *me) } static inline lnet_me_t * -lnet_handle2me (lnet_handle_me_t *handle) +lnet_handle2me(lnet_handle_me_t *handle) { - /* ALWAYS called with liblock held */ - lnet_libhandle_t *lh = lnet_lookup_cookie(handle->cookie, - LNET_COOKIE_TYPE_ME); - if (lh == NULL) - return (NULL); + /* ALWAYS called with resource lock held */ + lnet_libhandle_t *lh; + int cpt; - return (lh_entry (lh, lnet_me_t, me_lh)); + 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 void @@ -454,14 +624,14 @@ 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) { LASSERT (ni->ni_refcount > 0); ni->ni_refcount++; } static inline void -lnet_ni_addref(lnet_ni_t *ni) +lnet_ni_addref(lnet_ni_t *ni) { LNET_LOCK(); lnet_ni_addref_locked(ni); @@ -474,7 +644,7 @@ lnet_ni_decref_locked(lnet_ni_t *ni) LASSERT (ni->ni_refcount > 0); ni->ni_refcount--; if (ni->ni_refcount == 0) - list_add_tail(&ni->ni_list, &the_lnet.ln_zombie_nis); + cfs_list_add_tail(&ni->ni_list, &the_lnet.ln_zombie_nis); } static inline void @@ -485,12 +655,10 @@ lnet_ni_decref(lnet_ni_t *ni) LNET_UNLOCK(); } -static inline struct list_head * -lnet_nid2peerhash (lnet_nid_t nid) +static inline int +lnet_nid2peerhash(lnet_nid_t nid) { - unsigned int idx = LNET_NIDADDR(nid) % LNET_PEER_HASHSIZE; - - return &the_lnet.ln_peer_hash[idx]; + return cfs_hash_long(nid, LNET_PEER_HASH_BITS); } extern lnd_t the_lolnd; @@ -523,10 +691,11 @@ lnet_set_msg_uid(lnet_ni_t *ni, lnet_msg_t *msg, lnet_uid_t uid) } #endif +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_net2ni (__u32 net) { lnet_ni_t *ni; @@ -537,12 +706,13 @@ lnet_net2ni (__u32 net) return ni; } -int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, time_t when); +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_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, +int lnet_get_route(int idx, __u32 *net, __u32 *hops, lnet_nid_t *gateway, __u32 *alive); void lnet_proc_init(void); void lnet_proc_fini(void); @@ -554,13 +724,76 @@ 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 sending); +void lnet_msg_decommit(lnet_msg_t *msg, 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); +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 */ +cfs_list_t *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); +struct lnet_match_table *lnet_mt_of_match(unsigned int index, + lnet_process_id_t id, __u64 mbits); +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, + cfs_list_t *matches, cfs_list_t *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, @@ -568,6 +801,11 @@ 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(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); +void lnet_msg_container_cleanup(struct lnet_msg_container *container); char *lnet_msgtyp2str (int type); void lnet_print_hdr (lnet_hdr_t * hdr); @@ -579,25 +817,25 @@ int lnet_extract_iov (int dst_niov, struct iovec *dst, unsigned int offset, unsigned int len); unsigned int lnet_kiov_nob (unsigned int niov, lnet_kiov_t *iov); -int lnet_extract_kiov (int dst_niov, lnet_kiov_t *dst, +int lnet_extract_kiov (int dst_niov, lnet_kiov_t *dst, int src_niov, lnet_kiov_t *src, unsigned int offset, unsigned int len); -void lnet_copy_iov2iov (unsigned int ndiov, struct iovec *diov, - unsigned int doffset, - unsigned int nsiov, struct iovec *siov, +void lnet_copy_iov2iov (unsigned int ndiov, struct iovec *diov, + unsigned int doffset, + unsigned int nsiov, struct iovec *siov, unsigned int soffset, unsigned int nob); -void lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, +void lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, unsigned int iovoffset, - unsigned int nkiov, lnet_kiov_t *kiov, + unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset, unsigned int nob); -void lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, +void lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset, - unsigned int niov, struct iovec *iov, + unsigned int niov, struct iovec *iov, unsigned int iovoffset, unsigned int nob); -void lnet_copy_kiov2kiov (unsigned int ndkiov, lnet_kiov_t *dkiov, - unsigned int doffset, - unsigned int nskiov, lnet_kiov_t *skiov, +void lnet_copy_kiov2kiov (unsigned int ndkiov, lnet_kiov_t *dkiov, + unsigned int doffset, + unsigned int nskiov, lnet_kiov_t *skiov, unsigned int soffset, unsigned int nob); static inline void @@ -657,6 +895,8 @@ void lnet_connect_console_error(int rc, lnet_nid_t peer_nid, int lnet_count_acceptor_nis(void); int lnet_acceptor_timeout(void); int lnet_acceptor_port(void); +#else +void lnet_router_checker(void); #endif #ifdef HAVE_LIBPTHREAD @@ -667,9 +907,13 @@ int lnet_acceptor_port(void); int lnet_acceptor_start(void); void lnet_acceptor_stop(void); +void lnet_get_tunables(void); int lnet_peers_start_down(void); +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_ping_target_init(void); void lnet_ping_target_fini(void); @@ -678,13 +922,32 @@ int lnet_ping(lnet_process_id_t id, int timeout_ms, 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_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_clear_peer_table(void); -void lnet_destroy_peer_table(void); -int lnet_create_peer_table(void); +void lnet_peer_table_cleanup(void); +void lnet_peer_table_destroy(void); +int lnet_peer_table_create(void); void lnet_debug_peer(lnet_nid_t nid); +#ifndef __KERNEL__ +static inline int +lnet_parse_int_tunable(int *value, char *name) +{ + char *env = getenv(name); + char *end; + + if (env == NULL) + return 0; + + *value = strtoull(env, &end, 0); + if (*end == 0) + return 0; + + CERROR("Can't parse tunable %s=%s\n", name, env); + return -EINVAL; +} +#endif + #endif