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

[fs/lustre-release.git] / lnet / lnet / router_proc.c

diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
index 6bf4773..5bbcbb7 100644 (file)
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  *
  *   This file is part of Portals
  *   http://sourceforge.net/projects/sandiaportals/
@@ -30,7 +30,7 @@
 /* This is really lnet_proc.c. You might need to update sanity test 215
  * if any file format is changed. */
 
-static cfs_sysctl_table_header_t *lnet_table_header = NULL;
+static struct ctl_table_header *lnet_table_header = NULL;
 
 #ifndef HAVE_SYSCTL_UNNUMBERED
 #define CTL_LNET         (0x100)
@@ -162,8 +162,6 @@ int LL_PROC_PROTO(proc_lnet_routes)
        int             ver;
        int             off;
 
-       DECLARE_LL_PROC_PPOS_DECL;
-
        CLASSERT(sizeof(loff_t) >= 4);
 
        off = LNET_PROC_HOFF_GET(*ppos);
@@ -185,8 +183,8 @@ int LL_PROC_PROTO(proc_lnet_routes)
                               the_lnet.ln_routing ? "enabled" : "disabled");
                 LASSERT (tmpstr + tmpsiz - s > 0);
 
-                s += snprintf(s, tmpstr + tmpsiz - s, "%-8s %4s %7s %s\n",
-                              "net", "hops", "state", "router");
+               s += snprintf(s, tmpstr + tmpsiz - s, "%-8s %4s %8s %7s %s\n",
+                             "net", "hops", "priority", "state", "router");
                 LASSERT (tmpstr + tmpsiz - s > 0);
 
                lnet_net_lock(0);
@@ -199,47 +197,57 @@ int LL_PROC_PROTO(proc_lnet_routes)
                lnet_route_t            *route = NULL;
                lnet_remotenet_t        *rnet  = NULL;
                int                     skip  = off - 1;
+               cfs_list_t              *rn_list;
+               int                     i;
 
                lnet_net_lock(0);
 
                if (ver != LNET_PROC_VERSION(the_lnet.ln_remote_nets_version)) {
                        lnet_net_unlock(0);
-                        LIBCFS_FREE(tmpstr, tmpsiz);
-                        return -ESTALE;
-                }
+                       LIBCFS_FREE(tmpstr, tmpsiz);
+                       return -ESTALE;
+               }
 
