X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Frouter_proc.c;h=8b25f0fd842c47d198642154faf4b0d3c904ddae;hp=f64bea2ce207135841cb87362b59c310a71d5cb8;hb=9ab8061abc989be519482888e64e90ebecb228c9;hpb=913c8e22cfc4fc5f52c4f0d6d3f0b4b86a7ac58c diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c index f64bea2..8b25f0f 100644 --- a/lnet/lnet/router_proc.c +++ b/lnet/lnet/router_proc.c @@ -1,10 +1,9 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2015, Intel Corporation. * - * This file is part of Portals - * http://sourceforge.net/projects/sandiaportals/ + * This file is part of Lustre, https://wiki.hpdd.intel.com/ * * Portals is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -25,40 +24,16 @@ #include #include -#if defined(__KERNEL__) && defined(LNET_ROUTER) - /* 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; - -#ifndef HAVE_SYSCTL_UNNUMBERED -#define CTL_LNET (0x100) -enum { - PSDEV_LNET_STATS = 100, - PSDEV_LNET_ROUTES, - PSDEV_LNET_ROUTERS, - PSDEV_LNET_PEERS, - PSDEV_LNET_BUFFERS, - PSDEV_LNET_NIS, - PSDEV_LNET_PTL_ROTOR, -}; -#else -#define CTL_LNET CTL_UNNUMBERED -#define PSDEV_LNET_STATS CTL_UNNUMBERED -#define PSDEV_LNET_ROUTES CTL_UNNUMBERED -#define PSDEV_LNET_ROUTERS CTL_UNNUMBERED -#define PSDEV_LNET_PEERS CTL_UNNUMBERED -#define PSDEV_LNET_BUFFERS CTL_UNNUMBERED -#define PSDEV_LNET_NIS CTL_UNNUMBERED -#define PSDEV_LNET_PTL_ROTOR CTL_UNNUMBERED -#endif +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 */ -#define LNET_PROC_CPT_BITS LNET_CPT_BITS +#define LNET_PROC_CPT_BITS (LNET_CPT_BITS + 1) /* change version, 16 bits or 8 bits */ #define LNET_PROC_VER_BITS MAX(((MIN(LNET_LOFFT_BITS, 64)) / 4), 8) @@ -67,9 +42,9 @@ enum { * bits for peer hash offset * NB: we don't use the highest bit of *ppos because it's signed */ -#define LNET_PROC_HOFF_BITS (LNET_LOFFT_BITS - \ - LNET_PROC_CPT_BITS - \ - LNET_PROC_VER_BITS - \ +#define LNET_PROC_HOFF_BITS (LNET_LOFFT_BITS - \ + LNET_PROC_CPT_BITS - \ + LNET_PROC_VER_BITS - \ LNET_PROC_HASH_BITS - 1) /* bits for hash index + position */ #define LNET_PROC_HPOS_BITS (LNET_PROC_HASH_BITS + LNET_PROC_HOFF_BITS) @@ -102,57 +77,65 @@ enum { #define LNET_PROC_VERSION(v) ((unsigned int)((v) & LNET_PROC_VER_MASK)) static int __proc_lnet_stats(void *data, int write, - loff_t pos, void *buffer, int nob) + loff_t pos, void __user *buffer, int nob) { - int rc; - lnet_counters_t *ctrs; - int len; - char *tmpstr; - const int tmpsiz = 256; /* 7 %u and 4 LPU64 */ + int rc; + lnet_counters_t *ctrs; + int len; + char *tmpstr; + const int tmpsiz = 256; /* 7 %u and 4 __u64 */ - if (write) { + if (write) { lnet_counters_reset(); return 0; - } + } - /* read */ + /* read */ - LIBCFS_ALLOC(ctrs, sizeof(*ctrs)); - if (ctrs == NULL) - return -ENOMEM; + LIBCFS_ALLOC(ctrs, sizeof(*ctrs)); + if (ctrs == NULL) + return -ENOMEM; - LIBCFS_ALLOC(tmpstr, tmpsiz); - if (tmpstr == NULL) { - LIBCFS_FREE(ctrs, sizeof(*ctrs)); - return -ENOMEM; - } + LIBCFS_ALLOC(tmpstr, tmpsiz); + if (tmpstr == NULL) { + LIBCFS_FREE(ctrs, sizeof(*ctrs)); + return -ENOMEM; + } lnet_counters_get(ctrs); - len = snprintf(tmpstr, tmpsiz, - "%u %u %u %u %u %u %u "LPU64" "LPU64" " - LPU64" "LPU64, - 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); - - if (pos >= min_t(int, len, strlen(tmpstr))) - rc = 0; - else - rc = cfs_trace_copyout_string(buffer, nob, - tmpstr + pos, "\n"); - - LIBCFS_FREE(tmpstr, tmpsiz); - LIBCFS_FREE(ctrs, sizeof(*ctrs)); - return rc; + 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); + + if (pos >= min_t(int, len, strlen(tmpstr))) + rc = 0; + else + rc = cfs_trace_copyout_string(buffer, nob, + tmpstr + pos, "\n"); + + LIBCFS_FREE(tmpstr, tmpsiz); + LIBCFS_FREE(ctrs, sizeof(*ctrs)); + return rc; } -DECLARE_PROC_HANDLER(proc_lnet_stats); +static int +proc_lnet_stats(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) +{ + return lprocfs_call_handler(table->data, write, ppos, buffer, lenp, + __proc_lnet_stats); +} -int LL_PROC_PROTO(proc_lnet_routes) +static int +proc_lnet_routes(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { const int tmpsiz = 256; char *tmpstr; @@ -162,140 +145,148 @@ 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); ver = LNET_PROC_VER_GET(*ppos); - LASSERT (!write); + LASSERT(!write); - if (*lenp == 0) - return 0; + if (*lenp == 0) + return 0; - LIBCFS_ALLOC(tmpstr, tmpsiz); - if (tmpstr == NULL) - return -ENOMEM; + LIBCFS_ALLOC(tmpstr, tmpsiz); + if (tmpstr == NULL) + return -ENOMEM; - s = tmpstr; /* points to current position in tmpstr[] */ + s = tmpstr; /* points to current position in tmpstr[] */ - if (*ppos == 0) { - s += snprintf(s, tmpstr + tmpsiz - s, "Routing %s\n", - the_lnet.ln_routing ? "enabled" : "disabled"); - LASSERT (tmpstr + tmpsiz - s > 0); + if (*ppos == 0) { + s += snprintf(s, tmpstr + tmpsiz - s, "Routing %s\n", + 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"); - LASSERT (tmpstr + tmpsiz - s > 0); + 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); ver = (unsigned int)the_lnet.ln_remote_nets_version; lnet_net_unlock(0); *ppos = LNET_PROC_POS_MAKE(0, ver, 0, off); } else { - cfs_list_t *n; - cfs_list_t *r; + struct list_head *n; + struct list_head *r; lnet_route_t *route = NULL; lnet_remotenet_t *rnet = NULL; int skip = off - 1; + struct list_head *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 = 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 = + 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; + 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); s += snprintf(s, tmpstr + tmpsiz - s, - "%-8s %4u %7s %s\n", + "%-8s %4d %8u %7s %s\n", libcfs_net2str(net), hops, + priority, alive ? "up" : "down", libcfs_nid2str(nid)); LASSERT(tmpstr + tmpsiz - s > 0); } lnet_net_unlock(0); - } + } - len = s - tmpstr; /* how many bytes was written */ + len = s - tmpstr; /* how many bytes was written */ - 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)) - rc = -EFAULT; - else { + if (len > *lenp) { /* linux-supplied buffer is too small */ + rc = -EINVAL; + } else if (len > 0) { /* wrote something */ + if (copy_to_user(buffer, tmpstr, len)) + rc = -EFAULT; + else { off += 1; *ppos = LNET_PROC_POS_MAKE(0, ver, 0, off); - } - } + } + } - LIBCFS_FREE(tmpstr, tmpsiz); + LIBCFS_FREE(tmpstr, tmpsiz); - if (rc == 0) - *lenp = len; + if (rc == 0) + *lenp = len; - return rc; + return rc; } -int LL_PROC_PROTO(proc_lnet_routers) +static int +proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { - int rc = 0; - char *tmpstr; - char *s; - const int tmpsiz = 256; - int len; - int ver; - int off; - - DECLARE_LL_PROC_PPOS_DECL; + int rc = 0; + char *tmpstr; + char *s; + const int tmpsiz = 256; + int len; + int ver; + int off; off = LNET_PROC_HOFF_GET(*ppos); ver = LNET_PROC_VER_GET(*ppos); - LASSERT (!write); + LASSERT(!write); - if (*lenp == 0) - return 0; + if (*lenp == 0) + return 0; - LIBCFS_ALLOC(tmpstr, tmpsiz); - if (tmpstr == NULL) - return -ENOMEM; + LIBCFS_ALLOC(tmpstr, tmpsiz); + if (tmpstr == NULL) + return -ENOMEM; - s = tmpstr; /* points to current position in tmpstr[] */ + s = tmpstr; /* points to current position in tmpstr[] */ - if (*ppos == 0) { + 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", @@ -308,52 +299,53 @@ int LL_PROC_PROTO(proc_lnet_routers) lnet_net_unlock(0); *ppos = LNET_PROC_POS_MAKE(0, ver, 0, off); } else { - cfs_list_t *r; - struct lnet_peer *peer = NULL; - int skip = off - 1; + struct list_head *r; + struct lnet_peer_ni *peer = NULL; + int skip = off - 1; lnet_net_lock(0); if (ver != LNET_PROC_VERSION(the_lnet.ln_routers_version)) { lnet_net_unlock(0); - LIBCFS_FREE(tmpstr, tmpsiz); - return -ESTALE; - } + LIBCFS_FREE(tmpstr, tmpsiz); + return -ESTALE; + } - r = the_lnet.ln_routers.next; + r = the_lnet.ln_routers.next; - while (r != &the_lnet.ln_routers) { - lnet_peer_t *lp = cfs_list_entry(r, lnet_peer_t, - lp_rtr_list); + while (r != &the_lnet.ln_routers) { + struct lnet_peer_ni *lp = + list_entry(r, struct lnet_peer_ni, + lpni_rtr_list); - if (skip == 0) { - peer = lp; - break; - } + if (skip == 0) { + peer = lp; + break; + } - skip--; - r = r->next; - } + skip--; + r = r->next; + } - if (peer != NULL) { - lnet_nid_t nid = peer->lp_nid; - cfs_time_t now = cfs_time_current(); - cfs_time_t deadline = peer->lp_ping_deadline; - int nrefs = peer->lp_refcount; - int nrtrrefs = peer->lp_rtr_refcount; - int alive_cnt = peer->lp_alive_count; - int alive = peer->lp_alive; - int pingsent = !peer->lp_ping_notsent; - int last_ping = cfs_duration_sec(cfs_time_sub(now, - peer->lp_ping_timestamp)); + 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->lp_ping_feats & + if ((peer->lpni_ping_feats & LNET_PING_FEAT_NI_STATUS) != 0) { - cfs_list_for_each_entry(rtr, &peer->lp_routes, - lr_gwlist) { + 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) { @@ -363,58 +355,62 @@ int LL_PROC_PROTO(proc_lnet_routers) } } - 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); - } + 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); + } lnet_net_unlock(0); - } + } - len = s - tmpstr; /* how many bytes was written */ + len = s - tmpstr; /* how many bytes was written */ - 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)) - rc = -EFAULT; - else { + if (len > *lenp) { /* linux-supplied buffer is too small */ + rc = -EINVAL; + } else if (len > 0) { /* wrote something */ + if (copy_to_user(buffer, tmpstr, len)) + rc = -EFAULT; + else { off += 1; *ppos = LNET_PROC_POS_MAKE(0, ver, 0, off); - } - } + } + } - LIBCFS_FREE(tmpstr, tmpsiz); + LIBCFS_FREE(tmpstr, tmpsiz); - if (rc == 0) - *lenp = len; + if (rc == 0) + *lenp = len; - return rc; + return rc; } -int LL_PROC_PROTO(proc_lnet_peers) +/* TODO: there should be no direct access to ptable. We should add a set + * of APIs that give access to the ptable and its members */ +static int +proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { - const int tmpsiz = 256; + const int tmpsiz = 256; struct lnet_peer_table *ptable; char *tmpstr; char *s; int cpt = LNET_PROC_CPT_GET(*ppos); int ver = LNET_PROC_VER_GET(*ppos); - int hoff = LNET_PROC_HOFF_GET(*ppos); int hash = LNET_PROC_HASH_GET(*ppos); + int hoff = LNET_PROC_HOFF_GET(*ppos); int rc = 0; int len; @@ -424,29 +420,34 @@ int LL_PROC_PROTO(proc_lnet_peers) if (*lenp == 0) return 0; - if (cpt >= LNET_CPT_NUMBER) + if (cpt >= LNET_CPT_NUMBER) { + *lenp = 0; return 0; + } - LIBCFS_ALLOC(tmpstr, tmpsiz); - if (tmpstr == NULL) - return -ENOMEM; + LIBCFS_ALLOC(tmpstr, tmpsiz); + if (tmpstr == NULL) + return -ENOMEM; - s = tmpstr; /* points to current position in tmpstr[] */ + s = tmpstr; /* points to current position in tmpstr[] */ - if (*ppos == 0) { - s += snprintf(s, tmpstr + tmpsiz - s, - "%-24s %4s %5s %5s %5s %5s %5s %5s %5s %s\n", - "nid", "refs", "state", "last", "max", - "rtr", "min", "tx", "min", "queue"); - LASSERT (tmpstr + tmpsiz - s > 0); + if (*ppos == 0) { + s += snprintf(s, tmpstr + tmpsiz - s, + "%-24s %4s %5s %5s %5s %5s %5s %5s %5s %s\n", + "nid", "refs", "state", "last", "max", + "rtr", "min", "tx", "min", "queue"); + LASSERT(tmpstr + tmpsiz - s > 0); hoff++; } else { - struct lnet_peer *peer = NULL; - cfs_list_t *p = NULL; - int skip = hoff - 1; - + struct lnet_peer_ni *peer; + struct list_head *p; + int skip; again: + p = NULL; + peer = NULL; + skip = hoff - 1; + lnet_net_lock(cpt); ptable = the_lnet.ln_peer_tables[cpt]; if (hoff == 1) @@ -463,114 +464,116 @@ int LL_PROC_PROTO(proc_lnet_peers) p = ptable->pt_hash[hash].next; while (p != &ptable->pt_hash[hash]) { - lnet_peer_t *lp = cfs_list_entry(p, lnet_peer_t, - lp_hashlist); - if (skip == 0) { - peer = lp; - - /* minor optimization: start from idx+1 - * on next iteration if we've just - * drained lp_hashlist */ - if (lp->lp_hashlist.next == + struct lnet_peer_ni *lp = + list_entry(p, struct lnet_peer_ni, + lpni_hashlist); + if (skip == 0) { + peer = lp; + + /* minor optimization: start from idx+1 + * on next iteration if we've just + * drained lpni_hashlist */ + if (lp->lpni_hashlist.next == &ptable->pt_hash[hash]) { hoff = 1; hash++; } else { hoff++; - } + } - break; - } + break; + } - skip--; - p = lp->lp_hashlist.next; - } + skip--; + p = lp->lpni_hashlist.next; + } - if (peer != NULL) - break; + if (peer != NULL) + break; - p = NULL; + p = NULL; hoff = 1; hash++; } - if (peer != NULL) { - lnet_nid_t nid = peer->lp_nid; - int nrefs = peer->lp_refcount; - int lastalive = -1; - char *aliveness = "NA"; - int maxcr = peer->lp_ni->ni_peertxcredits; - int txcr = peer->lp_txcredits; - int mintxcr = peer->lp_mintxcredits; - int rtrcr = peer->lp_rtrcredits; - int minrtrcr = peer->lp_minrtrcredits; - int txqnob = peer->lp_txqnob; - - if (lnet_isrouter(peer) || - lnet_peer_aliveness_enabled(peer)) - aliveness = peer->lp_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->lp_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; - } + if (peer != NULL) { + lnet_nid_t nid = peer->lpni_nid; + int nrefs = atomic_read(&peer->lpni_refcount); + int lastalive = -1; + char *aliveness = "NA"; + 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; + int minrtrcr = peer->lpni_minrtrcredits; + int txqnob = peer->lpni_txqnob; + + 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; + } lnet_net_unlock(cpt); - s += snprintf(s, tmpstr + tmpsiz - s, - "%-24s %4d %5s %5d %5d %5d %5d %5d %5d %d\n", - libcfs_nid2str(nid), nrefs, aliveness, - lastalive, maxcr, rtrcr, minrtrcr, txcr, - mintxcr, txqnob); - LASSERT (tmpstr + tmpsiz - s > 0); + s += snprintf(s, tmpstr + tmpsiz - s, + "%-24s %4d %5s %5d %5d %5d %5d %5d %5d %d\n", + libcfs_nid2str(nid), nrefs, aliveness, + lastalive, maxcr, rtrcr, minrtrcr, txcr, + mintxcr, txqnob); + LASSERT(tmpstr + tmpsiz - s > 0); } else { /* peer is NULL */ lnet_net_unlock(cpt); + } - if (hash == LNET_PEER_HASH_SIZE && - cpt < LNET_CPT_NUMBER - 1) { - cpt++; - hash = 0; - hoff = 1; + if (hash == LNET_PEER_HASH_SIZE) { + cpt++; + hash = 0; + hoff = 1; + if (peer == NULL && cpt < LNET_CPT_NUMBER) goto again; - } } - } + } - len = s - tmpstr; /* how many bytes was written */ + len = s - tmpstr; /* how many bytes was written */ - 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)) - rc = -EFAULT; - else + if (len > *lenp) { /* linux-supplied buffer is too small */ + rc = -EINVAL; + } else if (len > 0) { /* wrote something */ + if (copy_to_user(buffer, tmpstr, len)) + rc = -EFAULT; + else *ppos = LNET_PROC_POS_MAKE(cpt, ver, hash, hoff); - } + } - LIBCFS_FREE(tmpstr, tmpsiz); + LIBCFS_FREE(tmpstr, tmpsiz); - if (rc == 0) - *lenp = len; + if (rc == 0) + *lenp = len; - return rc; + return rc; } static int __proc_lnet_buffers(void *data, int write, - loff_t pos, void *buffer, int nob) + loff_t pos, void __user *buffer, int nob) { - char *s; - char *tmpstr; + char *s; + char *tmpstr; int tmpsiz; int idx; int len; @@ -581,16 +584,16 @@ static int __proc_lnet_buffers(void *data, int write, /* (4 %d) * 4 * LNET_CPT_NUMBER */ tmpsiz = 64 * (LNET_NRBPOOLS + 1) * LNET_CPT_NUMBER; - LIBCFS_ALLOC(tmpstr, tmpsiz); - if (tmpstr == NULL) - return -ENOMEM; + LIBCFS_ALLOC(tmpstr, tmpsiz); + if (tmpstr == NULL) + return -ENOMEM; - s = tmpstr; /* points to current position in tmpstr[] */ + s = tmpstr; /* points to current position in tmpstr[] */ - s += snprintf(s, tmpstr + tmpsiz - s, - "%5s %5s %7s %7s\n", - "pages", "count", "credits", "min"); - LASSERT (tmpstr + tmpsiz - s > 0); + s += snprintf(s, tmpstr + tmpsiz - s, + "%5s %5s %7s %7s\n", + "pages", "count", "credits", "min"); + LASSERT(tmpstr + tmpsiz - s > 0); if (the_lnet.ln_rtrpools == NULL) goto out; /* I'm not a router */ @@ -612,72 +615,65 @@ static int __proc_lnet_buffers(void *data, int write, } out: - len = s - tmpstr; + len = s - tmpstr; - if (pos >= min_t(int, len, strlen(tmpstr))) - rc = 0; - else - rc = cfs_trace_copyout_string(buffer, nob, - tmpstr + pos, NULL); + if (pos >= min_t(int, len, strlen(tmpstr))) + rc = 0; + else + rc = cfs_trace_copyout_string(buffer, nob, + tmpstr + pos, NULL); - LIBCFS_FREE(tmpstr, tmpsiz); - return rc; + LIBCFS_FREE(tmpstr, tmpsiz); + return rc; } -DECLARE_PROC_HANDLER(proc_lnet_buffers); +static int +proc_lnet_buffers(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) +{ + return lprocfs_call_handler(table->data, write, ppos, buffer, lenp, + __proc_lnet_buffers); +} -int LL_PROC_PROTO(proc_lnet_nis) +static int +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; - - DECLARE_LL_PROC_PPOS_DECL; + int rc = 0; + char *tmpstr; + char *s; + int len; - LASSERT (!write); + LASSERT(!write); - if (*lenp == 0) - return 0; + if (*lenp == 0) + return 0; - LIBCFS_ALLOC(tmpstr, tmpsiz); - if (tmpstr == NULL) - return -ENOMEM; + LIBCFS_ALLOC(tmpstr, tmpsiz); + if (tmpstr == NULL) + return -ENOMEM; - s = tmpstr; /* points to current position in tmpstr[] */ + s = tmpstr; /* points to current position in tmpstr[] */ - if (*ppos == 0) { - s += snprintf(s, tmpstr + tmpsiz - s, - "%-24s %6s %5s %4s %4s %4s %5s %5s %5s\n", - "nid", "status", "alive", "refs", "peer", - "rtr", "max", "tx", "min"); - LASSERT (tmpstr + tmpsiz - s > 0); - } else { - cfs_list_t *n; - lnet_ni_t *ni = NULL; - int skip = *ppos - 1; + if (*ppos == 0) { + s += snprintf(s, tmpstr + tmpsiz - s, + "%-24s %6s %5s %4s %4s %4s %5s %5s %5s\n", + "nid", "status", "alive", "refs", "peer", + "rtr", "max", "tx", "min"); + LASSERT (tmpstr + tmpsiz - s > 0); + } else { + lnet_ni_t *ni = NULL; + int skip = *ppos - 1; lnet_net_lock(0); - n = the_lnet.ln_nis.next; + ni = lnet_get_ni_idx_locked(skip); - while (n != &the_lnet.ln_nis) { - lnet_ni_t *a_ni = cfs_list_entry(n, lnet_ni_t, ni_list); - - if (skip == 0) { - ni = a_ni; - break; - } - - skip--; - n = n->next; - } - - if (ni != NULL) { + if (ni != NULL) { struct lnet_tx_queue *tq; char *stat; - long now = cfs_time_current_sec(); + time64_t now = ktime_get_real_seconds(); int last_alive = -1; int i; int j; @@ -686,7 +682,7 @@ int LL_PROC_PROTO(proc_lnet_nis) last_alive = now - ni->ni_last_alive; /* @lo forever alive */ - if (ni->ni_lnd->lnd_type == LOLND) + if (ni->ni_net->net_lnd->lnd_type == LOLND) last_alive = 0; lnet_ni_lock(ni); @@ -714,8 +710,8 @@ int LL_PROC_PROTO(proc_lnet_nis) "%-24s %6s %5d %4d %4d %4d %5d %5d %5d\n", libcfs_nid2str(ni->ni_nid), stat, last_alive, *ni->ni_refs[i], - ni->ni_peertxcredits, - ni->ni_peerrtrcredits, + ni->ni_net->net_tunables.lct_peer_tx_credits, + ni->ni_net->net_tunables.lct_peer_rtr_credits, tq->tq_credits_max, tq->tq_credits, tq->tq_credits_min); if (i != 0) @@ -725,30 +721,30 @@ int LL_PROC_PROTO(proc_lnet_nis) } lnet_net_unlock(0); - } + } - len = s - tmpstr; /* how many bytes was written */ + len = s - tmpstr; /* how many bytes was written */ - 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)) - rc = -EFAULT; - else - *ppos += 1; - } + if (len > *lenp) { /* linux-supplied buffer is too small */ + rc = -EINVAL; + } else if (len > 0) { /* wrote something */ + if (copy_to_user(buffer, tmpstr, len)) + rc = -EFAULT; + else + *ppos += 1; + } - LIBCFS_FREE(tmpstr, tmpsiz); + LIBCFS_FREE(tmpstr, tmpsiz); - if (rc == 0) - *lenp = len; + if (rc == 0) + *lenp = len; - return rc; + return rc; } struct lnet_portal_rotors { - int pr_value; - const char *pr_name; + int pr_value; + const char *pr_name; const char *pr_desc; }; @@ -783,10 +779,8 @@ static struct lnet_portal_rotors portal_rotors[] = { }, }; -extern int portal_rotor; - static int __proc_lnet_portal_rotor(void *data, int write, - loff_t pos, void *buffer, int nob) + loff_t pos, void __user *buffer, int nob) { const int buf_len = 128; char *buf; @@ -833,8 +827,8 @@ static int __proc_lnet_portal_rotor(void *data, int write, rc = -EINVAL; lnet_res_lock(0); for (i = 0; portal_rotors[i].pr_name != NULL; i++) { - if (cfs_strncasecmp(portal_rotors[i].pr_name, tmp, - strlen(portal_rotors[i].pr_name)) == 0) { + if (strncasecmp(portal_rotors[i].pr_name, tmp, + strlen(portal_rotors[i].pr_name)) == 0) { portal_rotor = portal_rotors[i].pr_value; rc = 0; break; @@ -845,80 +839,84 @@ out: LIBCFS_FREE(buf, buf_len); return rc; } -DECLARE_PROC_HANDLER(proc_lnet_portal_rotor); - -static cfs_sysctl_table_t lnet_table[] = { - /* - * NB No .strategy entries have been provided since sysctl(8) prefers - * to go via /proc for portability. - */ - { - INIT_CTL_NAME(PSDEV_LNET_STATS) - .procname = "stats", - .mode = 0644, - .proc_handler = &proc_lnet_stats, - }, - { - INIT_CTL_NAME(PSDEV_LNET_ROUTES) - .procname = "routes", - .mode = 0444, - .proc_handler = &proc_lnet_routes, - }, - { - INIT_CTL_NAME(PSDEV_LNET_ROUTERS) - .procname = "routers", - .mode = 0444, - .proc_handler = &proc_lnet_routers, - }, - { - INIT_CTL_NAME(PSDEV_LNET_PEERS) - .procname = "peers", - .mode = 0444, - .proc_handler = &proc_lnet_peers, - }, - { - INIT_CTL_NAME(PSDEV_LNET_PEERS) - .procname = "buffers", - .mode = 0444, - .proc_handler = &proc_lnet_buffers, - }, - { - INIT_CTL_NAME(PSDEV_LNET_NIS) - .procname = "nis", - .mode = 0444, - .proc_handler = &proc_lnet_nis, - }, - { - INIT_CTL_NAME(PSDEV_LNET_PTL_ROTOR) - .procname = "portal_rotor", - .mode = 0644, - .proc_handler = &proc_lnet_portal_rotor, + +static int +proc_lnet_portal_rotor(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) +{ + return lprocfs_call_handler(table->data, write, ppos, buffer, lenp, + __proc_lnet_portal_rotor); +} + + +static struct ctl_table lnet_table[] = { + /* + * NB No .strategy entries have been provided since sysctl(8) prefers + * to go via /proc for portability. + */ + { + INIT_CTL_NAME + .procname = "stats", + .mode = 0644, + .proc_handler = &proc_lnet_stats, }, { - INIT_CTL_NAME(0) - } + INIT_CTL_NAME + .procname = "routes", + .mode = 0444, + .proc_handler = &proc_lnet_routes, + }, + { + INIT_CTL_NAME + .procname = "routers", + .mode = 0444, + .proc_handler = &proc_lnet_routers, + }, + { + INIT_CTL_NAME + .procname = "peers", + .mode = 0444, + .proc_handler = &proc_lnet_peers, + }, + { + INIT_CTL_NAME + .procname = "buffers", + .mode = 0444, + .proc_handler = &proc_lnet_buffers, + }, + { + INIT_CTL_NAME + .procname = "nis", + .mode = 0444, + .proc_handler = &proc_lnet_nis, + }, + { + INIT_CTL_NAME + .procname = "portal_rotor", + .mode = 0644, + .proc_handler = &proc_lnet_portal_rotor, + }, + { 0 } }; -static cfs_sysctl_table_t top_table[] = { - { - INIT_CTL_NAME(CTL_LNET) - .procname = "lnet", - .mode = 0555, - .data = NULL, - .maxlen = 0, - .child = lnet_table, - }, - { - INIT_CTL_NAME(0) - } +static struct ctl_table top_table[] = { + { + INIT_CTL_NAME + .procname = "lnet", + .mode = 0555, + .data = NULL, + .maxlen = 0, + .child = lnet_table, + }, + { 0 } }; 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 } @@ -926,23 +924,9 @@ 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 } - -#else - -void -lnet_proc_init(void) -{ -} - -void -lnet_proc_fini(void) -{ -} - -#endif