2019-05-19 15:08:55 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2005-04-17 02:20:36 +04: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 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 02:20:36 +04: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-20 21:44:22 +03:00
|
|
|
#include <linux/sunrpc/metrics.h>
|
2012-03-02 02:00:56 +04:00
|
|
|
#include <linux/rcupdate.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2018-03-16 17:33:49 +03:00
|
|
|
#include <trace/events/sunrpc.h>
|
|
|
|
|
2010-09-27 14:01:58 +04:00
|
|
|
#include "netns.h"
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-27 14:01:58 +04:00
|
|
|
#define RPCDBG_FACILITY RPCDBG_MISC
|
2005-04-17 02:20:36 +04: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-26 21:32:56 +04:00
|
|
|
unsigned int i, j;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
seq_printf(seq,
|
2005-09-07 02:18:03 +04:00
|
|
|
"net %u %u %u %u\n",
|
2005-04-17 02:20:36 +04:00
|
|
|
statp->netcnt,
|
|
|
|
statp->netudpcnt,
|
|
|
|
statp->nettcpcnt,
|
|
|
|
statp->nettcpconn);
|
|
|
|
seq_printf(seq,
|
2005-09-07 02:18:03 +04:00
|
|
|
"rpc %u %u %u\n",
|
2005-04-17 02:20:36 +04: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 02:18:03 +04:00
|
|
|
seq_printf(seq, "proc%u %u",
|
2005-04-17 02:20:36 +04:00
|
|
|
vers->number, vers->nrprocs);
|
|
|
|
for (j = 0; j < vers->nrprocs; j++)
|
2017-05-09 00:27:10 +03:00
|
|
|
seq_printf(seq, " %u", vers->counts[j]);
|
2005-04-17 02:20:36 +04:00
|
|
|
seq_putc(seq, '\n');
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rpc_proc_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
2013-04-01 02:16:14 +04:00
|
|
|
return single_open(file, rpc_proc_show, PDE_DATA(inode));
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-02-12 11:55:36 +03:00
|
|
|
static const struct file_operations rpc_proc_fops = {
|
2005-04-17 02:20:36 +04:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = rpc_proc_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
|
|
|
.release = single_release,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get RPC server stats
|
|
|
|
*/
|
2017-05-09 00:40:27 +03:00
|
|
|
void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp)
|
|
|
|
{
|
2005-04-17 02:20:36 +04:00
|
|
|
const struct svc_program *prog = statp->program;
|
|
|
|
const struct svc_version *vers;
|
2007-10-26 21:32:56 +04:00
|
|
|
unsigned int i, j;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
seq_printf(seq,
|
2005-09-07 02:18:03 +04:00
|
|
|
"net %u %u %u %u\n",
|
2005-04-17 02:20:36 +04:00
|
|
|
statp->netcnt,
|
|
|
|
statp->netudpcnt,
|
|
|
|
statp->nettcpcnt,
|
|
|
|
statp->nettcpconn);
|
|
|
|
seq_printf(seq,
|
2005-09-07 02:18:03 +04:00
|
|
|
"rpc %u %u %u %u %u\n",
|
2005-04-17 02:20:36 +04:00
|
|
|
statp->rpccnt,
|
|
|
|
statp->rpcbadfmt+statp->rpcbadauth+statp->rpcbadclnt,
|
|
|
|
statp->rpcbadfmt,
|
|
|
|
statp->rpcbadauth,
|
|
|
|
statp->rpcbadclnt);
|
|
|
|
|
|
|
|
for (i = 0; i < prog->pg_nvers; i++) {
|
2017-05-09 00:40:27 +03:00
|
|
|
vers = prog->pg_vers[i];
|
|
|
|
if (!vers)
|
2005-04-17 02:20:36 +04:00
|
|
|
continue;
|
2005-09-07 02:18:03 +04:00
|
|
|
seq_printf(seq, "proc%d %u", i, vers->vs_nproc);
|
2017-05-09 00:40:27 +03:00
|
|
|
for (j = 0; j < vers->vs_nproc; j++)
|
|
|
|
seq_printf(seq, " %u", vers->vs_count[j]);
|
2005-04-17 02:20:36 +04:00
|
|
|
seq_putc(seq, '\n');
|
|
|
|
}
|
|
|
|
}
|
2008-12-24 00:30:12 +03:00
|
|
|
EXPORT_SYMBOL_GPL(svc_seq_show);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-03-20 21:44:22 +03: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 04:15:09 +03: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-20 21:44:22 +03:00
|
|
|
}
|
2007-07-14 23:39:59 +04:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_alloc_iostats);
|
2006-03-20 21:44:22 +03: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-14 23:39:59 +04:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_free_iostats);
|
2006-03-20 21:44:22 +03:00
|
|
|
|
|
|
|
/**
|
2014-06-24 18:59:52 +04:00
|
|
|
* rpc_count_iostats_metrics - tally up per-task stats
|
2006-03-20 21:44:22 +03:00
|
|
|
* @task: completed rpc_task
|
2014-06-24 18:59:52 +04:00
|
|
|
* @op_metrics: stat structure for OP that will accumulate stats from @task
|
2006-03-20 21:44:22 +03:00
|
|
|
*/
|
2014-06-24 18:59:52 +04:00
|
|
|
void rpc_count_iostats_metrics(const struct rpc_task *task,
|
|
|
|
struct rpc_iostats *op_metrics)
|
2006-03-20 21:44:22 +03:00
|
|
|
{
|
|
|
|
struct rpc_rqst *req = task->tk_rqstp;
|
2018-03-16 17:33:49 +03:00
|
|
|
ktime_t backlog, execute, now;
|
2006-03-20 21:44:22 +03:00
|
|
|
|
2014-06-24 18:59:52 +04:00
|
|
|
if (!op_metrics || !req)
|
2006-03-20 21:44:22 +03:00
|
|
|
return;
|
2009-04-01 17:23:03 +04:00
|
|
|
|
2014-11-09 04:15:09 +03:00
|
|
|
now = ktime_get();
|
|
|
|
spin_lock(&op_metrics->om_lock);
|
|
|
|
|
2006-03-20 21:44:22 +03:00
|
|
|
op_metrics->om_ops++;
|
SUNRPC: Proper metric accounting when RPC is not transmitted
I noticed recently that during an xfstests on a krb5i mount, the
retransmit count for certain operations had gone negative, and the
backlog value became unreasonably large. I recall that Andy has
pointed this out to me in the past.
When call_refresh fails to find a valid credential for an RPC, the
RPC exits immediately without sending anything on the wire. This
leaves rq_ntrans, rq_xtime, and rq_rtt set to zero.
The solution for om_queue is to not add the to RPC's running backlog
queue total whenever rq_xtime is zero.
For om_ntrans, it's a bit more difficult. A zero rq_ntrans causes
om_ops to become larger than om_ntrans. The design of the RPC
metrics API assumes that ntrans will always be equal to or larger
than the ops count. The result is that when an RPC fails to find
credentials, the RPC operation's reported retransmit count, which is
computed in user space as the difference between ops and ntrans,
goes negative.
Ideally the kernel API should report a separate retransmit and
"exited before initial transmission" metric, so that user space can
sort out the difference properly.
To avoid kernel API changes and changes to the way rq_ntrans is used
when performing transport locking, account for untransmitted RPCs
so that om_ntrans keeps up with om_ops: always add one or more to
om_ntrans.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-11-29 18:52:32 +03:00
|
|
|
/* kernel API: om_ops must never become larger than om_ntrans */
|
|
|
|
op_metrics->om_ntrans += max(req->rq_ntrans, 1);
|
2006-03-20 21:44:22 +03:00
|
|
|
op_metrics->om_timeouts += task->tk_timeouts;
|
|
|
|
|
2010-05-13 20:51:49 +04:00
|
|
|
op_metrics->om_bytes_sent += req->rq_xmit_bytes_sent;
|
2009-04-01 17:23:28 +04:00
|
|
|
op_metrics->om_bytes_recv += req->rq_reply_bytes_recvd;
|
2006-03-20 21:44:22 +03:00
|
|
|
|
2018-03-16 17:33:49 +03:00
|
|
|
backlog = 0;
|
SUNRPC: Proper metric accounting when RPC is not transmitted
I noticed recently that during an xfstests on a krb5i mount, the
retransmit count for certain operations had gone negative, and the
backlog value became unreasonably large. I recall that Andy has
pointed this out to me in the past.
When call_refresh fails to find a valid credential for an RPC, the
RPC exits immediately without sending anything on the wire. This
leaves rq_ntrans, rq_xtime, and rq_rtt set to zero.
The solution for om_queue is to not add the to RPC's running backlog
queue total whenever rq_xtime is zero.
For om_ntrans, it's a bit more difficult. A zero rq_ntrans causes
om_ops to become larger than om_ntrans. The design of the RPC
metrics API assumes that ntrans will always be equal to or larger
than the ops count. The result is that when an RPC fails to find
credentials, the RPC operation's reported retransmit count, which is
computed in user space as the difference between ops and ntrans,
goes negative.
Ideally the kernel API should report a separate retransmit and
"exited before initial transmission" metric, so that user space can
sort out the difference properly.
To avoid kernel API changes and changes to the way rq_ntrans is used
when performing transport locking, account for untransmitted RPCs
so that om_ntrans keeps up with om_ops: always add one or more to
om_ntrans.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-11-29 18:52:32 +03:00
|
|
|
if (ktime_to_ns(req->rq_xtime)) {
|
2018-03-16 17:33:49 +03:00
|
|
|
backlog = ktime_sub(req->rq_xtime, task->tk_start);
|
|
|
|
op_metrics->om_queue = ktime_add(op_metrics->om_queue, backlog);
|
SUNRPC: Proper metric accounting when RPC is not transmitted
I noticed recently that during an xfstests on a krb5i mount, the
retransmit count for certain operations had gone negative, and the
backlog value became unreasonably large. I recall that Andy has
pointed this out to me in the past.
When call_refresh fails to find a valid credential for an RPC, the
RPC exits immediately without sending anything on the wire. This
leaves rq_ntrans, rq_xtime, and rq_rtt set to zero.
The solution for om_queue is to not add the to RPC's running backlog
queue total whenever rq_xtime is zero.
For om_ntrans, it's a bit more difficult. A zero rq_ntrans causes
om_ops to become larger than om_ntrans. The design of the RPC
metrics API assumes that ntrans will always be equal to or larger
than the ops count. The result is that when an RPC fails to find
credentials, the RPC operation's reported retransmit count, which is
computed in user space as the difference between ops and ntrans,
goes negative.
Ideally the kernel API should report a separate retransmit and
"exited before initial transmission" metric, so that user space can
sort out the difference properly.
To avoid kernel API changes and changes to the way rq_ntrans is used
when performing transport locking, account for untransmitted RPCs
so that om_ntrans keeps up with om_ops: always add one or more to
om_ntrans.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2016-11-29 18:52:32 +03:00
|
|
|
}
|
2018-03-16 17:33:49 +03:00
|
|
|
|
2010-05-13 20:51:49 +04:00
|
|
|
op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, req->rq_rtt);
|
2006-03-20 21:44:22 +03:00
|
|
|
|
2018-03-16 17:33:49 +03:00
|
|
|
execute = ktime_sub(now, task->tk_start);
|
|
|
|
op_metrics->om_execute = ktime_add(op_metrics->om_execute, execute);
|
2014-11-09 04:15:09 +03:00
|
|
|
|
|
|
|
spin_unlock(&op_metrics->om_lock);
|
2018-03-16 17:33:49 +03:00
|
|
|
|
|
|
|
trace_rpc_stats_latency(req->rq_task, backlog, req->rq_rtt, execute);
|
2006-03-20 21:44:22 +03:00
|
|
|
}
|
2014-06-24 18:59:52 +04: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-17 22:15:24 +04:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_count_iostats);
|
2006-03-20 21:44:22 +03:00
|
|
|
|
2006-04-18 21:21:50 +04:00
|
|
|
static void _print_name(struct seq_file *seq, unsigned int op,
|
2017-05-12 16:36:49 +03:00
|
|
|
const struct rpc_procinfo *procs)
|
2006-03-20 21:44:22 +03: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);
|
|
|
|
}
|
|
|
|
|
2018-07-10 21:59:24 +03:00
|
|
|
static void _add_rpc_iostats(struct rpc_iostats *a, struct rpc_iostats *b)
|
|
|
|
{
|
|
|
|
a->om_ops += b->om_ops;
|
|
|
|
a->om_ntrans += b->om_ntrans;
|
|
|
|
a->om_timeouts += b->om_timeouts;
|
|
|
|
a->om_bytes_sent += b->om_bytes_sent;
|
|
|
|
a->om_bytes_recv += b->om_bytes_recv;
|
|
|
|
a->om_queue = ktime_add(a->om_queue, b->om_queue);
|
|
|
|
a->om_rtt = ktime_add(a->om_rtt, b->om_rtt);
|
|
|
|
a->om_execute = ktime_add(a->om_execute, b->om_execute);
|
|
|
|
}
|
|
|
|
|
2018-07-10 21:59:23 +03:00
|
|
|
static void _print_rpc_iostats(struct seq_file *seq, struct rpc_iostats *stats,
|
|
|
|
int op, const struct rpc_procinfo *procs)
|
|
|
|
{
|
|
|
|
_print_name(seq, op, procs);
|
|
|
|
seq_printf(seq, "%lu %lu %lu %Lu %Lu %Lu %Lu %Lu\n",
|
|
|
|
stats->om_ops,
|
|
|
|
stats->om_ntrans,
|
|
|
|
stats->om_timeouts,
|
|
|
|
stats->om_bytes_sent,
|
|
|
|
stats->om_bytes_recv,
|
|
|
|
ktime_to_ms(stats->om_queue),
|
|
|
|
ktime_to_ms(stats->om_rtt),
|
|
|
|
ktime_to_ms(stats->om_execute));
|
|
|
|
}
|
|
|
|
|
sunrpc: Change rpc_print_iostats to rpc_clnt_show_stats and handle rpc_clnt clones
The existing rpc_print_iostats has a few shortcomings. First, the naming
is not consistent with other functions in the kernel that display stats.
Second, it is really displaying stats for an rpc_clnt structure as it
displays both xprt stats and per-op stats. Third, it does not handle
rpc_clnt clones, which is important for the one in-kernel tree caller
of this function, the NFS client's nfs_show_stats function.
Fix all of the above by renaming the rpc_print_iostats to
rpc_clnt_show_stats and looping through any rpc_clnt clones via
cl_parent.
Once this interface is fixed, this addresses a problem with NFSv4.
Before this patch, the /proc/self/mountstats always showed incorrect
counts for NFSv4 lease and session related opcodes such as SEQUENCE,
RENEW, SETCLIENTID, CREATE_SESSION, etc. These counts were always 0
even though many ops would go over the wire. The reason for this is
there are multiple rpc_clnt structures allocated for any given NFSv4
mount, and inside nfs_show_stats() we callled into rpc_print_iostats()
which only handled one of them, nfs_server->client. Fix these counts
by calling sunrpc's new rpc_clnt_show_stats() function, which handles
cloned rpc_clnt structs and prints the stats together.
Note that one side-effect of the above is that multiple mounts from
the same NFS server will show identical counts in the above ops due
to the fact the one rpc_clnt (representing the NFSv4 client state)
is shared across mounts.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2018-07-31 17:10:51 +03:00
|
|
|
void rpc_clnt_show_stats(struct seq_file *seq, struct rpc_clnt *clnt)
|
2006-03-20 21:44:22 +03:00
|
|
|
{
|
2012-03-02 02:00:56 +04:00
|
|
|
struct rpc_xprt *xprt;
|
2006-03-20 21:44:22 +03:00
|
|
|
unsigned int op, maxproc = clnt->cl_maxproc;
|
|
|
|
|
sunrpc: Change rpc_print_iostats to rpc_clnt_show_stats and handle rpc_clnt clones
The existing rpc_print_iostats has a few shortcomings. First, the naming
is not consistent with other functions in the kernel that display stats.
Second, it is really displaying stats for an rpc_clnt structure as it
displays both xprt stats and per-op stats. Third, it does not handle
rpc_clnt clones, which is important for the one in-kernel tree caller
of this function, the NFS client's nfs_show_stats function.
Fix all of the above by renaming the rpc_print_iostats to
rpc_clnt_show_stats and looping through any rpc_clnt clones via
cl_parent.
Once this interface is fixed, this addresses a problem with NFSv4.
Before this patch, the /proc/self/mountstats always showed incorrect
counts for NFSv4 lease and session related opcodes such as SEQUENCE,
RENEW, SETCLIENTID, CREATE_SESSION, etc. These counts were always 0
even though many ops would go over the wire. The reason for this is
there are multiple rpc_clnt structures allocated for any given NFSv4
mount, and inside nfs_show_stats() we callled into rpc_print_iostats()
which only handled one of them, nfs_server->client. Fix these counts
by calling sunrpc's new rpc_clnt_show_stats() function, which handles
cloned rpc_clnt structs and prints the stats together.
Note that one side-effect of the above is that multiple mounts from
the same NFS server will show identical counts in the above ops due
to the fact the one rpc_clnt (representing the NFSv4 client state)
is shared across mounts.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2018-07-31 17:10:51 +03:00
|
|
|
if (!clnt->cl_metrics)
|
2006-03-20 21:44:22 +03:00
|
|
|
return;
|
|
|
|
|
|
|
|
seq_printf(seq, "\tRPC iostats version: %s ", RPC_IOSTATS_VERS);
|
|
|
|
seq_printf(seq, "p/v: %u/%u (%s)\n",
|
2013-08-23 19:48:15 +04:00
|
|
|
clnt->cl_prog, clnt->cl_vers, clnt->cl_program->name);
|
2006-03-20 21:44:22 +03:00
|
|
|
|
2012-03-02 02:00:56 +04:00
|
|
|
rcu_read_lock();
|
|
|
|
xprt = rcu_dereference(clnt->cl_xprt);
|
2006-03-20 21:44:22 +03:00
|
|
|
if (xprt)
|
|
|
|
xprt->ops->print_stats(xprt, seq);
|
2012-03-02 02:00:56 +04:00
|
|
|
rcu_read_unlock();
|
2006-03-20 21:44:22 +03:00
|
|
|
|
|
|
|
seq_printf(seq, "\tper-op statistics\n");
|
|
|
|
for (op = 0; op < maxproc; op++) {
|
sunrpc: Change rpc_print_iostats to rpc_clnt_show_stats and handle rpc_clnt clones
The existing rpc_print_iostats has a few shortcomings. First, the naming
is not consistent with other functions in the kernel that display stats.
Second, it is really displaying stats for an rpc_clnt structure as it
displays both xprt stats and per-op stats. Third, it does not handle
rpc_clnt clones, which is important for the one in-kernel tree caller
of this function, the NFS client's nfs_show_stats function.
Fix all of the above by renaming the rpc_print_iostats to
rpc_clnt_show_stats and looping through any rpc_clnt clones via
cl_parent.
Once this interface is fixed, this addresses a problem with NFSv4.
Before this patch, the /proc/self/mountstats always showed incorrect
counts for NFSv4 lease and session related opcodes such as SEQUENCE,
RENEW, SETCLIENTID, CREATE_SESSION, etc. These counts were always 0
even though many ops would go over the wire. The reason for this is
there are multiple rpc_clnt structures allocated for any given NFSv4
mount, and inside nfs_show_stats() we callled into rpc_print_iostats()
which only handled one of them, nfs_server->client. Fix these counts
by calling sunrpc's new rpc_clnt_show_stats() function, which handles
cloned rpc_clnt structs and prints the stats together.
Note that one side-effect of the above is that multiple mounts from
the same NFS server will show identical counts in the above ops due
to the fact the one rpc_clnt (representing the NFSv4 client state)
is shared across mounts.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2018-07-31 17:10:51 +03:00
|
|
|
struct rpc_iostats stats = {};
|
|
|
|
struct rpc_clnt *next = clnt;
|
|
|
|
do {
|
|
|
|
_add_rpc_iostats(&stats, &next->cl_metrics[op]);
|
|
|
|
if (next == next->cl_parent)
|
|
|
|
break;
|
|
|
|
next = next->cl_parent;
|
|
|
|
} while (next);
|
|
|
|
_print_rpc_iostats(seq, &stats, op, clnt->cl_procinfo);
|
2006-03-20 21:44:22 +03:00
|
|
|
}
|
|
|
|
}
|
sunrpc: Change rpc_print_iostats to rpc_clnt_show_stats and handle rpc_clnt clones
The existing rpc_print_iostats has a few shortcomings. First, the naming
is not consistent with other functions in the kernel that display stats.
Second, it is really displaying stats for an rpc_clnt structure as it
displays both xprt stats and per-op stats. Third, it does not handle
rpc_clnt clones, which is important for the one in-kernel tree caller
of this function, the NFS client's nfs_show_stats function.
Fix all of the above by renaming the rpc_print_iostats to
rpc_clnt_show_stats and looping through any rpc_clnt clones via
cl_parent.
Once this interface is fixed, this addresses a problem with NFSv4.
Before this patch, the /proc/self/mountstats always showed incorrect
counts for NFSv4 lease and session related opcodes such as SEQUENCE,
RENEW, SETCLIENTID, CREATE_SESSION, etc. These counts were always 0
even though many ops would go over the wire. The reason for this is
there are multiple rpc_clnt structures allocated for any given NFSv4
mount, and inside nfs_show_stats() we callled into rpc_print_iostats()
which only handled one of them, nfs_server->client. Fix these counts
by calling sunrpc's new rpc_clnt_show_stats() function, which handles
cloned rpc_clnt structs and prints the stats together.
Note that one side-effect of the above is that multiple mounts from
the same NFS server will show identical counts in the above ops due
to the fact the one rpc_clnt (representing the NFSv4 client state)
is shared across mounts.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
2018-07-31 17:10:51 +03:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_clnt_show_stats);
|
2006-03-20 21:44:22 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* Register/unregister RPC proc files
|
|
|
|
*/
|
|
|
|
static inline struct proc_dir_entry *
|
2011-12-06 17:42:40 +04:00
|
|
|
do_register(struct net *net, const char *name, void *data,
|
|
|
|
const struct file_operations *fops)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-09-27 14:01:58 +04:00
|
|
|
struct sunrpc_net *sn;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-27 14:01:58 +04:00
|
|
|
dprintk("RPC: registering /proc/net/rpc/%s\n", name);
|
2011-12-06 17:42:40 +04:00
|
|
|
sn = net_generic(net, sunrpc_net_id);
|
2010-09-27 14:01:58 +04:00
|
|
|
return proc_create_data(name, 0, sn->proc_net_rpc, fops, data);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
struct proc_dir_entry *
|
2011-12-06 17:42:40 +04:00
|
|
|
rpc_proc_register(struct net *net, struct rpc_stat *statp)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-06 17:42:40 +04:00
|
|
|
return do_register(net, statp->program->name, statp, &rpc_proc_fops);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2007-07-14 23:39:59 +04:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_proc_register);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
void
|
2011-12-06 17:42:40 +04:00
|
|
|
rpc_proc_unregister(struct net *net, const char *name)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-09-27 14:01:58 +04:00
|
|
|
struct sunrpc_net *sn;
|
|
|
|
|
2011-12-06 17:42:40 +04:00
|
|
|
sn = net_generic(net, sunrpc_net_id);
|
2010-09-27 14:01:58 +04:00
|
|
|
remove_proc_entry(name, sn->proc_net_rpc);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2007-07-14 23:39:59 +04:00
|
|
|
EXPORT_SYMBOL_GPL(rpc_proc_unregister);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
struct proc_dir_entry *
|
2011-12-06 17:42:49 +04:00
|
|
|
svc_proc_register(struct net *net, struct svc_stat *statp, const struct file_operations *fops)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-06 17:42:49 +04:00
|
|
|
return do_register(net, statp->program->pg_name, statp, fops);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2008-12-24 00:30:12 +03:00
|
|
|
EXPORT_SYMBOL_GPL(svc_proc_register);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
void
|
2011-12-06 17:42:49 +04:00
|
|
|
svc_proc_unregister(struct net *net, const char *name)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-09-27 14:01:58 +04:00
|
|
|
struct sunrpc_net *sn;
|
|
|
|
|
2011-12-06 17:42:49 +04:00
|
|
|
sn = net_generic(net, sunrpc_net_id);
|
2010-09-27 14:01:58 +04:00
|
|
|
remove_proc_entry(name, sn->proc_net_rpc);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2008-12-24 00:30:12 +03:00
|
|
|
EXPORT_SYMBOL_GPL(svc_proc_unregister);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-27 14:01:58 +04:00
|
|
|
int rpc_proc_init(struct net *net)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-09-27 14:01:58 +04:00
|
|
|
struct sunrpc_net *sn;
|
|
|
|
|
2007-01-31 20:14:08 +03:00
|
|
|
dprintk("RPC: registering /proc/net/rpc\n");
|
2010-09-27 14:01:58 +04: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 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2010-09-27 14:01:58 +04:00
|
|
|
void rpc_proc_exit(struct net *net)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2007-01-31 20:14:08 +03:00
|
|
|
dprintk("RPC: unregistering /proc/net/rpc\n");
|
2010-09-27 14:01:58 +04:00
|
|
|
remove_proc_entry("rpc", net->proc_net);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|