X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Frouter_proc.c;h=23ec36e87dd9f4e2a0d95bc41493241ae4056594;hb=1aae733c16161513b07d7f8cc046299e2de5aad3;hp=76362028a91ad3de12ab90ec8981764776437a5f;hpb=e1526ef2b8446fbd9a5f8f8d6f2d5e02d1982a75;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
index 7636202..23ec36e 100644
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * 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
@@ -21,14 +21,15 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
+
+#include <linux/uaccess.h>
+
 #include <libcfs/libcfs.h>
 #include <lnet/lib-lnet.h>
 
 /* This is really lnet_proc.c. You might need to update sanity test 215
  * if any file format is changed. */
 
-static struct ctl_table_header *lnet_table_header = NULL;
-
 #define LNET_LOFFT_BITS		(sizeof(loff_t) * 8)
 /*
  * NB: max allowed LNET_CPT_BITS is 8 on 64-bit system and 2 on 32-bit system
@@ -80,7 +81,8 @@ static int __proc_lnet_stats(void *data, int write,
 			     loff_t pos, void __user *buffer, int nob)
 {
 	int		 rc;
-	lnet_counters_t *ctrs;
+	struct lnet_counters *ctrs;
+	struct lnet_counters_common common;
 	int		 len;
 	char		*tmpstr;
 	const int	 tmpsiz = 256; /* 7 %u and 4 __u64 */
