/*
* 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/
/* 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)
int ver;
int off;
- DECLARE_LL_PROC_PPOS_DECL;
-
CLASSERT(sizeof(loff_t) >= 4);
off = LNET_PROC_HOFF_GET(*ppos);
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);
lnet_route_t *route = NULL;
lnet_remotenet_t *rnet = NULL;
int skip = off - 1;
+ cfs_list_t *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 = cfs_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 =
+ cfs_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);
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;
int ver;
int off;
- DECLARE_LL_PROC_PPOS_DECL;
-
off = LNET_PROC_HOFF_GET(*ppos);
ver = LNET_PROC_VER_GET(*ppos);
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;
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;
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)
hoff++;
} else {
- struct lnet_peer *peer = NULL;
- cfs_list_t *p = NULL;
- int skip = hoff - 1;
-
+ struct lnet_peer *peer;
+ cfs_list_t *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)
} 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;
- }
}
}
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);
char *s;
int len;
- DECLARE_LL_PROC_PPOS_DECL;
-
LASSERT (!write);
if (*lenp == 0)
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;
}
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 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
}
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
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff