Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-11297 lnet: MR Routing Feature
[fs/lustre-release.git]
/
lnet
/
lnet
/
router_proc.c
diff --git
a/lnet/lnet/router_proc.c
b/lnet/lnet/router_proc.c
index
b4e4d7b
..
23ec36e
100644
(file)
--- a/
lnet/lnet/router_proc.c
+++ b/
lnet/lnet/router_proc.c
@@
-82,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 */
@@
-104,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",
- c
trs->msgs_alloc, ctrs->
msgs_max,
- c
trs->
errors,
- c
trs->send_count, ctrs->
recv_count,
- c
trs->route_count, ctrs->
drop_count,
- c
trs->send_length, ctrs->
recv_length,
- c
trs->route_length, ctrs->
drop_length);
+ c
ommon.lcc_msgs_alloc, common.lcc_
msgs_max,
+ c
ommon.lcc_
errors,
+ c
ommon.lcc_send_count, common.lcc_
recv_count,
+ c
ommon.lcc_route_count, common.lcc_
drop_count,
+ c
ommon.lcc_send_length, common.lcc_
recv_length,
+ c
ommon.lcc_route_length, common.lcc_
drop_length);
if (pos >= min_t(int, len, strlen(tmpstr)))
rc = 0;
@@
-222,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 %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);
}
@@
-289,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);
@@
-301,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);
@@
-316,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
,
- lp
ni
_rtr_list);
+ struct lnet_peer *lp =
+ list_entry(r, struct lnet_peer,
+ lp_rtr_list);
if (skip == 0) {
peer = lp;
@@
-330,47
+329,16
@@
proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
}
if (peer != NULL) {
- lnet_nid_t nid = peer->lpni_nid;
- 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;
- time64_t last_ping = now - peer->lpni_ping_timestamp;
- int down_ni = 0;
- struct lnet_route *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 %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 %12llu %9d %8llu %7d %s\n",
- nrefs, nrtrrefs, alive_cnt,
- alive ? "up" : "down", last_ping,
- pingsent,
- 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);
@@
-533,20
+501,8
@@
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)) {
- time64_t now = ktime_get_seconds();
-
- lastalive = now - peer->lpni_last_alive;
-
- /* 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);
@@
-733,11
+689,7
@@
proc_lnet_nis(struct ctl_table *table, int write, void __user *buffer,
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);
@@
-745,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) {
@@
-876,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);
@@
-955,5
+913,10
@@
static struct ctl_table lnet_table[] = {
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);
}