X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lnet%2Finclude%2Flnet%2Flib-lnet.h;h=dc5cf343f9b18da06ac44d0d2870964062d949ee;hb=726b556c6c42ac79399a4e1dab4f667547f96051;hp=cc991c233cbcff237b174b572e9f9cee4dc4f5bd;hpb=a07e9d350b3e500c7be877f6dcf54380b86a9cbe;p=fs%2Flustre-release.git diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index cc991c2..dc5cf34 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/ @@ -39,20 +41,13 @@ #ifndef __LNET_LIB_LNET_H__ #define __LNET_LIB_LNET_H__ -#if defined(__linux__) #include -#elif defined(__APPLE__) -#include -#elif defined(__WINNT__) -#include -#else -#error Unsupported Operating System -#endif #include #include #include #include +#include extern lnet_t the_lnet; /* THE network */ @@ -69,7 +64,7 @@ extern lnet_t the_lnet; /* THE network */ # 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 */ @@ -85,6 +80,17 @@ extern lnet_t the_lnet; /* THE network */ /** 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 && @@ -175,14 +181,14 @@ lnet_net_lock_current(void) #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_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) +#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__ */ @@ -251,24 +257,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); } @@ -320,7 +326,7 @@ lnet_md_alloc (lnet_md_t *umd) lnet_res_unlock(0); if (md != NULL) - CFS_INIT_LIST_HEAD(&md->md_list); + INIT_LIST_HEAD(&md->md_list); return md; } @@ -393,9 +399,6 @@ lnet_msg_alloc (void) 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; } @@ -457,14 +460,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 @@ -507,12 +510,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); } @@ -540,7 +537,7 @@ 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); + list_del(&lh->lh_hash_chain); } static inline void @@ -693,7 +690,15 @@ 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; @@ -717,43 +722,44 @@ 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 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); -static inline lnet_ni_t * -lnet_net2ni(__u32 net) -{ - lnet_ni_t *ni; - - lnet_net_lock(0); - ni = lnet_net2ni_locked(net, 0); - lnet_net_unlock(0); - - return ni; -} +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); +int lnet_get_net_config(int idx, + __u32 *cpt_count, + __u64 *nid, + int *peer_timeout, + int *peer_tx_credits, + int *peer_rtr_cr, + int *max_tx_credits, + struct lnet_ioctl_net_config *net_config); +int lnet_get_rtr_pool_cfg(int idx, struct lnet_ioctl_pool_cfg *pool_cfg); + void lnet_proc_init(void); void lnet_proc_fini(void); int lnet_rtrpools_alloc(int im_a_router); -void lnet_rtrpools_free(void); +void lnet_destroy_rtrbuf(lnet_rtrbuf_t *rb, int npages); +int lnet_rtrpools_adjust(int tiny, int small, int large); +int lnet_rtrpools_enable(void); +void lnet_rtrpools_disable(void); +void lnet_rtrpools_free(int keep_pools); lnet_remotenet_t *lnet_find_net_locked (__u32 net); +int lnet_dyn_add_ni(lnet_pid_t requested_pid, char *nets, + __s32 peer_timeout, __s32 peer_cr, __s32 peer_buf_cr, + __s32 credits); +int lnet_dyn_del_ni(__u32 net); int lnet_islocalnid(lnet_nid_t nid); int lnet_islocalnet(__u32 net); @@ -772,6 +778,8 @@ void lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target, 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_schedule_blocked_locked(lnet_rtrbufpool_t *rbp); +void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt); /* portals functions */ /* portals attributes */ @@ -806,20 +814,18 @@ lnet_ptl_unsetopt(lnet_portal_t *ptl, int opt) } /* match-table functions */ -cfs_list_t *lnet_mt_match_head(struct lnet_match_table *mtable, +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); -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); + 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); @@ -835,8 +841,8 @@ 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); +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 cpt); void lnet_msg_container_cleanup(struct lnet_msg_container *container); @@ -954,22 +960,27 @@ 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); 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_net_unique(__u32 net, struct list_head *nilist); 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_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); +int lnet_get_peer_info(__u32 peer_index, __u64 *nid, + char alivness[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_credtis, + __u32 *peer_tx_qnob); #ifndef __KERNEL__ static inline int