Replace a dprintk call site. The new tracepoint can be left enabled
persistently to capture problems.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
---
include/trace/events/sunrpc.h | 28 ++++++++++++++++++++++++++++
net/sunrpc/svc.c | 4 +---
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index db581a837f1b..804912b26abb 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -1688,6 +1688,34 @@ TRACE_EVENT(svc_decode_prog_unavail_err,
TP_printk("addr=%s program=%u", __get_str(addr), __entry->program)
);
+TRACE_EVENT(svc_decode_prog_mismatch_err,
+ TP_PROTO(
+ const struct svc_rqst *rqst,
+ const struct svc_program *progp
+ ),
+
+ TP_ARGS(rqst, progp),
+
+ TP_STRUCT__entry(
+ __field(u32, version)
+ __string(progname, progp->pg_name)
+ __string(addr, rqst->rq_xprt ?
+ rqst->rq_xprt->xpt_remotebuf : "(null)")
+ ),
+
+ TP_fast_assign(
+ __entry->version = rqst->rq_vers;
+ __assign_str(progname, progp->pg_name)
+ __assign_str(addr, rqst->rq_xprt ?
+ rqst->rq_xprt->xpt_remotebuf : "(null)");
+ ),
+
+ TP_printk("addr=%s %sv%u",
+ __get_str(addr), __get_str(progname),
+ __entry->version
+ )
+);
+
DECLARE_EVENT_CLASS(svc_rqst_event,
TP_PROTO(
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index a057d1373579..66e46d7755e9 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1406,9 +1406,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
goto sendit;
err_bad_vers:
- svc_printk(rqstp, "unknown version (%d for prog %d, %s)\n",
- rqstp->rq_vers, rqstp->rq_prog, progp->pg_name);
-
+ trace_svc_decode_prog_mismatch_err(rqstp, progp);
serv->sv_stats->rpcbadfmt++;
svc_putnl(resv, RPC_PROG_MISMATCH);
svc_putnl(resv, process.mismatch.lovers);
