2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* linux/net/sunrpc/stats.c
|
|
|
|
*
|
|
|
|
* procfs-based user access to generic RPC statistics. The stats files
|
|
|
|
* reside in /proc/net/rpc.
|
|
|
|
*
|
|
|
|
* The read routines assume that the buffer passed in is just big enough.
|
|
|
|
* If you implement an RPC service that has its own stats routine which
|
|
|
|
* appends the generic RPC stats, make sure you don't exceed the PAGE_SIZE
|
|
|
|
* limit.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
#include <linux/seq_file.h>
|
|
|
|
#include <linux/sunrpc/clnt.h>
|
|
|
|
#include <linux/sunrpc/svcsock.h>
|
2006-03-21 01:44:22 +07:00
|
|
|
#include <linux/sunrpc/metrics.h>
|
2012-03-02 05:00:56 +07:00
|
|
|
#include <linux/rcupdate.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-09-27 17:01:58 +07:00
|
|
|
#include "netns.h"
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-09-27 17:01:58 +07:00
|
|
|
#define RPCDBG_FACILITY RPCDBG_MISC
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Get RPC client stats
|
|
|
|
*/
|
|
|
|
static int rpc_proc_show(struct seq_file *seq, void *v) {
|
|
|
|
const struct rpc_stat *statp = seq->private;
|
|
|
|
const struct rpc_program *prog = statp->program;
|
2007-10-27 00:32:56 +07:00
|
|
|
unsigned int i, j;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
seq_printf(seq,
|
2005-09-07 05:18:03 +07:00
|
|
|
"net %u %u %u %u\n",
|
2005-04-17 05:20:36 +07:00
|
|
|
statp->netcnt,
|
|
|
|
statp->netudpcnt,
|
|
|
|
statp->nettcpcnt,
|
|
|
|
statp->nettcpconn);
|
|
|
|
seq_printf(seq,
|
2005-09-07 05:18:03 +07:00
|
|
|
"rpc %u %u %u\n",
|
2005-04-17 05:20:36 +07:00
|
|
|
statp->rpccnt,
|
|
|
|
statp->rpcretrans,
|
|
|
|
statp->rpcauthrefresh);
|
|
|
|
|
|
|
|
for (i = 0; i < prog->nrvers; i++) {
|
|
|
|
const struct rpc_version *vers = prog->version[i];
|
|
|
|
if (!vers)
|
|
|
|
continue;
|
2005-09-07 05:18:03 +07:00
|
|
|
seq_printf(seq, "proc%u %u",
|
2005-04-17 05:20:36 +07:00
|
|
|
vers->number, vers->nrprocs);
|
|
|
|
for (j = 0; j < vers->nrprocs; j++)
|
2005-09-07 05:18:03 +07:00
|
|
|
seq_printf(seq, " %u",
|
2005-04-17 05:20:36 +07:00
|
|
|
vers->procs[j].p_count);
|
|
|
|
seq_putc(seq, '\n');
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rpc_proc_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
2013-04-01 05:16:14 +07:00
|
|
|
return single_open(file, rpc_proc_show, PDE_DATA(inode));
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2007-02-12 15:55:36 +07:00
|
|
|
static const struct file_operations rpc_proc_fops = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = rpc_proc_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
|
|
|
.release = single_release,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get RPC server stats
|
|
|
|
*/
|
|
|
|
void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) {
|
|
|
|
const struct svc_program *prog = statp->program;
|
|
|
|
const struct svc_procedure *proc;
|
|
|
|
const struct svc_version *vers;
|
2007-10-27 00:32:56 +07:00
|
|
|
unsigned int i, j;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
seq_printf(seq,
|
2005-09-07 05:18:03 +07:00
|
|
|
"net %u %u %u %u\n",
|
2005-04-17 05:20:36 +07:00
|
|
|
statp->netcnt,
|
|
|
|
statp->netudpcnt,
|
|
|
|
statp->nettcpcnt,
|
|
|
|
statp->nettcpconn);
|
|
|
|
seq_printf(seq,
|
2005-09-07 05:18:03 +07:00
|
|
|
"rpc %u %u %u %u %u\n",
|
2005-04-17 05:20:36 +07:00
|
|
|
statp->rpccnt,
|
|
|
|
statp->rpcbadfmt+statp->rpcbadauth+statp->rpcbadclnt,
|
|
|
|
statp->rpcbadfmt,
|
|
|
|
statp->rpcbadauth,
|
|
|
|
statp->rpcbadclnt);
|
|
|
|
|
|
|
|
for (i = 0; i < prog->pg_nvers; i++) {
|
|
|
|
if (!(vers = prog->pg_vers[i]) || !(proc = vers->vs_proc))
|
|
|
|
continue;
|
2005-09-07 05:18:03 +07:00
|
|
|
seq_printf(seq, "proc%d %u", i, vers->vs_nproc);
|
2005-04-17 05:20:36 +07:00
|
|
|
for (j = 0; j < vers->vs_nproc; j++, proc++)
|
2005-09-07 05:18:03 +07:00
|
|
|
seq_printf(seq, " %u", proc->pc_count);
|
2005-04-17 05:20:36 +07:00
|
|
|
seq_putc(seq, '\n');
|
|
|
|
}
|
|
|
|
}
|
2008-12-24 04:30:12 +07:00
|
|
|
EXPORT_SYMBOL_GPL(svc_seq_show);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2006-03-21 01:44:22 +07:00
|
|
|
/**
|
|
|
|
* rpc_alloc_iostats - allocate an rpc_iostats structure
|
|
|
|
* @clnt: RPC program, version, and xprt
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
struct rpc_iostats *rpc_alloc_iostats(struct rpc_clnt *clnt)
|
|
|
|
{
|
2014-11-09 08:15:09 +07:00
|
|
|
struct rpc_iostats *stats;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
stats = kcalloc(clnt->cl_maxproc, sizeof(*stats), GFP_KERNEL);
|
|
|
|
if (stats) {
|
|
|
|
for (i = 0; i < clnt->cl_maxproc; i++)
|
|
|
|
spin_lock_init(&stats[i].om_lock);
|
|
|
|
}
|
|
|
|
return stats;
|
2006-03-21 01:44:22 +07:00
|
|
|
}
|
2007-07-15 02:39:59 +07:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_alloc_iostats);
|
2006-03-21 01:44:22 +07:00
|
|
|
|
|
|
|
/**
|
|
|
|
* rpc_free_iostats - release an rpc_iostats structure
|
|
|
|
* @stats: doomed rpc_iostats structure
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void rpc_free_iostats(struct rpc_iostats *stats)
|
|
|
|
{
|
|
|
|
kfree(stats);
|
|
|
|
}
|
2007-07-15 02:39:59 +07:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_free_iostats);
|
2006-03-21 01:44:22 +07:00
|
|
|
|
|
|
|
/**
|
2014-06-24 21:59:52 +07:00
|
|
|
* rpc_count_iostats_metrics - tally up per-task stats
|
2006-03-21 01:44:22 +07:00
|
|
|
* @task: completed rpc_task
|
2014-06-24 21:59:52 +07:00
|
|
|
* @op_metrics: stat structure for OP that will accumulate stats from @task
|
2006-03-21 01:44:22 +07:00
|
|
|
*/
|
2014-06-24 21:59:52 +07:00
|
|
|
void rpc_count_iostats_metrics(const struct rpc_task *task,
|
|
|
|
struct rpc_iostats *op_metrics)
|
2006-03-21 01:44:22 +07:00
|
|
|
{
|
|
|
|
struct rpc_rqst *req = task->tk_rqstp;
|
2014-11-09 08:15:09 +07:00
|
|
|
ktime_t delta, now;
|
2006-03-21 01:44:22 +07:00
|
|
|
|
2014-06-24 21:59:52 +07:00
|
|
|
if (!op_metrics || !req)
|
2006-03-21 01:44:22 +07:00
|
|
|
return;
|
2009-04-01 20:23:03 +07:00
|
|
|
|
2014-11-09 08:15:09 +07:00
|
|
|
now = ktime_get();
|
|
|
|
spin_lock(&op_metrics->om_lock);
|
|
|
|
|
2006-03-21 01:44:22 +07:00
|
|
|
op_metrics->om_ops++;
|
|
|
|
op_metrics->om_ntrans += req->rq_ntrans;
|
|
|
|
op_metrics->om_timeouts += task->tk_timeouts;
|
|
|
|
|
2010-05-13 23:51:49 +07:00
|
|
|
op_metrics->om_bytes_sent += req->rq_xmit_bytes_sent;
|
2009-04-01 20:23:28 +07:00
|
|
|
op_metrics->om_bytes_recv += req->rq_reply_bytes_recvd;
|
2006-03-21 01:44:22 +07:00
|
|
|
|
2010-05-08 00:34:47 +07:00
|
|
|
delta = ktime_sub(req->rq_xtime, task->tk_start);
|
|
|
|
op_metrics->om_queue = ktime_add(op_metrics->om_queue, delta);
|
2006-03-21 01:44:22 +07:00
|
|
|
|
2010-05-13 23:51:49 +07:00
|
|
|
op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, req->rq_rtt);
|
2006-03-21 01:44:22 +07:00
|
|
|
|
2014-11-09 08:15:09 +07:00
|
|
|
delta = ktime_sub(now, task->tk_start);
|
2010-05-08 00:34:47 +07:00
|
|
|
op_metrics->om_execute = ktime_add(op_metrics->om_execute, delta);
|
2014-11-09 08:15:09 +07:00
|
|
|
|
|
|
|
spin_unlock(&op_metrics->om_lock);
|
2006-03-21 01:44:22 +07:00
|
|
|
}
|
2014-06-24 21:59:52 +07:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_count_iostats_metrics);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* rpc_count_iostats - tally up per-task stats
|
|
|
|
* @task: completed rpc_task
|
|
|
|
* @stats: array of stat structures
|
|
|
|
*
|
|
|
|
* Uses the statidx from @task
|
|
|
|
*/
|
|
|
|
void rpc_count_iostats(const struct rpc_task *task, struct rpc_iostats *stats)
|
|
|
|
{
|
|
|
|
rpc_count_iostats_metrics(task,
|
|
|
|
&stats[task->tk_msg.rpc_proc->p_statidx]);
|
|
|
|
}
|
2012-02-18 01:15:24 +07:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_count_iostats);
|
2006-03-21 01:44:22 +07:00
|
|
|
|
2006-04-19 00:21:50 +07:00
|
|
|
static void _print_name(struct seq_file *seq, unsigned int op,
|
|
|
|
struct rpc_procinfo *procs)
|
2006-03-21 01:44:22 +07:00
|
|
|
{
|
|
|
|
if (procs[op].p_name)
|
|
|
|
seq_printf(seq, "\t%12s: ", procs[op].p_name);
|
|
|
|
else if (op == 0)
|
|
|
|
seq_printf(seq, "\t NULL: ");
|
|
|
|
else
|
|
|
|
seq_printf(seq, "\t%12u: ", op);
|
|
|
|
}
|
|
|
|
|
2006-03-21 01:44:22 +07:00
|
|
|
void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt)
|
|
|
|
{
|
|
|
|
struct rpc_iostats *stats = clnt->cl_metrics;
|
2012-03-02 05:00:56 +07:00
|
|
|
struct rpc_xprt *xprt;
|
2006-03-21 01:44:22 +07:00
|
|
|
unsigned int op, maxproc = clnt->cl_maxproc;
|
|
|
|
|
|
|
|
if (!stats)
|
|
|
|
return;
|
|
|
|
|
|
|
|
seq_printf(seq, "\tRPC iostats version: %s ", RPC_IOSTATS_VERS);
|
|
|
|
seq_printf(seq, "p/v: %u/%u (%s)\n",
|
2013-08-23 22:48:15 +07:00
|
|
|
clnt->cl_prog, clnt->cl_vers, clnt->cl_program->name);
|
2006-03-21 01:44:22 +07:00
|
|
|
|
2012-03-02 05:00:56 +07:00
|
|
|
rcu_read_lock();
|
|
|
|
xprt = rcu_dereference(clnt->cl_xprt);
|
2006-03-21 01:44:22 +07:00
|
|
|
if (xprt)
|
|
|
|
xprt->ops->print_stats(xprt, seq);
|
2012-03-02 05:00:56 +07:00
|
|
|
rcu_read_unlock();
|
2006-03-21 01:44:22 +07:00
|
|
|
|
|
|
|
seq_printf(seq, "\tper-op statistics\n");
|
|
|
|
for (op = 0; op < maxproc; op++) {
|
|
|
|
struct rpc_iostats *metrics = &stats[op];
|
2006-03-21 01:44:22 +07:00
|
|
|
_print_name(seq, op, clnt->cl_procinfo);
|
2006-03-21 01:44:22 +07:00
|
|
|
seq_printf(seq, "%lu %lu %lu %Lu %Lu %Lu %Lu %Lu\n",
|
|
|
|
metrics->om_ops,
|
|
|
|
metrics->om_ntrans,
|
|
|
|
metrics->om_timeouts,
|
|
|
|
metrics->om_bytes_sent,
|
|
|
|
metrics->om_bytes_recv,
|
2010-05-08 00:34:47 +07:00
|
|
|
ktime_to_ms(metrics->om_queue),
|
|
|
|
ktime_to_ms(metrics->om_rtt),
|
|
|
|
ktime_to_ms(metrics->om_execute));
|
2006-03-21 01:44:22 +07:00
|
|
|
}
|
|
|
|
}
|
2007-07-15 02:39:59 +07:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_print_iostats);
|
2006-03-21 01:44:22 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* Register/unregister RPC proc files
|
|
|
|
*/
|
|
|
|
static inline struct proc_dir_entry *
|
2011-12-06 20:42:40 +07:00
|
|
|
do_register(struct net *net, const char *name, void *data,
|
|
|
|
const struct file_operations *fops)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-09-27 17:01:58 +07:00
|
|
|
struct sunrpc_net *sn;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-09-27 17:01:58 +07:00
|
|
|
dprintk("RPC: registering /proc/net/rpc/%s\n", name);
|
2011-12-06 20:42:40 +07:00
|
|
|
sn = net_generic(net, sunrpc_net_id);
|
2010-09-27 17:01:58 +07:00
|
|
|
return proc_create_data(name, 0, sn->proc_net_rpc, fops, data);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
struct proc_dir_entry *
|
2011-12-06 20:42:40 +07:00
|
|
|
rpc_proc_register(struct net *net, struct rpc_stat *statp)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2011-12-06 20:42:40 +07:00
|
|
|
return do_register(net, statp->program->name, statp, &rpc_proc_fops);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2007-07-15 02:39:59 +07:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_proc_register);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
void
|
2011-12-06 20:42:40 +07:00
|
|
|
rpc_proc_unregister(struct net *net, const char *name)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-09-27 17:01:58 +07:00
|
|
|
struct sunrpc_net *sn;
|
|
|
|
|
2011-12-06 20:42:40 +07:00
|
|
|
sn = net_generic(net, sunrpc_net_id);
|
2010-09-27 17:01:58 +07:00
|
|
|
remove_proc_entry(name, sn->proc_net_rpc);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2007-07-15 02:39:59 +07:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_proc_unregister);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
struct proc_dir_entry *
|
2011-12-06 20:42:49 +07:00
|
|
|
svc_proc_register(struct net *net, struct svc_stat *statp, const struct file_operations *fops)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2011-12-06 20:42:49 +07:00
|
|
|
return do_register(net, statp->program->pg_name, statp, fops);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2008-12-24 04:30:12 +07:00
|
|
|
EXPORT_SYMBOL_GPL(svc_proc_register);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
void
|
2011-12-06 20:42:49 +07:00
|
|
|
svc_proc_unregister(struct net *net, const char *name)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-09-27 17:01:58 +07:00
|
|
|
struct sunrpc_net *sn;
|
|
|
|
|
2011-12-06 20:42:49 +07:00
|
|
|
sn = net_generic(net, sunrpc_net_id);
|
2010-09-27 17:01:58 +07:00
|
|
|
remove_proc_entry(name, sn->proc_net_rpc);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2008-12-24 04:30:12 +07:00
|
|
|
EXPORT_SYMBOL_GPL(svc_proc_unregister);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-09-27 17:01:58 +07:00
|
|
|
int rpc_proc_init(struct net *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-09-27 17:01:58 +07:00
|
|
|
struct sunrpc_net *sn;
|
|
|
|
|
2007-02-01 00:14:08 +07:00
|
|
|
dprintk("RPC: registering /proc/net/rpc\n");
|
2010-09-27 17:01:58 +07:00
|
|
|
sn = net_generic(net, sunrpc_net_id);
|
|
|
|
sn->proc_net_rpc = proc_mkdir("rpc", net->proc_net);
|
|
|
|
if (sn->proc_net_rpc == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2010-09-27 17:01:58 +07:00
|
|
|
void rpc_proc_exit(struct net *net)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2007-02-01 00:14:08 +07:00
|
|
|
dprintk("RPC: unregistering /proc/net/rpc\n");
|
2010-09-27 17:01:58 +07:00
|
|
|
remove_proc_entry("rpc", net->proc_net);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|