[v1,09/22] SUNRPC: Replace connect dprintk call sites with a tracepoint

Commit Message

Chuck Lever July 8, 2020, 8:09 p.m. UTC

This trace event can be used to audit transport connections from the
client.

Signed-off-by: Chuck Lever <[e-mail]>
---
 include/trace/events/sunrpc.h |    1 +
 net/sunrpc/clnt.c             |    4 ----
 net/sunrpc/xprt.c             |    3 +--
 3 files changed, 2 insertions(+), 6 deletions(-)

Patch

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index dbde6a0eb821..06cb201cdfd3 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -983,6 +983,7 @@  DECLARE_EVENT_CLASS(rpc_xprt_lifetime_class,
 			TP_ARGS(xprt))
 
 DEFINE_RPC_XPRT_LIFETIME_EVENT(create);
+DEFINE_RPC_XPRT_LIFETIME_EVENT(connect);
 DEFINE_RPC_XPRT_LIFETIME_EVENT(disconnect_auto);
 DEFINE_RPC_XPRT_LIFETIME_EVENT(disconnect_done);
 DEFINE_RPC_XPRT_LIFETIME_EVENT(disconnect_force);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 533de318fab9..3a4f1ce31e22 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2055,10 +2055,6 @@  call_connect(struct rpc_task *task)
 		return;
 	}
 
-	dprintk("RPC: %5u call_connect xprt %p %s connected\n",
-			task->tk_pid, xprt,
-			(xprt_connected(xprt) ? "is" : "is not"));
-
 	task->tk_action = call_connect_status;
 	if (task->tk_status < 0)
 		return;
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 1ce89778119c..a03f67520780 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -825,8 +825,7 @@  void xprt_connect(struct rpc_task *task)
 {
 	struct rpc_xprt	*xprt = task->tk_rqstp->rq_xprt;
 
-	dprintk("RPC: %5u xprt_connect xprt %p %s connected\n", task->tk_pid,
-			xprt, (xprt_connected(xprt) ? "is" : "is not"));
+	trace_xprt_connect(xprt);
 
 	if (!xprt_bound(xprt)) {
 		task->tk_status = -EAGAIN;