LU-3679 lnet: reflect down routes in /proc/sys/lnet/routes

[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 547a4b3..9cebc3a 100644 (file)
--- 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/
@@ -85,6 +87,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 +188,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__ */
 
@@ -393,9 +406,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;
 }
@@ -507,12 +517,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);
 }
 
@@ -696,6 +700,14 @@ lnet_nid2peerhash(lnet_nid_t nid)
        return cfs_hash_long(nid, LNET_PEER_HASH_BITS);
 }
 
+static inline cfs_list_t *
+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;
 
 #ifndef __KERNEL__
@@ -717,15 +729,6 @@ 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);
@@ -734,12 +737,13 @@ 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);
 void lnet_proc_init(void);
 void lnet_proc_fini(void);
 int  lnet_rtrpools_alloc(int im_a_router);