X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Frouter_proc.c;h=95d34c9b68b4f4be0c5d9320df7e2fcb82de12b0;hp=a91d82b950cb8bbce262245791a27061716263a7;hb=339c7b2b784a528f41c432e9b90285d3445b7536;hpb=e069296630240947f1815e505067fd48033909f7;ds=sidebyside diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c index a91d82b..95d34c9 100644 --- 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,33 +30,13 @@ /* 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, -}; -#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 -#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) @@ -100,7 +80,7 @@ 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; @@ -148,9 +128,17 @@ static int __proc_lnet_stats(void *data, int write, 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; @@ -160,8 +148,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); @@ -183,8 +169,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); @@ -192,52 +178,62 @@ int LL_PROC_PROTO(proc_lnet_routes) 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; + __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); @@ -251,7 +247,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; @@ -267,7 +263,9 @@ int LL_PROC_PROTO(proc_lnet_routes) 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; @@ -277,8 +275,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); @@ -306,9 +302,9 @@ 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 *peer = NULL; + int skip = off - 1; lnet_net_lock(0); @@ -321,9 +317,9 @@ int LL_PROC_PROTO(proc_lnet_routers) 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) { + lnet_peer_t *lp = list_entry(r, lnet_peer_t, + lp_rtr_list); if (skip == 0) { peer = lp; @@ -348,9 +344,10 @@ int LL_PROC_PROTO(proc_lnet_routers) int down_ni = 0; lnet_route_t *rtr; - if (peer->lp_ping_version == LNET_PROTO_PING_VERSION) { - cfs_list_for_each_entry(rtr, &peer->lp_routes, - lr_gwlist) { + if ((peer->lp_ping_feats & + LNET_PING_FEAT_NI_STATUS) != 0) { + list_for_each_entry(rtr, &peer->lp_routes, + lr_gwlist) { /* downis on any route should be the * number of downis on the gateway */ if (rtr->lr_downis != 0) { @@ -386,7 +383,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; @@ -402,7 +399,9 @@ int LL_PROC_PROTO(proc_lnet_routers) return rc; } -int LL_PROC_PROTO(proc_lnet_peers) +static int +proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { const int tmpsiz = 256; struct lnet_peer_table *ptable; @@ -410,8 +409,8 @@ int LL_PROC_PROTO(proc_lnet_peers) 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; @@ -421,8 +420,10 @@ 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) @@ -439,11 +440,14 @@ int LL_PROC_PROTO(proc_lnet_peers) hoff++; } else { - struct lnet_peer *peer = NULL; - cfs_list_t *p = NULL; - int skip = hoff - 1; - + struct lnet_peer *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) @@ -460,8 +464,8 @@ 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); + lnet_peer_t *lp = list_entry(p, lnet_peer_t, + lp_hashlist); if (skip == 0) { peer = lp; @@ -503,14 +507,11 @@ int LL_PROC_PROTO(proc_lnet_peers) 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; + cfs_time_t now = cfs_time_current(); + cfs_duration_t delta; + aliveness = peer->lp_alive ? "up" : "down"; delta = cfs_time_sub(now, peer->lp_last_alive); lastalive = cfs_duration_sec(delta); @@ -533,14 +534,14 @@ int LL_PROC_PROTO(proc_lnet_peers) } 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; - } } } @@ -549,7 +550,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); @@ -564,7 +565,7 @@ int LL_PROC_PROTO(proc_lnet_peers) } 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; @@ -621,9 +622,17 @@ static int __proc_lnet_buffers(void *data, int write, 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; @@ -631,8 +640,6 @@ int LL_PROC_PROTO(proc_lnet_nis) char *s; int len; - DECLARE_LL_PROC_PPOS_DECL; - LASSERT (!write); if (*lenp == 0) @@ -651,7 +658,7 @@ int LL_PROC_PROTO(proc_lnet_nis) "rtr", "max", "tx", "min"); LASSERT (tmpstr + tmpsiz - s > 0); } else { - cfs_list_t *n; + struct list_head *n; lnet_ni_t *ni = NULL; int skip = *ppos - 1; @@ -659,8 +666,8 @@ int LL_PROC_PROTO(proc_lnet_nis) n = the_lnet.ln_nis.next; - while (n != &the_lnet.ln_nis) { - lnet_ni_t *a_ni = cfs_list_entry(n, lnet_ni_t, ni_list); + while (n != &the_lnet.ln_nis) { + lnet_ni_t *a_ni = list_entry(n, lnet_ni_t, ni_list); if (skip == 0) { ni = a_ni; @@ -729,7 +736,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; @@ -743,72 +750,183 @@ int LL_PROC_PROTO(proc_lnet_nis) return rc; } -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(0) - } +struct lnet_portal_rotors { + int pr_value; + const char *pr_name; + const char *pr_desc; }; -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 lnet_portal_rotors portal_rotors[] = { + { + .pr_value = LNET_PTL_ROTOR_OFF, + .pr_name = "OFF", + .pr_desc = "Turn off message rotor for wildcard portals" + }, + { + .pr_value = LNET_PTL_ROTOR_ON, + .pr_name = "ON", + .pr_desc = "round-robin dispatch all PUT messages for " + "wildcard portals" + }, + { + .pr_value = LNET_PTL_ROTOR_RR_RT, + .pr_name = "RR_RT", + .pr_desc = "round-robin dispatch routed PUT message for " + "wildcard portals" + }, + { + .pr_value = LNET_PTL_ROTOR_HASH_RT, + .pr_name = "HASH_RT", + .pr_desc = "dispatch routed PUT message by hashing source " + "NID for wildcard portals" + }, + { + .pr_value = -1, + .pr_name = NULL, + .pr_desc = NULL + }, +}; + +extern int portal_rotor; + +static int __proc_lnet_portal_rotor(void *data, int write, + loff_t pos, void __user *buffer, int nob) +{ + const int buf_len = 128; + char *buf; + char *tmp; + int rc; + int i; + + LIBCFS_ALLOC(buf, buf_len); + if (buf == NULL) + return -ENOMEM; + + if (!write) { + lnet_res_lock(0); + + for (i = 0; portal_rotors[i].pr_value >= 0; i++) { + if (portal_rotors[i].pr_value == portal_rotor) + break; + } + + LASSERT(portal_rotors[i].pr_value == portal_rotor); + lnet_res_unlock(0); + + rc = snprintf(buf, buf_len, + "{\n\tportals: all\n" + "\trotor: %s\n\tdescription: %s\n}", + portal_rotors[i].pr_name, + portal_rotors[i].pr_desc); + + if (pos >= min_t(int, rc, buf_len)) { + rc = 0; + } else { + rc = cfs_trace_copyout_string(buffer, nob, + buf + pos, "\n"); + } + goto out; + } + + rc = cfs_trace_copyin_string(buf, buf_len, buffer, nob); + if (rc < 0) + goto out; + + tmp = cfs_trimwhite(buf); + + rc = -EINVAL; + lnet_res_lock(0); + for (i = 0; portal_rotors[i].pr_name != NULL; i++) { + 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; + } + } + lnet_res_unlock(0); +out: + LIBCFS_FREE(buf, buf_len); + return rc; +} + +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 + .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 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 } @@ -816,10 +934,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 }