-                n = the_lnet.ln_remote_nets.next;
+               for (i = 0; i < LNET_REMOTE_NETS_HASH_SIZE && route == NULL;
+                    i++) {
+                       rn_list = &the_lnet.ln_remote_nets_hash[i];
 
-                while (n != &the_lnet.ln_remote_nets && route == NULL) {
-                        rnet = cfs_list_entry(n, lnet_remotenet_t, lrn_list);
+                       n = rn_list->next;
 
-                        r = rnet->lrn_routes.next;
+                       while (n != rn_list && route == NULL) {
+                               rnet = cfs_list_entry(n, lnet_remotenet_t,
+                                                     lrn_list);
 
-                        while (r != &rnet->lrn_routes) {
-                                lnet_route_t *re =
-                                        cfs_list_entry(r, lnet_route_t,
-                                                       lr_list);
-                                if (skip == 0) {
-                                        route = re;
-                                        break;
-                                }
+                               r = rnet->lrn_routes.next;
 
-                                skip--;
-                                r = r->next;
-                        }
+                               while (r != &rnet->lrn_routes) {
+                                       lnet_route_t *re =
+                                               cfs_list_entry(r, lnet_route_t,
+                                                              lr_list);
+                                       if (skip == 0) {
+                                               route = re;
+                                               break;
+                                       }
 
-                        n = n->next;
-                }
+                                       skip--;
+                                       r = r->next;
+                               }
+
+                               n = n->next;
+                       }
+               }
 
                 if (route != NULL) {
-                        __u32        net   = rnet->lrn_net;
-                        unsigned int hops  = route->lr_hops;
-                        lnet_nid_t   nid   = route->lr_gateway->lp_nid;
-                        int          alive = route->lr_gateway->lp_alive;
+                       __u32        net        = rnet->lrn_net;
+                       unsigned int hops       = route->lr_hops;
+                       unsigned int priority   = route->lr_priority;
+                       lnet_nid_t   nid        = route->lr_gateway->lp_nid;
+                       int          alive      = lnet_is_route_alive(route);
 
                        s += snprintf(s, tmpstr + tmpsiz - s,
-                                     "%-8s %4u %7s %s\n",
+                                     "%-8s %4u %8u %7s %s\n",
                                      libcfs_net2str(net), hops,
+                                     priority,
                                      alive ? "up" : "down",
                                      libcfs_nid2str(nid));
                        LASSERT(tmpstr + tmpsiz - s > 0);
@@ -253,7 +261,7 @@ int LL_PROC_PROTO(proc_lnet_routes)
         if (len > *lenp) {    /* linux-supplied buffer is too small */
                 rc = -EINVAL;
         } else if (len > 0) { /* wrote something */
-                if (cfs_copy_to_user(buffer, tmpstr, len))
+               if (copy_to_user(buffer, tmpstr, len))
                         rc = -EFAULT;
                 else {
                        off += 1;
@@ -279,8 +287,6 @@ int LL_PROC_PROTO(proc_lnet_routers)
         int        ver;
        int        off;
 
-       DECLARE_LL_PROC_PPOS_DECL;
-
        off = LNET_PROC_HOFF_GET(*ppos);
        ver = LNET_PROC_VER_GET(*ppos);
 
@@ -389,7 +395,7 @@ int LL_PROC_PROTO(proc_lnet_routers)
         if (len > *lenp) {    /* linux-supplied buffer is too small */
                 rc = -EINVAL;
         } else if (len > 0) { /* wrote something */
-                if (cfs_copy_to_user(buffer, tmpstr, len))
+               if (copy_to_user(buffer, tmpstr, len))
                         rc = -EFAULT;
                 else {
                        off += 1;
@@ -557,7 +563,7 @@ int LL_PROC_PROTO(proc_lnet_peers)
         if (len > *lenp) {    /* linux-supplied buffer is too small */
                 rc = -EINVAL;
         } else if (len > 0) { /* wrote something */
-                if (cfs_copy_to_user(buffer, tmpstr, len))
+               if (copy_to_user(buffer, tmpstr, len))
                         rc = -EFAULT;
                 else
                        *ppos = LNET_PROC_POS_MAKE(cpt, ver, hash, hoff);
@@ -639,8 +645,6 @@ int LL_PROC_PROTO(proc_lnet_nis)
         char      *s;
         int        len;
 
-        DECLARE_LL_PROC_PPOS_DECL;
-
         LASSERT (!write);
 
         if (*lenp == 0)
@@ -737,7 +741,7 @@ int LL_PROC_PROTO(proc_lnet_nis)
         if (len > *lenp) {    /* linux-supplied buffer is too small */
                 rc = -EINVAL;
         } else if (len > 0) { /* wrote something */
-                if (cfs_copy_to_user(buffer, tmpstr, len))
+               if (copy_to_user(buffer, tmpstr, len))
                         rc = -EFAULT;
                 else
                         *ppos += 1;
@@ -852,7 +856,7 @@ out:
 }
 DECLARE_PROC_HANDLER(proc_lnet_portal_rotor);
 
-static cfs_sysctl_table_t lnet_table[] = {
+static struct ctl_table lnet_table[] = {
         /*
          * NB No .strategy entries have been provided since sysctl(8) prefers
          * to go via /proc for portability.
@@ -904,7 +908,7 @@ static cfs_sysctl_table_t lnet_table[] = {
        }
 };
 
-static cfs_sysctl_table_t top_table[] = {
+static struct ctl_table top_table[] = {
         {
                 INIT_CTL_NAME(CTL_LNET)
                 .procname = "lnet",
@@ -922,8 +926,8 @@ void
 lnet_proc_init(void)
 {
 #ifdef CONFIG_SYSCTL
-        if (lnet_table_header == NULL)
-                lnet_table_header = cfs_register_sysctl_table(top_table, 0);
+       if (lnet_table_header == NULL)
+               lnet_table_header = register_sysctl_table(top_table);
 #endif
 }
 
@@ -931,10 +935,10 @@ void
 lnet_proc_fini(void)
 {
 #ifdef CONFIG_SYSCTL
-        if (lnet_table_header != NULL)
-                cfs_unregister_sysctl_table(lnet_table_header);
+       if (lnet_table_header != NULL)
+               unregister_sysctl_table(lnet_table_header);
 
-        lnet_table_header = NULL;
+       lnet_table_header = NULL;
 #endif
 }