*/
#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)
+#define LNET_PROC_VER_BITS \
+ clamp_t(int, LNET_LOFFT_BITS / 4, 8, 16)
#define LNET_PROC_HASH_BITS LNET_PEER_HASH_BITS
/*
struct lnet_counters *ctrs;
struct lnet_counters_common common;
int len;
- char *tmpstr;
- const int tmpsiz = 256; /* 7 %u and 4 __u64 */
+ char tmpstr[256]; /* 7 %u and 4 u64 */
if (write) {
lnet_counters_reset();
if (ctrs == NULL)
return -ENOMEM;
- LIBCFS_ALLOC(tmpstr, tmpsiz);
- if (tmpstr == NULL) {
- LIBCFS_FREE(ctrs, sizeof(*ctrs));
- return -ENOMEM;
- }
+ rc = lnet_counters_get(ctrs);
+ if (rc)
+ goto out_no_ctrs;
- lnet_counters_get(ctrs);
common = ctrs->lct_common;
- len = snprintf(tmpstr, tmpsiz,
- "%u %u %u %u %u %u %u %llu %llu "
- "%llu %llu",
- 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)))
+ len = scnprintf(tmpstr, sizeof(tmpstr),
+ "%u %u %u %u %u %u %u %llu %llu "
+ "%llu %llu",
+ 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 >= len)
rc = 0;
else
rc = cfs_trace_copyout_string(buffer, nob,
tmpstr + pos, "\n");
-
- LIBCFS_FREE(tmpstr, tmpsiz);
+out_no_ctrs:
LIBCFS_FREE(ctrs, sizeof(*ctrs));
return rc;
}
int ver;
int off;
- CLASSERT(sizeof(loff_t) >= 4);
+ BUILD_BUG_ON(sizeof(loff_t) < 4);
off = LNET_PROC_HOFF_GET(*ppos);
ver = LNET_PROC_VER_GET(*ppos);
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");
+ s += scnprintf(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 %8s %7s %s\n",
- "net", "hops", "priority", "state", "router");
+ s += scnprintf(s, tmpstr + tmpsiz - s, "%-8s %4s %8s %7s %s\n",
+ "net", "hops", "priority", "state", "router");
LASSERT(tmpstr + tmpsiz - s > 0);
lnet_net_lock(0);
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",
- /* TODO: replace with actual nid */
- libcfs_nid2str(LNET_NID_ANY));
+ s += scnprintf(s, tmpstr + tmpsiz - s,
+ "%-8s %4d %8u %7s %s\n",
+ libcfs_net2str(net), hops,
+ priority,
+ alive ? "up" : "down",
+ libcfs_nid2str(route->lr_nid));
LASSERT(tmpstr + tmpsiz - s > 0);
}
s = tmpstr; /* points to current position in tmpstr[] */
if (*ppos == 0) {
- s += snprintf(s, tmpstr + tmpsiz - s,
- "%-4s %7s %5s %s\n",
- "ref", "rtr_ref", "alive", "router");
+ s += scnprintf(s, tmpstr + tmpsiz - s,
+ "%-4s %7s %5s %s\n",
+ "ref", "rtr_ref", "alive", "router");
LASSERT(tmpstr + tmpsiz - s > 0);
lnet_net_lock(0);
int nrtrrefs = peer->lp_rtr_refcount;
int alive = lnet_is_gateway_alive(peer);
- s += snprintf(s, tmpstr + tmpsiz - s,
- "%-4d %7d %5s %s\n",
- nrefs, nrtrrefs,
- alive ? "up" : "down",
- libcfs_nid2str(nid));
+ s += scnprintf(s, tmpstr + tmpsiz - s,
+ "%-4d %7d %5s %s\n",
+ nrefs, nrtrrefs,
+ alive ? "up" : "down",
+ libcfs_nid2str(nid));
}
lnet_net_unlock(0);
if (*lenp == 0)
return 0;
- CLASSERT(LNET_PROC_HASH_BITS >= LNET_PEER_HASH_BITS);
+ BUILD_BUG_ON(LNET_PROC_HASH_BITS < LNET_PEER_HASH_BITS);
if (cpt >= LNET_CPT_NUMBER) {
*lenp = 0;
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");
+ s += scnprintf(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++;
lnet_net_unlock(cpt);
- s += snprintf(s, tmpstr + tmpsiz - s,
- "%-24s %4d %5s %5lld %5d %5d %5d %5d %5d %d\n",
- libcfs_nid2str(nid), nrefs, aliveness,
- lastalive, maxcr, rtrcr, minrtrcr, txcr,
- mintxcr, txqnob);
+ s += scnprintf(s, tmpstr + tmpsiz - s,
+ "%-24s %4d %5s %5lld %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 */
s = tmpstr; /* points to current position in tmpstr[] */
- s += snprintf(s, tmpstr + tmpsiz - s,
- "%5s %5s %7s %7s\n",
- "pages", "count", "credits", "min");
+ s += scnprintf(s, tmpstr + tmpsiz - s,
+ "%5s %5s %7s %7s\n",
+ "pages", "count", "credits", "min");
LASSERT(tmpstr + tmpsiz - s > 0);
if (the_lnet.ln_rtrpools == NULL)
lnet_net_lock(LNET_LOCK_EX);
cfs_percpt_for_each(rbp, i, the_lnet.ln_rtrpools) {
- s += snprintf(s, tmpstr + tmpsiz - s,
- "%5d %5d %7d %7d\n",
- rbp[idx].rbp_npages,
- rbp[idx].rbp_nbuffers,
- rbp[idx].rbp_credits,
- rbp[idx].rbp_mincredits);
+ s += scnprintf(s, tmpstr + tmpsiz - s,
+ "%5d %5d %7d %7d\n",
+ rbp[idx].rbp_npages,
+ rbp[idx].rbp_nbuffers,
+ rbp[idx].rbp_credits,
+ rbp[idx].rbp_mincredits);
LASSERT(tmpstr + tmpsiz - s > 0);
}
lnet_net_unlock(LNET_LOCK_EX);
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");
+ s += scnprintf(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 {
struct lnet_ni *ni = NULL;
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);
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) {
if (i != 0)
lnet_net_lock(i);
- s += snprintf(s, tmpstr + tmpsiz - s,
- "%-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,
- ni->ni_net->net_tunables.lct_peer_rtr_credits,
- tq->tq_credits_max,
- tq->tq_credits, tq->tq_credits_min);
+ s += scnprintf(s, tmpstr + tmpsiz - s,
+ "%-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,
+ ni->ni_net->net_tunables.lct_peer_rtr_credits,
+ tq->tq_credits_max,
+ tq->tq_credits, tq->tq_credits_min);
if (i != 0)
lnet_net_unlock(i);
}
int rc;
int i;
- LIBCFS_ALLOC(buf, buf_len);
- if (buf == NULL)
- return -ENOMEM;
-
if (!write) {
+ LIBCFS_ALLOC(buf, buf_len);
+ if (buf == NULL)
+ return -ENOMEM;
+
lnet_res_lock(0);
for (i = 0; portal_rotors[i].pr_value >= 0; i++) {
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);
+ rc = scnprintf(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");
+ buf + pos, "\n");
}
- goto out;
+ LIBCFS_FREE(buf, buf_len);
+
+ return rc;
}
- rc = cfs_trace_copyin_string(buf, buf_len, buffer, nob);
- if (rc < 0)
- goto out;
+ buf = memdup_user_nul(buffer, nob);
+ if (!buf)
+ return -ENOMEM;
tmp = strim(buf);
}
}
lnet_res_unlock(0);
-out:
- LIBCFS_FREE(buf, buf_len);
+ kfree(buf);
+
return rc;
}
* 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 = 0644,
.proc_handler = &proc_lnet_peers,
},
{
- INIT_CTL_NAME
.procname = "buffers",
.mode = 0444,
.proc_handler = &proc_lnet_buffers,
},
{
- INIT_CTL_NAME
.procname = "nis",
.mode = 0644,
.proc_handler = &proc_lnet_nis,
},
{
- INIT_CTL_NAME
.procname = "portal_rotor",
.mode = 0644,
.proc_handler = &proc_lnet_portal_rotor,
},
+ {
+ .procname = "lnet_lnd_timeout",
+ .data = &lnet_lnd_timeout,
+ .maxlen = sizeof(lnet_lnd_timeout),
+ .mode = 0444,
+ .proc_handler = &debugfs_doint,
+ },
{ .procname = NULL }
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff