SUNRPC: Remove debugging instrumentation from xprt_release

These instruments don't appear to add any substantial value.

We already have this at the termination of each RPC:

          iozone-2617  [002]   975.713126: rpc_stats_latency:    task:418@5 xid=0x260eab5d nfsv3 LOOKUP backlog=15 rtt=32 execute=58
          iozone-2617  [002]   975.713127: xprt_release_cong:    task:418@5 snd_task:4294967295 cong=256 cwnd=16384
          iozone-2617  [002]   975.713127: xprt_put_cong:        task:418@5 snd_task:4294967295 cong=0 cwnd=16384

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

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index c187a9a8ead68d5db478a1a3aaeb24fce65a4938..1e17c2fc9640c7dd574b75b139c2d9b3b7808f67 100644 (file)
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1187,38 +1187,6 @@ TRACE_EVENT(xprtrdma_decode_seg,
        )
 );
 
-/**
- ** Allocation/release of rpcrdma_reqs and rpcrdma_reps
- **/
-
-TRACE_EVENT(xprtrdma_op_free,
-       TP_PROTO(
-               const struct rpc_task *task,
-               const struct rpcrdma_req *req
-       ),
-
-       TP_ARGS(task, req),
-
-       TP_STRUCT__entry(
-               __field(unsigned int, task_id)
-               __field(unsigned int, client_id)
-               __field(const void *, req)
-               __field(const void *, rep)
-       ),
-
-       TP_fast_assign(
-               __entry->task_id = task->tk_pid;
-               __entry->client_id = task->tk_client->cl_clid;
-               __entry->req = req;
-               __entry->rep = req->rl_reply;
-       ),
-
-       TP_printk("task:%u@%u req=%p rep=%p",
-               __entry->task_id, __entry->client_id,
-               __entry->req, __entry->rep
-       )
-);
-
 /**
  ** Callback events
  **/

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index adce1e2ed10df14e1b20e45f55c682305a3cd307..402b1c8869fd2f2e29fcf0f93250d145e8dc1810 100644 (file)
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -1056,9 +1056,6 @@ void rpc_free(struct rpc_task *task)
        buf = container_of(buffer, struct rpc_buffer, data);
        size = buf->len;
 
-       dprintk("RPC:       freeing buffer of size %zu at %p\n",
-                       size, buf);
-
        if (size <= RPC_BUFFER_MAXSIZE)
                mempool_free(buf, rpc_buffer_mempool);
        else

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 7ad4009c90338fecbb8f5a50d0a3a7a3d73e7ede..2217dfed8f88ac01e1ad73da753f51181be9a1dc 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1836,7 +1836,6 @@ void xprt_release(struct rpc_task *task)
        if (req->rq_release_snd_buf)
                req->rq_release_snd_buf(req);
 
-       dprintk("RPC: %5u release request %p\n", task->tk_pid, req);
        if (likely(!bc_prealloc(req)))
                xprt->ops->free_slot(xprt, req);
        else

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 612b60f31302de4396b0a6d0a20de5711f6bfb33..819a922830da01984e41efd428ed68f8776f48c8 100644 (file)
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -605,8 +605,6 @@ xprt_rdma_free(struct rpc_task *task)
        struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(rqst->rq_xprt);
        struct rpcrdma_req *req = rpcr_to_rdmar(rqst);
 
-       trace_xprtrdma_op_free(task, req);
-
        if (!list_empty(&req->rl_registered))
                frwr_unmap_sync(r_xprt, req);