LU-10391 lnet: discard lnet_sock_accept()

[fs/lustre-release.git] / lnet / include / lnet / lib-lnet.h

diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index ce84b1a..059a5b4 100644 (file)
--- 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
@@ -369,28 +373,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 +464,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 +473,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 +529,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);
@@ -830,11 +817,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);
@@ -851,24 +838,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);
@@ -893,11 +881,6 @@ 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;
@@ -916,6 +899,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);
@@ -990,7 +974,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