Commit ff839970 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Replace jiffies-based metrics with ktime-based metrics 



Currently RPC performance metrics that tabulate elapsed time use
jiffies time values.  This is problematic on systems that use slow
jiffies (for instance 100HZ systems built for paravirtualized
environments).  It is also a problem for computing precise latency
statistics for advanced network transports, such as InfiniBand,
that can have round-trip latencies significanly faster than a single
clock tick.

For the RPC client, adopt the high resolution time stamp mechanism
already used by the network layer and blktrace: ktime.

We use ktime format time stamps for all internal computations, and
convert to milliseconds for presentation.  As a result, we need only
addition operations in the performance critical paths; multiply/divide
is required only for presentation.

We could report RTT metrics in microseconds.  In fact the mountstats
format is versioned to accomodate exactly this kind of interface
improvement.

For now, however, we'll stay with millisecond precision for
presentation to maintain backwards compatibility with the handful of
currently deployed user space tools.  At a later point, we'll move to
an API such as BDI_STATS where a finer timestamp precision can be
reported.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f56916b9

include/linux/sunrpc/metrics.h

+4 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define _LINUX_SUNRPC_METRICS_H



#include <linux/seq_file.h>

#include <linux/ktime.h>



#define RPC_IOSTATS_VERS	"1.0"
@@ -58,9 +59,9 @@ struct rpc_iostats { 
	 * and the total time the request spent from init to release

	 * are measured.

	 */

	unsigned long long	om_queue,	/* jiffies queued for xmit */

				om_rtt,		/* jiffies for RPC RTT */

				om_execute;	/* jiffies for RPC execution */

	ktime_t			om_queue,	/* queued for xmit */

				om_rtt,		/* RPC RTT */

				om_execute;	/* RPC execution */

} ____cacheline_aligned;



struct rpc_task;

include/linux/sunrpc/sched.h

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define _LINUX_SUNRPC_SCHED_H_



#include <linux/timer.h>

#include <linux/ktime.h>

#include <linux/sunrpc/types.h>

#include <linux/spinlock.h>

#include <linux/wait.h>
@@ -80,8 +81,8 @@ struct rpc_task { 


	unsigned short		tk_timeouts;	/* maj timeouts */

	size_t			tk_bytes_sent;	/* total bytes sent */

	unsigned long		tk_start;	/* RPC task init timestamp */

	long			tk_rtt;		/* round-trip time (jiffies) */

	ktime_t			tk_start,	/* RPC task init timestamp */

				tk_rtt;		/* round-trip time */



	pid_t			tk_owner;	/* Process id for batching tasks */

	unsigned char		tk_priority : 2;/* Task priority */

include/linux/sunrpc/xprt.h

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/socket.h>

#include <linux/in.h>

#include <linux/kref.h>

#include <linux/ktime.h>

#include <linux/sunrpc/sched.h>

#include <linux/sunrpc/xdr.h>

#include <linux/sunrpc/msg_prot.h>
@@ -94,7 +95,7 @@ struct rpc_rqst { 
	 */

	u32			rq_bytes_sent;	/* Bytes we have sent */



	unsigned long		rq_xtime;	/* when transmitted */

	ktime_t			rq_xtime;	/* transmit time stamp */

	int			rq_ntrans;



#if defined(CONFIG_NFS_V4_1)

net/sunrpc/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta 
	}



	/* starting timestamp */

	task->tk_start = jiffies;

	task->tk_start = ktime_get();



	dprintk("RPC:       new task initialized, procpid %u\n",

				task_pid_nr(current));

net/sunrpc/stats.c

+9 −18
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void rpc_count_iostats(struct rpc_task *task) 
	struct rpc_rqst *req = task->tk_rqstp;

	struct rpc_iostats *stats;

	struct rpc_iostats *op_metrics;

	long rtt, execute, queue;

	ktime_t delta;



	if (!task->tk_client || !task->tk_client->cl_metrics || !req)

		return;
@@ -159,20 +159,13 @@ void rpc_count_iostats(struct rpc_task *task) 
	op_metrics->om_bytes_sent += task->tk_bytes_sent;

	op_metrics->om_bytes_recv += req->rq_reply_bytes_recvd;



	queue = (long)req->rq_xtime - task->tk_start;

	if (queue < 0)

		queue = -queue;

	op_metrics->om_queue += queue;

	delta = ktime_sub(req->rq_xtime, task->tk_start);

	op_metrics->om_queue = ktime_add(op_metrics->om_queue, delta);



	rtt = task->tk_rtt;

	if (rtt < 0)

		rtt = -rtt;

	op_metrics->om_rtt += rtt;

	op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, task->tk_rtt);



	execute = (long)jiffies - task->tk_start;

	if (execute < 0)

		execute = -execute;

	op_metrics->om_execute += execute;

	delta = ktime_sub(ktime_get(), task->tk_start);

	op_metrics->om_execute = ktime_add(op_metrics->om_execute, delta);

}



static void _print_name(struct seq_file *seq, unsigned int op,
@@ -186,8 +179,6 @@ static void _print_name(struct seq_file *seq, unsigned int op, 
		seq_printf(seq, "\t%12u: ", op);

}



#define MILLISECS_PER_JIFFY	(1000 / HZ)



void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt)

{

	struct rpc_iostats *stats = clnt->cl_metrics;
@@ -214,9 +205,9 @@ void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt) 
				metrics->om_timeouts,

				metrics->om_bytes_sent,

				metrics->om_bytes_recv,

				metrics->om_queue * MILLISECS_PER_JIFFY,

				metrics->om_rtt * MILLISECS_PER_JIFFY,

				metrics->om_execute * MILLISECS_PER_JIFFY);

				ktime_to_ms(metrics->om_queue),

				ktime_to_ms(metrics->om_rtt),

				ktime_to_ms(metrics->om_execute));

	}

}

EXPORT_SYMBOL_GPL(rpc_print_iostats);

CRA Git | Maintained and supported by SUSTech CRA and CCSE