Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60dbb20 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst 



It seems strange to maintain stats for bytes_sent in one structure, and
bytes received in another. Try to assemble all the RPC request-related
stats in struct rpc_rqst

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9c7e7e23

include/linux/sunrpc/sched.h

+1 −3
Original line number Diff line number Diff line
@@ -80,9 +80,7 @@ struct rpc_task { 
	} u;



	unsigned short		tk_timeouts;	/* maj timeouts */

	size_t			tk_bytes_sent;	/* total bytes sent */

	ktime_t			tk_start,	/* RPC task init timestamp */

				tk_rtt;		/* round-trip time */

	ktime_t			tk_start;	/* RPC task init timestamp */



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

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

include/linux/sunrpc/xprt.h

+4 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ struct rpc_rqst { 
	struct rpc_task *	rq_task;	/* RPC task data */

	__be32			rq_xid;		/* request XID */

	int			rq_cong;	/* has incremented xprt->cong */

	int			rq_reply_bytes_recvd;	/* number of reply */

							/* bytes received */

	u32			rq_seqno;	/* gss seq no. used on req. */

	int			rq_enc_pages_num;

	struct page		**rq_enc_pages;	/* scratch pages for use by
@@ -78,12 +76,16 @@ struct rpc_rqst { 
	__u32 *			rq_buffer;	/* XDR encode buffer */

	size_t			rq_callsize,

				rq_rcvsize;

	size_t			rq_xmit_bytes_sent;	/* total bytes sent */

	size_t			rq_reply_bytes_recvd;	/* total reply bytes */

							/* received */



	struct xdr_buf		rq_private_buf;		/* The receive buffer

							 * used in the softirq.

							 */

	unsigned long		rq_majortimeo;	/* major timeout alarm */

	unsigned long		rq_timeout;	/* Current timeout value */

	ktime_t			rq_rtt;		/* round-trip time */

	unsigned int		rq_retries;	/* # of retries */

	unsigned int		rq_connect_cookie;

						/* A cookie used to track the

net/sunrpc/stats.c

+2 −2
Original line number Diff line number Diff line
@@ -156,13 +156,13 @@ void rpc_count_iostats(struct rpc_task *task) 
	op_metrics->om_ntrans += req->rq_ntrans;

	op_metrics->om_timeouts += task->tk_timeouts;



	op_metrics->om_bytes_sent += task->tk_bytes_sent;

	op_metrics->om_bytes_sent += req->rq_xmit_bytes_sent;

	op_metrics->om_bytes_recv += req->rq_reply_bytes_recvd;



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

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



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

	op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, req->rq_rtt);



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

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

net/sunrpc/xprt.c

+2 −2
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ static void xprt_update_rtt(struct rpc_task *task) 
	struct rpc_rqst *req = task->tk_rqstp;

	struct rpc_rtt *rtt = task->tk_client->cl_rtt;

	unsigned timer = task->tk_msg.rpc_proc->p_timer;

	long m = usecs_to_jiffies(ktime_to_us(task->tk_rtt));

	long m = usecs_to_jiffies(ktime_to_us(req->rq_rtt));



	if (timer) {

		if (req->rq_ntrans == 1)
@@ -805,7 +805,7 @@ void xprt_complete_rqst(struct rpc_task *task, int copied) 
			task->tk_pid, ntohl(req->rq_xid), copied);



	xprt->stat.recvs++;

	task->tk_rtt = ktime_sub(ktime_get(), req->rq_xtime);

	req->rq_rtt = ktime_sub(ktime_get(), req->rq_xtime);

	if (xprt->ops->timer != NULL)

		xprt_update_rtt(task);

net/sunrpc/xprtrdma/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ xprt_rdma_send_request(struct rpc_task *task) 
	if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req))

		goto drop_connection;



	task->tk_bytes_sent += rqst->rq_snd_buf.len;

	rqst->rq_xmit_bytes_sent += rqst->rq_snd_buf.len;

	rqst->rq_bytes_sent = 0;

	return 0;