SUNRPC: Add more svcsock tracepoints

In addition to tracing recently-updated socket sendto events, this
commit adds a trace event class that can be used for additional
svcsock-related tracepoints in subsequent patches.

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

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index d40ec8f..bf08664 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -14,6 +14,39 @@
 #include <linux/net.h>
 #include <linux/tracepoint.h>
 
+TRACE_DEFINE_ENUM(SOCK_STREAM);
+TRACE_DEFINE_ENUM(SOCK_DGRAM);
+TRACE_DEFINE_ENUM(SOCK_RAW);
+TRACE_DEFINE_ENUM(SOCK_RDM);
+TRACE_DEFINE_ENUM(SOCK_SEQPACKET);
+TRACE_DEFINE_ENUM(SOCK_DCCP);
+TRACE_DEFINE_ENUM(SOCK_PACKET);
+
+#define show_socket_type(type)                                 \
+       __print_symbolic(type,                                  \
+               { SOCK_STREAM,          "STREAM" },             \
+               { SOCK_DGRAM,           "DGRAM" },              \
+               { SOCK_RAW,             "RAW" },                \
+               { SOCK_RDM,             "RDM" },                \
+               { SOCK_SEQPACKET,       "SEQPACKET" },          \
+               { SOCK_DCCP,            "DCCP" },               \
+               { SOCK_PACKET,          "PACKET" })
+
+/* This list is known to be incomplete, add new enums as needed. */
+TRACE_DEFINE_ENUM(AF_UNSPEC);
+TRACE_DEFINE_ENUM(AF_UNIX);
+TRACE_DEFINE_ENUM(AF_LOCAL);
+TRACE_DEFINE_ENUM(AF_INET);
+TRACE_DEFINE_ENUM(AF_INET6);
+
+#define rpc_show_address_family(family)                                \
+       __print_symbolic(family,                                \
+               { AF_UNSPEC,            "AF_UNSPEC" },          \
+               { AF_UNIX,              "AF_UNIX" },            \
+               { AF_LOCAL,             "AF_LOCAL" },           \
+               { AF_INET,              "AF_INET" },            \
+               { AF_INET6,             "AF_INET6" })
+
 DECLARE_EVENT_CLASS(xdr_buf_class,
        TP_PROTO(
                const struct xdr_buf *xdr
@@ -1384,6 +1417,70 @@ DECLARE_EVENT_CLASS(svc_deferred_event,
 DEFINE_SVC_DEFERRED_EVENT(drop);
 DEFINE_SVC_DEFERRED_EVENT(revisit);
 
+TRACE_EVENT(svcsock_new_socket,
+       TP_PROTO(
+               const struct socket *socket
+       ),
+
+       TP_ARGS(socket),
+
+       TP_STRUCT__entry(
+               __field(unsigned long, type)
+               __field(unsigned long, family)
+               __field(bool, listener)
+       ),
+
+       TP_fast_assign(
+               __entry->type = socket->type;
+               __entry->family = socket->sk->sk_family;
+               __entry->listener = (socket->sk->sk_state == TCP_LISTEN);
+       ),
+
+       TP_printk("type=%s family=%s%s",
+               show_socket_type(__entry->type),
+               rpc_show_address_family(__entry->family),
+               __entry->listener ? " (listener)" : ""
+       )
+);
+
+DECLARE_EVENT_CLASS(svcsock_class,
+       TP_PROTO(
+               const struct svc_xprt *xprt,
+               ssize_t result
+       ),
+
+       TP_ARGS(xprt, result),
+
+       TP_STRUCT__entry(
+               __field(ssize_t, result)
+               __field(unsigned long, flags)
+               __string(addr, xprt->xpt_remotebuf)
+       ),
+
+       TP_fast_assign(
+               __entry->result = result;
+               __entry->flags = xprt->xpt_flags;
+               __assign_str(addr, xprt->xpt_remotebuf);
+       ),
+
+       TP_printk("addr=%s result=%zd flags=%s", __get_str(addr),
+               __entry->result, show_svc_xprt_flags(__entry->flags)
+       )
+);
+
+#define DEFINE_SVCSOCK_EVENT(name) \
+       DEFINE_EVENT(svcsock_class, svcsock_##name, \
+                       TP_PROTO( \
+                               const struct svc_xprt *xprt, \
+                               ssize_t result \
+                       ), \
+                       TP_ARGS(xprt, result))
+
+DEFINE_SVCSOCK_EVENT(udp_send);
+DEFINE_SVCSOCK_EVENT(tcp_send);
+DEFINE_SVCSOCK_EVENT(data_ready);
+DEFINE_SVCSOCK_EVENT(write_space);
+
 DECLARE_EVENT_CLASS(cache_event,
        TP_PROTO(
                const struct cache_detail *cd,

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 1c4d0aa..758b835 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -54,6 +54,8 @@
 #include <linux/sunrpc/stats.h>
 #include <linux/sunrpc/xprt.h>
 
+#include <trace/events/sunrpc.h>
+
 #include "socklib.h"
 #include "sunrpc.h"
 
@@ -281,13 +283,10 @@ static void svc_data_ready(struct sock *sk)
        struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data;
 
        if (svsk) {
-               dprintk("svc: socket %p(inet %p), busy=%d\n",
-                       svsk, sk,
-                       test_bit(XPT_BUSY, &svsk->sk_xprt.xpt_flags));
-
                /* Refer to svc_setup_socket() for details. */
                rmb();
                svsk->sk_odata(sk);
+               trace_svcsock_data_ready(&svsk->sk_xprt, 0);
                if (!test_and_set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags))
                        svc_xprt_enqueue(&svsk->sk_xprt);
        }
@@ -301,11 +300,9 @@ static void svc_write_space(struct sock *sk)
        struct svc_sock *svsk = (struct svc_sock *)(sk->sk_user_data);
 
        if (svsk) {
-               dprintk("svc: socket %p(inet %p), write_space busy=%d\n",
-                       svsk, sk, test_bit(XPT_BUSY, &svsk->sk_xprt.xpt_flags));
-
                /* Refer to svc_setup_socket() for details. */
                rmb();
+               trace_svcsock_write_space(&svsk->sk_xprt, 0);
                svsk->sk_owspace(sk);
                svc_xprt_enqueue(&svsk->sk_xprt);
        }
@@ -545,6 +542,7 @@ static int svc_udp_sendto(struct svc_rqst *rqstp)
                err = xprt_sock_sendmsg(svsk->sk_sock, &msg, xdr, 0, 0, &sent);
                xdr_free_bvec(xdr);
        }
+       trace_svcsock_udp_send(xprt, err);
 
        mutex_unlock(&xprt->xpt_mutex);
        if (err < 0)
@@ -616,7 +614,7 @@ static struct svc_xprt_class svc_udp_class = {
 
 static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
 {
-       int err, level, optname, one = 1;
+       int level, optname, one = 1;
 
        svc_xprt_init(sock_net(svsk->sk_sock->sk), &svc_udp_class,
                      &svsk->sk_xprt, serv);
@@ -647,9 +645,8 @@ static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
        default:
                BUG();
        }
-       err = kernel_setsockopt(svsk->sk_sock, level, optname,
-                                       (char *)&one, sizeof(one));
-       dprintk("svc: kernel_setsockopt returned %d\n", err);
+       kernel_setsockopt(svsk->sk_sock, level, optname, (char *)&one,
+                         sizeof(one));
 }
 
 /*
@@ -1100,6 +1097,7 @@ static int svc_tcp_sendto(struct svc_rqst *rqstp)
                goto out_notconn;
        err = xprt_sock_sendmsg(svsk->sk_sock, &msg, xdr, 0, marker, &sent);
        xdr_free_bvec(xdr);
+       trace_svcsock_tcp_send(xprt, err < 0 ? err : sent);
        if (err < 0 || sent != (xdr->len + sizeof(marker)))
                goto out_close;
        mutex_unlock(&xprt->xpt_mutex);
@@ -1170,13 +1168,11 @@ static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv)
        set_bit(XPT_CACHE_AUTH, &svsk->sk_xprt.xpt_flags);
        set_bit(XPT_CONG_CTRL, &svsk->sk_xprt.xpt_flags);
        if (sk->sk_state == TCP_LISTEN) {
-               dprintk("setting up TCP socket for listening\n");
                strcpy(svsk->sk_xprt.xpt_remotebuf, "listener");
                set_bit(XPT_LISTENER, &svsk->sk_xprt.xpt_flags);
                sk->sk_data_ready = svc_tcp_listen_data_ready;
                set_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags);
        } else {
-               dprintk("setting up TCP socket for reading\n");
                sk->sk_state_change = svc_tcp_state_change;
                sk->sk_data_ready = svc_data_ready;
                sk->sk_write_space = svc_write_space;
@@ -1226,7 +1222,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
        int             pmap_register = !(flags & SVC_SOCK_ANONYMOUS);
        int             err = 0;
 
-       dprintk("svc: svc_setup_socket %p\n", sock);
        svsk = kzalloc(sizeof(*svsk), GFP_KERNEL);
        if (!svsk)
                return ERR_PTR(-ENOMEM);
@@ -1263,12 +1258,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
        else
                svc_tcp_init(svsk, serv);
 
-       dprintk("svc: svc_setup_socket created %p (inet %p), "
-                       "listen %d close %d\n",
-                       svsk, svsk->sk_sk,
-                       test_bit(XPT_LISTENER, &svsk->sk_xprt.xpt_flags),
-                       test_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags));
-
+       trace_svcsock_new_socket(sock);
        return svsk;
 }