SUNRPC: Trace xprt_timer events

Track RPC timeouts: report the XID and the server address to match
the content of network capture.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

3 files changed, 5 insertions, 3 deletions

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 8c153f68509e..7804d857fd24 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -390,6 +390,10 @@ DECLARE_EVENT_CLASS(rpc_xprt_event,
                         __entry->status)
 );
 
+DEFINE_EVENT(rpc_xprt_event, xprt_timer,
+        TP_PROTO(struct rpc_xprt *xprt, __be32 xid, int status),
+        TP_ARGS(xprt, xid, status));
+
 DEFINE_EVENT(rpc_xprt_event, xprt_lookup_rqst,
         TP_PROTO(struct rpc_xprt *xprt, __be32 xid, int status),
         TP_ARGS(xprt, xid, status));
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 33b74fd84051..2436fd1125fc 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -940,8 +940,8 @@ static void xprt_timer(struct rpc_task *task)
 
         if (task->tk_status != -ETIMEDOUT)
                 return;
-        dprintk("RPC: %5u xprt_timer\n", task->tk_pid);
 
+        trace_xprt_timer(xprt, req->rq_xid, task->tk_status);
         if (!req->rq_reply_bytes_recvd) {
                 if (xprt->ops->timer)
                         xprt->ops->timer(xprt, task);
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index b90179af88bf..4b1ecfe979cf 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -516,8 +516,6 @@ xprt_rdma_set_port(struct rpc_xprt *xprt, u16 port)
 static void
 xprt_rdma_timer(struct rpc_xprt *xprt, struct rpc_task *task)
 {
-        dprintk("RPC: %5u %s: xprt = %p\n", task->tk_pid, __func__, xprt);
-
         xprt_force_disconnect(xprt);
 }