LU-13510 lnet: Correct the default LND timeout

[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 10ad352..ecc97da 100644 (file)
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -76,7 +76,6 @@ extern struct lnet the_lnet;                  /* THE network */
 
 /* default timeout */
 #define DEFAULT_PEER_TIMEOUT    180
-#define LNET_LND_DEFAULT_TIMEOUT 5
 
 #ifdef HAVE_KERN_SOCK_GETNAME_2ARGS
 #define lnet_kernel_getpeername(sock, addr, addrlen) \
@@ -206,53 +205,13 @@ lnet_net_lock_current(void)
 
 #define MAX_PORTALS    64
 
-#define LNET_SMALL_MD_SIZE   offsetof(struct lnet_libmd, md_iov.iov[1])
+#define LNET_SMALL_MD_SIZE   offsetof(struct lnet_libmd, md_kiov[1])
 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_libmd *
-lnet_md_alloc(struct lnet_md *umd)
-{
-       struct lnet_libmd *md;
-       unsigned int  size;
-       unsigned int  niov;
-
-       if ((umd->options & LNET_MD_KIOV) != 0) {
-               niov = umd->length;
-               size = offsetof(struct lnet_libmd, md_iov.kiov[niov]);
-       } else {
-               niov = 1;
-               size = offsetof(struct lnet_libmd, md_iov.iov[niov]);
-       }
-
-       if (size <= LNET_SMALL_MD_SIZE) {
-               md = kmem_cache_alloc(lnet_small_mds_cachep,
-                                     GFP_NOFS | __GFP_ZERO);
-               if (md) {
-                       CDEBUG(D_MALLOC, "slab-alloced 'md' of size %u at "
-                              "%p.\n", size, md);
-               } else {
-                       CDEBUG(D_MALLOC, "failed to allocate 'md' of size %u\n",
-                              size);
-                       return NULL;
-               }
-       } else {
-               LIBCFS_ALLOC(md, size);
-       }
-
-       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;
-}
-
 static inline void
 lnet_md_free(struct lnet_libmd *md)
 {
@@ -260,10 +219,7 @@ lnet_md_free(struct lnet_libmd *md)
 
        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
-               size = offsetof(struct lnet_libmd, md_iov.iov[md->md_niov]);
+       size = offsetof(struct lnet_libmd, md_kiov[md->md_niov]);
 
        if (size <= LNET_SMALL_MD_SIZE) {
                CDEBUG(D_MALLOC, "slab-freed 'md' at %p.\n", md);
@@ -418,7 +374,7 @@ lnet_msg_alloc(void)
 {
        struct lnet_msg *msg;
 
-       msg = kmem_cache_alloc(lnet_msg_cachep, GFP_NOFS | __GFP_ZERO);
+       msg = kmem_cache_zalloc(lnet_msg_cachep, GFP_NOFS);
 
        return (msg);
 }
@@ -435,7 +391,7 @@ lnet_rspt_alloc(int cpt)
 {
        struct lnet_rsp_tracker *rspt;
 
-       rspt = kmem_cache_alloc(lnet_rspt_cachep, GFP_NOFS | __GFP_ZERO);
+       rspt = kmem_cache_zalloc(lnet_rspt_cachep, GFP_NOFS);
        if (rspt) {
                lnet_net_lock(cpt);
                the_lnet.ln_counters[cpt]->lct_health.lch_rst_alloc++;
@@ -696,10 +652,6 @@ void lnet_counters_get(struct lnet_counters *counters);
 void lnet_counters_reset(void);
 
 unsigned int lnet_iov_nob(unsigned int niov, struct kvec *iov);
-int lnet_extract_iov(int dst_niov, struct kvec *dst,
-                     int src_niov, struct kvec *src,
-                     unsigned int offset, unsigned int len);
-
 unsigned int lnet_kiov_nob(unsigned int niov, struct bio_vec *iov);
 int lnet_extract_kiov(int dst_niov, struct bio_vec *dst,
                      int src_niov, struct bio_vec *src,
@@ -723,17 +675,6 @@ void lnet_copy_kiov2kiov(unsigned int ndkiov, struct bio_vec *dkiov,
                         unsigned int soffset, unsigned int nob);
 
 static inline void
-lnet_copy_iov2flat(int dlen, void *dest, unsigned int doffset,
-                  unsigned int nsiov, struct kvec *siov, unsigned int soffset,
-                  unsigned int nob)
-{
-       struct kvec diov = { .iov_base = dest, .iov_len = dlen };
-
-       lnet_copy_iov2iov(1, &diov, doffset,
-                         nsiov, siov, soffset, nob);
-}
-
-static inline void
 lnet_copy_kiov2flat(int dlen, void *dest, unsigned int doffset,
                    unsigned int nsiov, struct bio_vec *skiov,
                    unsigned int soffset, unsigned int nob)
@@ -745,16 +686,6 @@ lnet_copy_kiov2flat(int dlen, void *dest, unsigned int doffset,
 }
 
 static inline void
-lnet_copy_flat2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset,
-                  int slen, void *src, unsigned int soffset,
-                  unsigned int nob)
-{
-       struct kvec siov = { .iov_base = src, .iov_len = slen };
-       lnet_copy_iov2iov(ndiov, diov, doffset,
-                         1, &siov, soffset, nob);
-}
-
-static inline void
 lnet_copy_flat2kiov(unsigned int ndiov, struct bio_vec *dkiov,
                    unsigned int doffset, int slen, void *src,
                    unsigned int soffset, unsigned int nob)
@@ -848,9 +779,9 @@ 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);
-int lnet_parse_routes(char *route_str, int *im_a_router);
-int lnet_parse_networks(struct list_head *nilist, char *networks,
+int lnet_parse_ip2nets(const char **networksp, const char *ip2nets);
+int lnet_parse_routes(const char *route_str, int *im_a_router);
+int lnet_parse_networks(struct list_head *nilist, const char *networks,
                        bool use_tcp_bonding);
 bool lnet_net_unique(__u32 net_id, struct list_head *nilist,
                     struct lnet_net **net);