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

Commit a25a4cb3 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

sunrpc: Add static trace point to report result of RPC ping 



This information can help track down local misconfiguration issues
as well as network partitions and unresponsive servers.

There are several ways to send a ping, and with transport multi-
plexing, the exact rpc_xprt that is used is sometimes not known by
the upper layer. The rpc_xprt pointer passed to the trace point
call also has to be RCU-safe.

I found a spot inside the client FSM where an rpc_xprt pointer is
always available and safe to use.

Suggested-by: default avatarBill Baker <Bill.Baker@oracle.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 40bf7eb3

include/trace/events/sunrpc.h

+21 −0
Original line number Diff line number Diff line
@@ -453,6 +453,27 @@ DEFINE_EVENT(rpc_xprt_event, xprt_complete_rqst, 
	TP_PROTO(struct rpc_xprt *xprt, __be32 xid, int status),

	TP_ARGS(xprt, xid, status));



TRACE_EVENT(xprt_ping,

	TP_PROTO(const struct rpc_xprt *xprt, int status),



	TP_ARGS(xprt, status),



	TP_STRUCT__entry(

		__field(int, status)

		__string(addr, xprt->address_strings[RPC_DISPLAY_ADDR])

		__string(port, xprt->address_strings[RPC_DISPLAY_PORT])

	),



	TP_fast_assign(

		__entry->status = status;

		__assign_str(addr, xprt->address_strings[RPC_DISPLAY_ADDR]);

		__assign_str(port, xprt->address_strings[RPC_DISPLAY_PORT]);

	),



	TP_printk("peer=[%s]:%s status=%d",

			__get_str(addr), __get_str(port), __entry->status)

);



TRACE_EVENT(xs_tcp_data_ready,

	TP_PROTO(struct rpc_xprt *xprt, int err, unsigned int total),

net/sunrpc/clnt.c

+6 −0
Original line number Diff line number Diff line
@@ -2014,6 +2014,9 @@ call_transmit_status(struct rpc_task *task) 
	case -EPERM:

		if (RPC_IS_SOFTCONN(task)) {

			xprt_end_transmit(task);

			if (!task->tk_msg.rpc_proc->p_proc)

				trace_xprt_ping(task->tk_xprt,

						task->tk_status);

			rpc_exit(task, task->tk_status);

			break;

		}
@@ -2112,6 +2115,9 @@ call_status(struct rpc_task *task) 
	struct rpc_rqst	*req = task->tk_rqstp;

	int		status;



	if (!task->tk_msg.rpc_proc->p_proc)

		trace_xprt_ping(task->tk_xprt, task->tk_status);



	if (req->rq_reply_bytes_recvd > 0 && !req->rq_bytes_sent)

		task->tk_status = req->rq_reply_bytes_recvd;