@@ -103,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;
@@ -177,8 +180,8 @@ proc_lnet_routes(struct ctl_table *table, int write, void __user *buffer,
 	} else {
 		struct list_head	*n;
 		struct list_head	*r;
-		lnet_route_t		*route = NULL;
-		lnet_remotenet_t	*rnet  = NULL;
+		struct lnet_route		*route = NULL;
+		struct lnet_remotenet	*rnet  = NULL;
 		int			skip  = off - 1;
 		struct list_head	*rn_list;
 		int			i;
@@ -198,14 +201,14 @@ proc_lnet_routes(struct ctl_table *table, int write, void __user *buffer,
 			n = rn_list->next;
 
 			while (n != rn_list && route == NULL) {
-				rnet = list_entry(n, lnet_remotenet_t,
+				rnet = list_entry(n, struct lnet_remotenet,
 						  lrn_list);
 
 				r = rnet->lrn_routes.next;
 
 				while (r != &rnet->lrn_routes) {
-					lnet_route_t *re =
-						list_entry(r, lnet_route_t,
+					struct lnet_route *re =
+						list_entry(r, struct lnet_route,
 							   lr_list);
 					if (skip == 0) {
 						route = re;
@@ -221,18 +224,17 @@ proc_lnet_routes(struct ctl_table *table, int write, void __user *buffer,
 		}
 
 		if (route != NULL) {
-			__u32	     net	= rnet->lrn_net;
-			__u32 hops		= route->lr_hops;
-			unsigned int priority	= route->lr_priority;
-			lnet_nid_t   nid	= route->lr_gateway->lpni_nid;
-			int          alive	= lnet_is_route_alive(route);
+			__u32 net = rnet->lrn_net;
+			__u32 hops = route->lr_hops;
+			unsigned int priority = route->lr_priority;
+			int alive = lnet_is_route_alive(route);
 
 			s += snprintf(s, tmpstr + tmpsiz - s,
-				      "%-8s %4u %8u %7s %s\n",
+				      "%-8s %4d %8u %7s %s\n",
 				      libcfs_net2str(net), hops,
 				      priority,
 				      alive ? "up" : "down",
-				      libcfs_nid2str(nid));
+				      libcfs_nid2str(route->lr_nid));
 			LASSERT(tmpstr + tmpsiz - s > 0);
 		}
 
@@ -288,10 +290,8 @@ proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
 
 	if (*ppos == 0) {
 		s += snprintf(s, tmpstr + tmpsiz - s,
-			      "%-4s %7s %9s %6s %12s %9s %8s %7s %s\n",
-			      "ref", "rtr_ref", "alive_cnt", "state",
-			      "last_ping", "ping_sent", "deadline",
-			      "down_ni", "router");
+			      "%-4s %7s %5s %s\n",
+			      "ref", "rtr_ref", "alive", "router");
 		LASSERT(tmpstr + tmpsiz - s > 0);
 
 		lnet_net_lock(0);
@@ -300,7 +300,7 @@ proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
 		*ppos = LNET_PROC_POS_MAKE(0, ver, 0, off);
 	} else {
 		struct list_head *r;
-		struct lnet_peer_ni *peer = NULL;
+		struct lnet_peer *peer = NULL;
 		int		  skip = off - 1;
 
 		lnet_net_lock(0);
@@ -315,9 +315,9 @@ proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
 		r = the_lnet.ln_routers.next;
 
 		while (r != &the_lnet.ln_routers) {
-			struct lnet_peer_ni *lp =
-			  list_entry(r, struct lnet_peer_ni,
-				     lpni_rtr_list);
+			struct lnet_peer *lp =
+			  list_entry(r, struct lnet_peer,
+				     lp_rtr_list);
 
 			if (skip == 0) {
 				peer = lp;
@@ -329,48 +329,16 @@ 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;
-			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));
-			int down_ni   = 0;
-			lnet_route_t *rtr;
-
-			if ((peer->lpni_ping_feats &
-			     LNET_PING_FEAT_NI_STATUS) != 0) {
-				list_for_each_entry(rtr, &peer->lpni_routes,
-						    lr_gwlist) {
-					/* downis on any route should be the
-					 * number of downis on the gateway */
-					if (rtr->lr_downis != 0) {
-						down_ni = rtr->lr_downis;
-						break;
-					}
-				}
-			}
+			lnet_nid_t nid = peer->lp_primary_nid;
+			int nrefs     = atomic_read(&peer->lp_refcount);
+			int nrtrrefs  = peer->lp_rtr_refcount;
+			int alive     = lnet_is_gateway_alive(peer);
 
-			if (deadline == 0)
-				s += snprintf(s, tmpstr + tmpsiz - s,
-					      "%-4d %7d %9d %6s %12d %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",
-					      nrefs, nrtrrefs, alive_cnt,
-					      alive ? "up" : "down", last_ping,
-					      pingsent,
-					      cfs_duration_sec(cfs_time_sub(deadline, now)),
-					      down_ni, libcfs_nid2str(nid));
-			LASSERT(tmpstr + tmpsiz - s > 0);
+			s += snprintf(s, tmpstr + tmpsiz - s,
+				      "%-4d %7d %5s %s\n",
+				      nrefs, nrtrrefs,
+				      alive ? "up" : "down",
+				      libcfs_nid2str(nid));
 		}
 
 		lnet_net_unlock(0);
@@ -405,7 +373,7 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
 {
 	const int		tmpsiz	= 256;
 	struct lnet_peer_table	*ptable;
-	char			*tmpstr;
+	char			*tmpstr = NULL;
 	char			*s;
 	int			cpt  = LNET_PROC_CPT_GET(*ppos);
 	int			ver  = LNET_PROC_VER_GET(*ppos);
@@ -414,12 +382,33 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
 	int			rc = 0;
 	int			len;
 
-	CLASSERT(LNET_PROC_HASH_BITS >= LNET_PEER_HASH_BITS);
-	LASSERT(!write);
+	if (write) {
+		int i;
+		struct lnet_peer_ni *peer;
+
+		cfs_percpt_for_each(ptable, i, the_lnet.ln_peer_tables) {
+			lnet_net_lock(i);
+			for (hash = 0; hash < LNET_PEER_HASH_SIZE; hash++) {
+				list_for_each_entry(peer,
+						    &ptable->pt_hash[hash],
+						    lpni_hashlist) {
+					peer->lpni_mintxcredits =
+						peer->lpni_txcredits;
+					peer->lpni_minrtrcredits =
+						peer->lpni_rtrcredits;
+				}
+			}
+			lnet_net_unlock(i);
+		}
+		*ppos += *lenp;
+		return 0;
+	}
 
 	if (*lenp == 0)
 		return 0;
 
+	CLASSERT(LNET_PROC_HASH_BITS >= LNET_PEER_HASH_BITS);
+
 	if (cpt >= LNET_CPT_NUMBER) {
 		*lenp = 0;
 		return 0;
@@ -443,6 +432,7 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
 		struct lnet_peer_ni	*peer;
 		struct list_head	*p;
 		int			skip;
+
  again:
 		p = NULL;
 		peer = NULL;
@@ -499,9 +489,10 @@ 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->net_tunables.lct_peer_tx_credits;
+			int maxcr = (peer->lpni_net) ?
+			  peer->lpni_net->net_tunables.lct_peer_tx_credits : 0;
 			int txcr = peer->lpni_txcredits;
 			int mintxcr = peer->lpni_mintxcredits;
 			int rtrcr = peer->lpni_rtrcredits;
@@ -510,27 +501,13 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
 
 			if (lnet_isrouter(peer) ||
 			    lnet_peer_aliveness_enabled(peer))
-				aliveness = peer->lpni_alive ? "up" : "down";
-
-			if (lnet_peer_aliveness_enabled(peer)) {
-				cfs_time_t now = cfs_time_current();
-				cfs_duration_t delta;
-
-				delta = cfs_time_sub(now, peer->lpni_last_alive);
-				lastalive = cfs_duration_sec(delta);
-
-				/* No need to mess up peers contents with
-				 * arbitrarily long integers - it suffices to
-				 * know that lastalive is more than 10000s old
-				 */
-				if (lastalive >= 10000)
-					lastalive = 9999;
-			}
+				aliveness = lnet_is_peer_ni_alive(peer) ?
+					"up" : "down";
 
 			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);
@@ -598,7 +575,7 @@ static int __proc_lnet_buffers(void *data, int write,
 		goto out; /* I'm not a router */
 
 	for (idx = 0; idx < LNET_NRBPOOLS; idx++) {
-		lnet_rtrbufpool_t *rbp;
+		struct lnet_rtrbufpool *rbp;
 
 		lnet_net_lock(LNET_LOCK_EX);
 		cfs_percpt_for_each(rbp, i, the_lnet.ln_rtrpools) {
@@ -639,16 +616,50 @@ proc_lnet_nis(struct ctl_table *table, int write, void __user *buffer,
 	      size_t *lenp, loff_t *ppos)
 {
 	int	tmpsiz = 128 * LNET_CPT_NUMBER;
-	int	   rc = 0;
-	char	  *tmpstr;
-	char	  *s;
-	int	   len;
-
-	LASSERT(!write);
+	int	rc = 0;
+	char	*tmpstr;
+	char	*s;
+	int	len;
 
 	if (*lenp == 0)
 		return 0;
 
+	if (write) {
+		/* Just reset the min stat. */
+		struct lnet_ni	*ni;
+		struct lnet_net	*net;
+
+		lnet_net_lock(0);
+
+		list_for_each_entry(net, &the_lnet.ln_nets, net_list) {
+			list_for_each_entry(ni, &net->net_ni_list, ni_netlist) {
+				struct lnet_tx_queue *tq;
+				int i;
+				int j;
+
+				cfs_percpt_for_each(tq, i, ni->ni_tx_queues) {
+					for (j = 0; ni->ni_cpts != NULL &&
+					     j < ni->ni_ncpts; j++) {
+						if (i == ni->ni_cpts[j])
+							break;
+					}
+
+					if (j == ni->ni_ncpts)
+						continue;
+
+					if (i != 0)
+						lnet_net_lock(i);
+					tq->tq_credits_min = tq->tq_credits;
+					if (i != 0)
+						lnet_net_unlock(i);
+				}
+			}
+		}
+		lnet_net_unlock(0);
+		*ppos += *lenp;
+		return 0;
+	}
+
 	LIBCFS_ALLOC(tmpstr, tmpsiz);
 	if (tmpstr == NULL)
 		return -ENOMEM;
@@ -662,27 +673,23 @@ proc_lnet_nis(struct ctl_table *table, int write, void __user *buffer,
 			      "rtr", "max", "tx", "min");
 		LASSERT (tmpstr + tmpsiz - s > 0);
 	} else {
-		lnet_ni_t         *ni   = NULL;
-		int                skip = *ppos - 1;
+		struct lnet_ni *ni   = NULL;
+		int skip = *ppos - 1;
 
 		lnet_net_lock(0);
 
 		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;
-
-			/* @lo forever alive */
-			if (ni->ni_net->net_lnd->lnd_type == LOLND)
-				last_alive = 0;
+				last_alive = now - ni->ni_net->net_last_alive;
 
 			lnet_ni_lock(ni);
 			LASSERT(ni->ni_status != NULL);
@@ -690,6 +697,12 @@ proc_lnet_nis(struct ctl_table *table, int write, void __user *buffer,
 				LNET_NI_STATUS_UP) ? "up" : "down";
 			lnet_ni_unlock(ni);
 
+			/* @lo forever alive */
+			if (ni->ni_net->net_lnd->lnd_type == LOLND) {
+				last_alive = 0;
+				stat = "up";
+			}
+
 			/* we actually output credits information for
 			 * TX queue of each partition */
 			cfs_percpt_for_each(tq, i, ni->ni_tx_queues) {
@@ -706,7 +719,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,
@@ -821,7 +834,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);
@@ -874,7 +887,7 @@ static struct ctl_table lnet_table[] = {
 	{
 		INIT_CTL_NAME
 		.procname	= "peers",
-		.mode		= 0444,
+		.mode		= 0644,
 		.proc_handler	= &proc_lnet_peers,
 	},
 	{
@@ -886,7 +899,7 @@ static struct ctl_table lnet_table[] = {
 	{
 		INIT_CTL_NAME
 		.procname	= "nis",
-		.mode		= 0444,
+		.mode		= 0644,
 		.proc_handler	= &proc_lnet_nis,
 	},
 	{
@@ -895,37 +908,15 @@ static struct ctl_table lnet_table[] = {
 		.mode		= 0644,
 		.proc_handler	= &proc_lnet_portal_rotor,
 	},
-	{ 0 }
-};
-
-static struct ctl_table top_table[] = {
-	{
-		INIT_CTL_NAME
-		.procname	= "lnet",
-		.mode		= 0555,
-		.data		= NULL,
-		.maxlen		= 0,
-		.child		= lnet_table,
-	},
-	{ 0 }
+	{ .procname = NULL }
 };
 
-void
-lnet_proc_init(void)
+void lnet_router_debugfs_init(void)
 {
-#ifdef CONFIG_SYSCTL
-	if (lnet_table_header == NULL)
-		lnet_table_header = register_sysctl_table(top_table);
-#endif
+	lnet_insert_debugfs(lnet_table);
 }
 
-void
-lnet_proc_fini(void)
+void lnet_router_debugfs_fini(void)
 {
-#ifdef CONFIG_SYSCTL
-	if (lnet_table_header != NULL)
-		unregister_sysctl_table(lnet_table_header);
-
-	lnet_table_header = NULL;
-#endif
+	lnet_remove_debugfs(lnet_table);
 }