LU-11986 lnet: properly cleanup lnet debugfs files

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

diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
index 24d57f5..bbcc0fd 100644 (file)
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2011, 2017, Intel Corporation.
  *
- *   This file is part of Lustre, https://wiki.hpdd.intel.com/
+ *   This file is part of Lustre, https://wiki.whamcloud.com/
  *
  *   Portals is free software; you can redistribute it and/or
  *   modify it under the terms of version 2 of the GNU General Public
@@ -24,7 +24,6 @@
 
 #include <linux/uaccess.h>
 
-#include <libcfs/linux/linux-misc.h>
 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 
@@ -83,6 +82,7 @@ static int __proc_lnet_stats(void *data, int write,
 {
        int              rc;
        struct lnet_counters *ctrs;
+       struct lnet_counters_common common;
        int              len;
        char            *tmpstr;
        const int        tmpsiz = 256; /* 7 %u and 4 __u64 */
@@ -105,16 +105,17 @@ static int __proc_lnet_stats(void *data, int write,
        }
 
        lnet_counters_get(ctrs);
+       common = ctrs->lct_common;
 
        len = snprintf(tmpstr, tmpsiz,
                       "%u %u %u %u %u %u %u %llu %llu "
                       "%llu %llu",
-                      ctrs->msgs_alloc, ctrs->msgs_max,
-                      ctrs->errors,
-                      ctrs->send_count, ctrs->recv_count,
-                      ctrs->route_count, ctrs->drop_count,
-                      ctrs->send_length, ctrs->recv_length,
-                      ctrs->route_length, ctrs->drop_length);
+                      common.lcc_msgs_alloc, common.lcc_msgs_max,
+                      common.lcc_errors,
+                      common.lcc_send_count, common.lcc_recv_count,
+                      common.lcc_route_count, common.lcc_drop_count,
+                      common.lcc_send_length, common.lcc_recv_length,
+                      common.lcc_route_length, common.lcc_drop_length);
 
        if (pos >= min_t(int, len, strlen(tmpstr)))
                rc = 0;
@@ -332,15 +333,14 @@ proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
 
                if (peer != NULL) {
                        lnet_nid_t nid = peer->lpni_nid;
-                       cfs_time_t now = cfs_time_current();
-                       cfs_time_t deadline = peer->lpni_ping_deadline;
+                       time64_t now = ktime_get_seconds();
+                       time64_t deadline = peer->lpni_ping_deadline;
                        int nrefs     = atomic_read(&peer->lpni_refcount);
                        int nrtrrefs  = peer->lpni_rtr_refcount;
                        int alive_cnt = peer->lpni_alive_count;
                        int alive     = peer->lpni_alive;
                        int pingsent  = !peer->lpni_ping_notsent;
-                       int last_ping = cfs_duration_sec(cfs_time_sub(now,
-                                                    peer->lpni_ping_timestamp));
+                       time64_t last_ping = now - peer->lpni_ping_timestamp;
                        int down_ni   = 0;
                        struct lnet_route *rtr;
 
@@ -359,18 +359,18 @@ proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
 
                        if (deadline == 0)
                                s += snprintf(s, tmpstr + tmpsiz - s,
-                                             "%-4d %7d %9d %6s %12d %9d %8s %7d %s\n",
+                                             "%-4d %7d %9d %6s %12llu %9d %8s %7d %s\n",
                                              nrefs, nrtrrefs, alive_cnt,
                                              alive ? "up" : "down", last_ping,
                                              pingsent, "NA", down_ni,
                                              libcfs_nid2str(nid));
                        else
                                s += snprintf(s, tmpstr + tmpsiz - s,
-                                             "%-4d %7d %9d %6s %12d %9d %8lu %7d %s\n",
+                                             "%-4d %7d %9d %6s %12llu %9d %8llu %7d %s\n",
                                              nrefs, nrtrrefs, alive_cnt,
                                              alive ? "up" : "down", last_ping,
                                              pingsent,
-                                             cfs_duration_sec(cfs_time_sub(deadline, now)),
+                                             deadline - now,
                                              down_ni, libcfs_nid2str(nid));
                        LASSERT(tmpstr + tmpsiz - s > 0);
                }
@@ -523,7 +523,7 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
                if (peer != NULL) {
                        lnet_nid_t nid = peer->lpni_nid;
                        int nrefs = atomic_read(&peer->lpni_refcount);
-                       int lastalive = -1;
+                       time64_t lastalive = -1;
                        char *aliveness = "NA";
                        int maxcr = (peer->lpni_net) ?
                          peer->lpni_net->net_tunables.lct_peer_tx_credits : 0;
@@ -538,11 +538,9 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
                                aliveness = peer->lpni_alive ? "up" : "down";
 
                        if (lnet_peer_aliveness_enabled(peer)) {
-                               cfs_time_t now = cfs_time_current();
-                               cfs_duration_t delta;
+                               time64_t now = ktime_get_seconds();
 
-                               delta = cfs_time_sub(now, peer->lpni_last_alive);
-                               lastalive = cfs_duration_sec(delta);
+                               lastalive = now - peer->lpni_last_alive;
 
                                /* No need to mess up peers contents with
                                 * arbitrarily long integers - it suffices to
@@ -555,7 +553,7 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
                        lnet_net_unlock(cpt);
 
                        s += snprintf(s, tmpstr + tmpsiz - s,
-                                     "%-24s %4d %5s %5d %5d %5d %5d %5d %5d %d\n",
+                                     "%-24s %4d %5s %5lld %5d %5d %5d %5d %5d %d\n",
                                      libcfs_nid2str(nid), nrefs, aliveness,
                                      lastalive, maxcr, rtrcr, minrtrcr, txcr,
                                      mintxcr, txqnob);
@@ -729,12 +727,12 @@ proc_lnet_nis(struct ctl_table *table, int write, void __user *buffer,
                ni = lnet_get_ni_idx_locked(skip);
 
                if (ni != NULL) {
-                       struct lnet_tx_queue    *tq;
-                       char    *stat;
+                       struct lnet_tx_queue *tq;
+                       char *stat;
                        time64_t now = ktime_get_real_seconds();
-                       int     last_alive = -1;
-                       int     i;
-                       int     j;
+                       time64_t last_alive = -1;
+                       int i;
+                       int j;
 
                        if (the_lnet.ln_routing)
                                last_alive = now - ni->ni_last_alive;
@@ -765,7 +763,7 @@ proc_lnet_nis(struct ctl_table *table, int write, void __user *buffer,
                                        lnet_net_lock(i);
 
                                s += snprintf(s, tmpstr + tmpsiz - s,
-                                     "%-24s %6s %5d %4d %4d %4d %5d %5d %5d\n",
+                                     "%-24s %6s %5lld %4d %4d %4d %5d %5d %5d\n",
                                      libcfs_nid2str(ni->ni_nid), stat,
                                      last_alive, *ni->ni_refs[i],
                                      ni->ni_net->net_tunables.lct_peer_tx_credits,
@@ -880,7 +878,7 @@ static int __proc_lnet_portal_rotor(void *data, int write,
        if (rc < 0)
                goto out;
 
-       tmp = cfs_trimwhite(buf);
+       tmp = strim(buf);
 
        rc = -EINVAL;
        lnet_res_lock(0);
@@ -954,10 +952,15 @@ static struct ctl_table lnet_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_lnet_portal_rotor,
        },
-       { 0 }
+       { .procname = NULL }
 };
 
 void lnet_router_debugfs_init(void)
 {
-       lnet_insert_debugfs(lnet_table, NULL);
+       lnet_insert_debugfs(lnet_table);
+}
+
+void lnet_router_debugfs_fini(void)
+{
+       lnet_remove_debugfs(lnet_table);
 }