Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx> --- include/trace/events/sunrpc.h | 46 +++++++++++++++++++++++++++++++++++++++++++ net/sunrpc/svcsock.c | 6 ++++++ 2 files changed, 52 insertions(+) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 434b46e79053..711ebd9179b1 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -9,6 +9,7 @@ #include <linux/sunrpc/svc.h> #include <linux/sunrpc/xprtsock.h> #include <linux/sunrpc/svc_xprt.h> +#include <linux/sunrpc/svcsock.h> #include <net/tcp_states.h> #include <linux/net.h> #include <linux/tracepoint.h> @@ -584,6 +585,51 @@ TRACE_EVENT(svc_handle_xprt, show_svc_xprt_flags(__entry->xprt->xpt_flags)) ); +DECLARE_EVENT_CLASS(svc_socket_event, + TP_PROTO(struct sock *sk), + + TP_ARGS(sk), + + TP_STRUCT__entry( + __field(struct sock *, sk) + __field(struct svc_sock *, svsk) + __field_struct(struct sockaddr_storage, ss) + __field(unsigned long, xpt_flags) + ), + + TP_fast_assign( + __entry->sk = sk; + __entry->svsk = sk->sk_user_data; + if (__entry->svsk) { + struct svc_xprt *xprt = &__entry->svsk->sk_xprt; + + memcpy(&__entry->ss, &xprt->xpt_remote, + sizeof(__entry->ss)); + __entry->xpt_flags = xprt->xpt_flags; + } else { + memset(&__entry->ss, 0, sizeof(__entry->ss)); + __entry->xpt_flags = 0; + } + ), + + TP_printk("sk=0x%p peer=%pIScp sk_state=%s xpt_flags=%s", __entry->sk, + (struct sockaddr *)&__entry->ss, + rpc_show_sock_state(__entry->sk->sk_state), + show_svc_xprt_flags(__entry->xpt_flags)) +); + +DEFINE_EVENT(svc_socket_event, svc_tcp_listen_data_ready, + TP_PROTO(struct sock *sk), TP_ARGS(sk)); + +DEFINE_EVENT(svc_socket_event, svc_tcp_state_change, + TP_PROTO(struct sock *sk), TP_ARGS(sk)); + +DEFINE_EVENT(svc_socket_event, svc_tcp_data_ready, + TP_PROTO(struct sock *sk), TP_ARGS(sk)); + +DEFINE_EVENT(svc_socket_event, svc_tcp_accept, + TP_PROTO(struct sock *sk), TP_ARGS(sk)); + #endif /* _TRACE_SUNRPC_H */ #include <trace/define_trace.h> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 74db5ca60b33..2b09deabac24 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -44,6 +44,7 @@ #include <asm/uaccess.h> #include <asm/ioctls.h> #include <trace/events/skb.h> +#include <trace/events/sunrpc.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/clnt.h> @@ -765,6 +766,7 @@ static void svc_tcp_listen_data_ready(struct sock *sk) struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data; wait_queue_head_t *wq; + trace_svc_tcp_listen_data_ready(sk); dprintk("svc: socket %p TCP (listen) state change %d\n", sk, sk->sk_state); @@ -799,6 +801,7 @@ static void svc_tcp_state_change(struct sock *sk) struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data; wait_queue_head_t *wq = sk_sleep(sk); + trace_svc_tcp_state_change(sk); dprintk("svc: socket %p TCP (connected) state change %d (svsk %p)\n", sk, sk->sk_state, sk->sk_user_data); @@ -817,6 +820,7 @@ static void svc_tcp_data_ready(struct sock *sk) struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data; wait_queue_head_t *wq = sk_sleep(sk); + trace_svc_tcp_data_ready(sk); dprintk("svc: socket %p TCP data ready (svsk %p)\n", sk, sk->sk_user_data); if (svsk) { @@ -842,6 +846,8 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt) int err, slen; RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]); + trace_svc_tcp_accept(svsk->sk_sk); + dprintk("svc: tcp_accept %p sock %p\n", svsk, sock); if (!sock) return NULL; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html