SUNRPC: Display RPC procedure names instead of proc numbers

[ Upstream commit 89ff87494c6e4b32ea7960d0c644efdbb2fe6ef5 ]

Make the sunrpc trace subsystem trace events easier to use.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 8220369ee6105858c3d01ecc7e7ee9acececbe44..200978b94a0b92e3922fd0ca4afaf203d78b7b76 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -1578,6 +1578,7 @@ TRACE_EVENT(svc_process,
                __field(u32, vers)
                __field(u32, proc)
                __string(service, name)
+               __string(procedure, rqst->rq_procinfo->pc_name)
                __string(addr, rqst->rq_xprt ?
                         rqst->rq_xprt->xpt_remotebuf : "(null)")
        ),
@@ -1587,13 +1588,16 @@ TRACE_EVENT(svc_process,
                __entry->vers = rqst->rq_vers;
                __entry->proc = rqst->rq_proc;
                __assign_str(service, name);
+               __assign_str(procedure, rqst->rq_procinfo->pc_name);
                __assign_str(addr, rqst->rq_xprt ?
                             rqst->rq_xprt->xpt_remotebuf : "(null)");
        ),
 
-       TP_printk("addr=%s xid=0x%08x service=%s vers=%u proc=%u",
+       TP_printk("addr=%s xid=0x%08x service=%s vers=%u proc=%s",
                        __get_str(addr), __entry->xid,
-                       __get_str(service), __entry->vers, __entry->proc)
+                       __get_str(service), __entry->vers,
+                       __get_str(procedure)
+       )
 );
 
 DECLARE_EVENT_CLASS(svc_rqst_event,
@@ -1849,6 +1853,7 @@ TRACE_EVENT(svc_stats_latency,
        TP_STRUCT__entry(
                __field(u32, xid)
                __field(unsigned long, execute)
+               __string(procedure, rqst->rq_procinfo->pc_name)
                __string(addr, rqst->rq_xprt->xpt_remotebuf)
        ),
 
@@ -1856,11 +1861,13 @@ TRACE_EVENT(svc_stats_latency,
                __entry->xid = be32_to_cpu(rqst->rq_xid);
                __entry->execute = ktime_to_us(ktime_sub(ktime_get(),
                                                         rqst->rq_stime));
+               __assign_str(procedure, rqst->rq_procinfo->pc_name);
                __assign_str(addr, rqst->rq_xprt->xpt_remotebuf);
        ),
 
-       TP_printk("addr=%s xid=0x%08x execute-us=%lu",
-               __get_str(addr), __entry->xid, __entry->execute)
+       TP_printk("addr=%s xid=0x%08x proc=%s execute-us=%lu",
+               __get_str(addr), __entry->xid, __get_str(procedure),
+               __entry->execute)
 );
 
 DECLARE_EVENT_CLASS(svc_deferred_event,