X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Finclude%2Flnet%2Flib-lnet.h;h=602bf46a2bda22ea55890fb00bbe2e639a5a8941;hp=3e7749ebc0dc50a8ab177b317093fe5b15c0c3c3;hb=6612e57a233fa22af00173366e1121b68bb5524e;hpb=fca1a999899a5a34ff91ad9e729fe517c6a10cab diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index 3e7749e..602bf46 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -194,6 +194,8 @@ lnet_net_lock_current(void) extern struct kmem_cache *lnet_mes_cachep; /* MEs kmem_cache */ extern struct kmem_cache *lnet_small_mds_cachep; /* <= LNET_SMALL_MD_SIZE bytes * MDs kmem_cache */ +extern struct kmem_cache *lnet_rspt_cachep; +extern struct kmem_cache *lnet_msg_cachep; static inline struct lnet_eq * lnet_eq_alloc (void) @@ -256,6 +258,8 @@ lnet_md_free(struct lnet_libmd *md) { unsigned int size; + LASSERTF(md->md_rspt_ptr == NULL, "md %p rsp %p\n", md, md->md_rspt_ptr); + if ((md->md_options & LNET_MD_KIOV) != 0) size = offsetof(struct lnet_libmd, md_iov.kiov[md->md_niov]); else @@ -269,28 +273,6 @@ lnet_md_free(struct lnet_libmd *md) } } -static inline struct lnet_me * -lnet_me_alloc (void) -{ - struct lnet_me *me; - - me = kmem_cache_alloc(lnet_mes_cachep, GFP_NOFS | __GFP_ZERO); - - if (me) - CDEBUG(D_MALLOC, "slab-alloced 'me' at %p.\n", me); - else - CDEBUG(D_MALLOC, "failed to allocate 'me'\n"); - - return me; -} - -static inline void -lnet_me_free(struct lnet_me *me) -{ - CDEBUG(D_MALLOC, "slab-freed 'me' at %p.\n", me); - kmem_cache_free(lnet_mes_cachep, me); -} - struct lnet_libhandle *lnet_res_lh_lookup(struct lnet_res_container *rec, __u64 cookie); void lnet_res_lh_initialize(struct lnet_res_container *rec, @@ -304,30 +286,6 @@ lnet_res_lh_invalidate(struct lnet_libhandle *lh) } static inline void -lnet_eq2handle(struct lnet_handle_eq *handle, struct lnet_eq *eq) -{ - if (eq == NULL) { - LNetInvalidateEQHandle(handle); - return; - } - - handle->cookie = eq->eq_lh.lh_cookie; -} - -static inline struct lnet_eq * -lnet_handle2eq(struct lnet_handle_eq *handle) -{ - /* ALWAYS called with resource lock held */ - struct lnet_libhandle *lh; - - lh = lnet_res_lh_lookup(&the_lnet.ln_eq_container, handle->cookie); - if (lh == NULL) - return NULL; - - return lh_entry(lh, struct lnet_eq, eq_lh); -} - -static inline void lnet_md2handle(struct lnet_handle_md *handle, struct lnet_libmd *md) { handle->cookie = md->md_lh.lh_cookie; @@ -369,28 +327,6 @@ lnet_wire_handle2md(struct lnet_handle_wire *wh) } static inline void -lnet_me2handle(struct lnet_handle_me *handle, struct lnet_me *me) -{ - handle->cookie = me->me_lh.lh_cookie; -} - -static inline struct lnet_me * -lnet_handle2me(struct lnet_handle_me *handle) -{ - /* ALWAYS called with resource lock held */ - struct lnet_libhandle *lh; - int cpt; - - 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, struct lnet_me, me_lh); -} - -static inline void lnet_peer_net_addref_locked(struct lnet_peer_net *lpn) { atomic_inc(&lpn->lpn_refcount); @@ -482,9 +418,8 @@ lnet_msg_alloc(void) { struct lnet_msg *msg; - LIBCFS_ALLOC(msg, sizeof(*msg)); + msg = kmem_cache_alloc(lnet_msg_cachep, GFP_NOFS | __GFP_ZERO); - /* no need to zero, LIBCFS_ALLOC does for us */ return (msg); } @@ -492,24 +427,30 @@ static inline void lnet_msg_free(struct lnet_msg *msg) { LASSERT(!msg->msg_onactivelist); - LIBCFS_FREE(msg, sizeof(*msg)); + kmem_cache_free(lnet_msg_cachep, msg); } static inline struct lnet_rsp_tracker * lnet_rspt_alloc(int cpt) { struct lnet_rsp_tracker *rspt; - LIBCFS_ALLOC(rspt, sizeof(*rspt)); - lnet_net_lock(cpt); - the_lnet.ln_counters[cpt]->lct_health.lch_rst_alloc++; - lnet_net_unlock(cpt); + + rspt = kmem_cache_alloc(lnet_rspt_cachep, GFP_NOFS | __GFP_ZERO); + if (rspt) { + lnet_net_lock(cpt); + the_lnet.ln_counters[cpt]->lct_health.lch_rst_alloc++; + lnet_net_unlock(cpt); + } + CDEBUG(D_MALLOC, "rspt alloc %p\n", rspt); return rspt; } static inline void lnet_rspt_free(struct lnet_rsp_tracker *rspt, int cpt) { - LIBCFS_FREE(rspt, sizeof(*rspt)); + CDEBUG(D_MALLOC, "rspt free %p\n", rspt); + + kmem_cache_free(lnet_rspt_cachep, rspt); lnet_net_lock(cpt); the_lnet.ln_counters[cpt]->lct_health.lch_rst_alloc--; lnet_net_unlock(cpt); @@ -542,7 +483,7 @@ lnet_net2rnethash(__u32 net) ((1U << the_lnet.ln_remote_nets_hbits) - 1)]; } -extern struct lnet_lnd the_lolnd; +extern const struct lnet_lnd the_lolnd; extern int avoid_asym_router_failure; extern unsigned int lnet_nid_cpt_hash(lnet_nid_t nid, unsigned int number); @@ -630,12 +571,14 @@ void lnet_prep_send(struct lnet_msg *msg, int type, unsigned int len); int lnet_send(lnet_nid_t nid, struct lnet_msg *msg, lnet_nid_t rtr_nid); int lnet_send_ping(lnet_nid_t dest_nid, struct lnet_handle_md *mdh, int nnis, - void *user_ptr, struct lnet_handle_eq eqh, bool recovery); + void *user_ptr, struct lnet_eq *eq, bool recovery); void lnet_return_tx_credits_locked(struct lnet_msg *msg); void lnet_return_rx_credits_locked(struct lnet_msg *msg); void lnet_schedule_blocked_locked(struct lnet_rtrbufpool *rbp); void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt); +struct list_head **lnet_create_array_of_queues(void); + /* portals functions */ /* portals attributes */ static inline int @@ -706,6 +649,7 @@ struct lnet_msg *lnet_create_reply_msg(struct lnet_ni *ni, void lnet_set_reply_msg_len(struct lnet_ni *ni, struct lnet_msg *msg, unsigned int len); void lnet_detach_rsp_tracker(struct lnet_libmd *md, int cpt); +void lnet_clean_zombie_rstqs(void); void lnet_finalize(struct lnet_msg *msg, int rc); bool lnet_send_error_simulation(struct lnet_msg *msg, @@ -827,11 +771,11 @@ struct page *lnet_kvaddr_to_page(unsigned long vaddr); int lnet_cpt_of_md(struct lnet_libmd *md, unsigned int offset); unsigned int lnet_get_lnd_timeout(void); -void lnet_register_lnd(struct lnet_lnd *lnd); -void lnet_unregister_lnd(struct lnet_lnd *lnd); +void lnet_register_lnd(const struct lnet_lnd *lnd); +void lnet_unregister_lnd(const struct lnet_lnd *lnd); int lnet_connect(struct socket **sockp, lnet_nid_t peer_nid, - __u32 local_ip, __u32 peer_ip, int peer_port); + __u32 local_ip, __u32 peer_ip, int peer_port, struct net *ns); void lnet_connect_console_error(int rc, lnet_nid_t peer_nid, __u32 peer_ip, int port); int lnet_count_acceptor_nets(void); @@ -848,24 +792,25 @@ struct lnet_inetdev { char li_name[IFNAMSIZ]; }; -int lnet_inet_enumerate(struct lnet_inetdev **dev_list); +int lnet_inet_enumerate(struct lnet_inetdev **dev_list, struct net *ns); int lnet_sock_setbuf(struct socket *socket, int txbufsize, int rxbufsize); int lnet_sock_getbuf(struct socket *socket, int *txbufsize, int *rxbufsize); int lnet_sock_getaddr(struct socket *socket, bool remote, __u32 *ip, int *port); int lnet_sock_write(struct socket *sock, void *buffer, int nob, int timeout); int lnet_sock_read(struct socket *sock, void *buffer, int nob, int timeout); -int lnet_sock_listen(struct socket **sockp, __u32 ip, int port, int backlog); -int lnet_sock_accept(struct socket **newsockp, struct socket *sock); +int lnet_sock_listen(struct socket **sockp, __u32 ip, int port, int backlog, + struct net *ns); int lnet_sock_connect(struct socket **sockp, int *fatal, __u32 local_ip, int local_port, - __u32 peer_ip, int peer_port); + __u32 peer_ip, int peer_port, struct net *ns); int lnet_peers_start_down(void); int lnet_peer_buffer_credits(struct lnet_net *net); void lnet_consolidate_routes_locked(struct lnet_peer *orig_lp, struct lnet_peer *new_lp); void lnet_router_discovery_complete(struct lnet_peer *lp); +void lnet_router_discovery_ping_reply(struct lnet_peer *lp); int lnet_monitor_thr_start(void); void lnet_monitor_thr_stop(void); @@ -890,17 +835,14 @@ static inline void lnet_ping_buffer_decref(struct lnet_ping_buffer *pbuf) lnet_ping_buffer_free(pbuf); } -static inline int lnet_ping_buffer_numref(struct lnet_ping_buffer *pbuf) -{ - return atomic_read(&pbuf->pb_refcnt); -} - static inline int lnet_push_target_resize_needed(void) { return the_lnet.ln_push_target->pb_nnis < the_lnet.ln_push_target_nnis; } int lnet_push_target_resize(void); +int lnet_push_target_post(struct lnet_ping_buffer *pbuf, + struct lnet_handle_md *mdh); void lnet_peer_push_event(struct lnet_event *ev); int lnet_parse_ip2nets(char **networksp, char *ip2nets); @@ -913,6 +855,7 @@ bool lnet_ni_unique_net(struct list_head *nilist, char *iface); void lnet_incr_dlc_seq(void); __u32 lnet_get_dlc_seq_locked(void); int lnet_get_net_count(void); +extern unsigned int lnet_current_net_count; struct lnet_peer_net *lnet_get_next_peer_net_locked(struct lnet_peer *lp, __u32 prev_lpn_id); @@ -987,7 +930,9 @@ lnet_peer_ni_is_primary(struct lnet_peer_ni *lpni) } bool lnet_peer_is_uptodate(struct lnet_peer *lp); +bool lnet_peer_is_uptodate_locked(struct lnet_peer *lp); bool lnet_is_discovery_disabled(struct lnet_peer *lp); +bool lnet_is_discovery_disabled_locked(struct lnet_peer *lp); bool lnet_peer_gw_discovery(struct lnet_peer *lp); static inline bool @@ -1024,9 +969,37 @@ lnet_is_peer_ni_alive(struct lnet_peer_ni *lpni) } static inline void -lnet_set_healthv(atomic_t *healthv, int value) +lnet_update_peer_net_healthv(struct lnet_peer_ni *lpni) +{ + struct lnet_peer_net *lpn; + int best_healthv = 0; + + lpn = lpni->lpni_peer_net; + + list_for_each_entry(lpni, &lpn->lpn_peer_nis, lpni_peer_nis) { + int lpni_healthv = atomic_read(&lpni->lpni_healthv); + if (best_healthv < lpni_healthv) + best_healthv = lpni_healthv; + } + + lpn->lpn_healthv = best_healthv; +} + +static inline void +lnet_set_lpni_healthv_locked(struct lnet_peer_ni *lpni, int value) +{ + if (atomic_read(&lpni->lpni_healthv) == value) + return; + atomic_set(&lpni->lpni_healthv, value); + lnet_update_peer_net_healthv(lpni); +} + +static inline void +lnet_inc_lpni_healthv_locked(struct lnet_peer_ni *lpni) { - atomic_set(healthv, value); + /* only adjust the net health if the lpni health value changed */ + if (atomic_add_unless(&lpni->lpni_healthv, 1, LNET_MAX_HEALTH_VALUE)) + lnet_update_peer_net_healthv(lpni); } static inline void