SUNRPC: Replace rpcbind dprintk call sites with tracepoints

In many cases, tracepoints already report these errors. In others,
the dprintks were mainly useful when this code was less mature.

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

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 05291ce099d6047a4ac082785c8a014bd6180c2b..b5d4cbbaf4b05bb19a9e37366aa25351f40b9313 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -1334,6 +1334,92 @@ TRACE_EVENT(rpcb_setport,
        )
 );
 
+TRACE_EVENT(pmap_register,
+       TP_PROTO(
+               u32 program,
+               u32 version,
+               int protocol,
+               unsigned short port
+       ),
+
+       TP_ARGS(program, version, protocol, port),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, program)
+               __field(unsigned int, version)
+               __field(int, protocol)
+               __field(unsigned int, port)
+       ),
+
+       TP_fast_assign(
+               __entry->program = program;
+               __entry->version = version;
+               __entry->protocol = protocol;
+               __entry->port = port;
+       ),
+
+       TP_printk("program=%u version=%u protocol=%d port=%u",
+               __entry->program, __entry->version,
+               __entry->protocol, __entry->port
+       )
+);
+
+TRACE_EVENT(rpcb_register,
+       TP_PROTO(
+               u32 program,
+               u32 version,
+               const char *addr,
+               const char *netid
+       ),
+
+       TP_ARGS(program, version, addr, netid),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, program)
+               __field(unsigned int, version)
+               __string(addr, addr)
+               __string(netid, netid)
+       ),
+
+       TP_fast_assign(
+               __entry->program = program;
+               __entry->version = version;
+               __assign_str(addr, addr);
+               __assign_str(netid, netid);
+       ),
+
+       TP_printk("program=%u version=%u addr=%s netid=%s",
+               __entry->program, __entry->version,
+               __get_str(addr), __get_str(netid)
+       )
+);
+
+TRACE_EVENT(rpcb_unregister,
+       TP_PROTO(
+               u32 program,
+               u32 version,
+               const char *netid
+       ),
+
+       TP_ARGS(program, version, netid),
+
+       TP_STRUCT__entry(
+               __field(unsigned int, program)
+               __field(unsigned int, version)
+               __string(netid, netid)
+       ),
+
+       TP_fast_assign(
+               __entry->program = program;
+               __entry->version = version;
+               __assign_str(netid, netid);
+       ),
+
+       TP_printk("program=%u version=%u netid=%s",
+               __entry->program, __entry->version, __get_str(netid)
+       )
+);
+
 DECLARE_EVENT_CLASS(svc_xdr_buf_class,
        TP_PROTO(
                const struct svc_rqst *rqst,

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index af2882c62a3b156d8b0ae947a67da62c7d5f9a39..38fe2ce8a5aa145e14fae22c0925e80926936beb 100644 (file)
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -35,10 +35,6 @@
 
 #include "netns.h"
 
-#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
-# define RPCDBG_FACILITY       RPCDBG_BIND
-#endif
-
 #define RPCBIND_SOCK_PATHNAME  "/var/run/rpcbind.sock"
 
 #define RPCBIND_PROGRAM                (100000u)
@@ -444,9 +440,7 @@ int rpcb_register(struct net *net, u32 prog, u32 vers, int prot, unsigned short
        struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
        bool is_set = false;
 
-       dprintk("RPC:       %sregistering (%u, %u, %d, %u) with local "
-                       "rpcbind\n", (port ? "" : "un"),
-                       prog, vers, prot, port);
+       trace_pmap_register(prog, vers, prot, port);
 
        msg.rpc_proc = &rpcb_procedures2[RPCBPROC_UNSET];
        if (port != 0) {
@@ -472,11 +466,6 @@ static int rpcb_register_inet4(struct sunrpc_net *sn,
 
        map->r_addr = rpc_sockaddr2uaddr(sap, GFP_KERNEL);
 
-       dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
-               "local rpcbind\n", (port ? "" : "un"),
-                       map->r_prog, map->r_vers,
-                       map->r_addr, map->r_netid);
-
        msg->rpc_proc = &rpcb_procedures4[RPCBPROC_UNSET];
        if (port != 0) {
                msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
@@ -503,11 +492,6 @@ static int rpcb_register_inet6(struct sunrpc_net *sn,
 
        map->r_addr = rpc_sockaddr2uaddr(sap, GFP_KERNEL);
 
-       dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
-               "local rpcbind\n", (port ? "" : "un"),
-                       map->r_prog, map->r_vers,
-                       map->r_addr, map->r_netid);
-
        msg->rpc_proc = &rpcb_procedures4[RPCBPROC_UNSET];
        if (port != 0) {
                msg->rpc_proc = &rpcb_procedures4[RPCBPROC_SET];
@@ -524,9 +508,7 @@ static int rpcb_unregister_all_protofamilies(struct sunrpc_net *sn,
 {
        struct rpcbind_args *map = msg->rpc_argp;
 
-       dprintk("RPC:       unregistering [%u, %u, '%s'] with "
-               "local rpcbind\n",
-                       map->r_prog, map->r_vers, map->r_netid);
+       trace_rpcb_unregister(map->r_prog, map->r_vers, map->r_netid);
 
        map->r_addr = "";
        msg->rpc_proc = &rpcb_procedures4[RPCBPROC_UNSET];
@@ -598,6 +580,8 @@ int rpcb_v4_register(struct net *net, const u32 program, const u32 version,
        if (address == NULL)
                return rpcb_unregister_all_protofamilies(sn, &msg);
 
+       trace_rpcb_register(map.r_prog, map.r_vers, map.r_addr, map.r_netid);
+
        switch (address->sa_family) {
        case AF_INET:
                return rpcb_register_inet4(sn, address, &msg);