Skip to content

Commit 5089f3d

Browse files
committed
SUNRPC: Remove low signal-to-noise tracepoints
I'm about to add more information to the server-side SUNRPC tracepoints, so I'm going to offset the increased trace log consumption by getting rid of some tracepoints that fire frequently but don't offer much value. trace_svc_xprt_received() was useful for debugging, perhaps, but is not generally informative. trace_svc_handle_xprt() reports largely the same information as trace_svc_xdr_recvfrom(). As a clean-up, rename trace_svc_xprt_do_enqueue() to match svc_xprt_dequeue(). Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 1463b38 commit 5089f3d

2 files changed

Lines changed: 3 additions & 27 deletions

File tree

include/trace/events/sunrpc.h

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,7 @@ TRACE_EVENT(svc_xprt_create_err,
17681768
__entry->error)
17691769
);
17701770

1771-
TRACE_EVENT(svc_xprt_do_enqueue,
1771+
TRACE_EVENT(svc_xprt_enqueue,
17721772
TP_PROTO(struct svc_xprt *xprt, struct svc_rqst *rqst),
17731773

17741774
TP_ARGS(xprt, rqst),
@@ -1815,7 +1815,6 @@ DECLARE_EVENT_CLASS(svc_xprt_event,
18151815
), \
18161816
TP_ARGS(xprt))
18171817

1818-
DEFINE_SVC_XPRT_EVENT(received);
18191818
DEFINE_SVC_XPRT_EVENT(no_write_space);
18201819
DEFINE_SVC_XPRT_EVENT(close);
18211820
DEFINE_SVC_XPRT_EVENT(detach);
@@ -1902,27 +1901,6 @@ TRACE_EVENT(svc_alloc_arg_err,
19021901
TP_printk("pages=%u", __entry->pages)
19031902
);
19041903

1905-
TRACE_EVENT(svc_handle_xprt,
1906-
TP_PROTO(struct svc_xprt *xprt, int len),
1907-
1908-
TP_ARGS(xprt, len),
1909-
1910-
TP_STRUCT__entry(
1911-
__field(int, len)
1912-
__field(unsigned long, flags)
1913-
__string(addr, xprt->xpt_remotebuf)
1914-
),
1915-
1916-
TP_fast_assign(
1917-
__entry->len = len;
1918-
__entry->flags = xprt->xpt_flags;
1919-
__assign_str(addr, xprt->xpt_remotebuf);
1920-
),
1921-
1922-
TP_printk("addr=%s len=%d flags=%s", __get_str(addr),
1923-
__entry->len, show_svc_xprt_flags(__entry->flags))
1924-
);
1925-
19261904
TRACE_EVENT(svc_stats_latency,
19271905
TP_PROTO(const struct svc_rqst *rqst),
19281906

net/sunrpc/svc_xprt.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@ void svc_xprt_received(struct svc_xprt *xprt)
264264
return;
265265
}
266266

267-
trace_svc_xprt_received(xprt);
268-
269267
/* As soon as we clear busy, the xprt could be closed and
270268
* 'put', so we need a reference to call svc_enqueue_xprt with:
271269
*/
@@ -466,7 +464,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
466464
out_unlock:
467465
rcu_read_unlock();
468466
put_cpu();
469-
trace_svc_xprt_do_enqueue(xprt, rqstp);
467+
trace_svc_xprt_enqueue(xprt, rqstp);
470468
}
471469
EXPORT_SYMBOL_GPL(svc_xprt_do_enqueue);
472470

@@ -842,8 +840,8 @@ static int svc_handle_xprt(struct svc_rqst *rqstp, struct svc_xprt *xprt)
842840
atomic_add(rqstp->rq_reserved, &xprt->xpt_reserved);
843841
} else
844842
svc_xprt_received(xprt);
843+
845844
out:
846-
trace_svc_handle_xprt(xprt, len);
847845
return len;
848846
}
849847

0 commit comments

Comments
 (0)