xprtrdma: Clean up xprtrdma callback tracepoints (d11e9346) · Commits · 戴 / test

include/trace/events/rpcrdma.h

+16 −15

Original line number	Diff line number	Diff line
		@@ -313,38 +313,39 @@ DECLARE_EVENT_CLASS(xprtrdma_mr,
		), \
		TP_ARGS(mr))

		DECLARE_EVENT_CLASS(xprtrdma_cb_event,
		DECLARE_EVENT_CLASS(xprtrdma_callback_class,
		TP_PROTO(
		const struct rpcrdma_xprt *r_xprt,
		const struct rpc_rqst *rqst
		),

		TP_ARGS(rqst),
		TP_ARGS(r_xprt, rqst),

		TP_STRUCT__entry(
		__field(const void *, rqst)
		__field(const void *, rep)
		__field(const void *, req)
		__field(u32, xid)
		__string(addr, rpcrdma_addrstr(r_xprt))
		__string(port, rpcrdma_portstr(r_xprt))
		),

		TP_fast_assign(
		__entry->rqst = rqst;
		__entry->req = rpcr_to_rdmar(rqst);
		__entry->rep = rpcr_to_rdmar(rqst)->rl_reply;
		__entry->xid = be32_to_cpu(rqst->rq_xid);
		__assign_str(addr, rpcrdma_addrstr(r_xprt));
		__assign_str(port, rpcrdma_portstr(r_xprt));
		),

		TP_printk("xid=0x%08x, rqst=%p req=%p rep=%p",
		__entry->xid, __entry->rqst, __entry->req, __entry->rep
		TP_printk("peer=[%s]:%s xid=0x%08x",
		__get_str(addr), __get_str(port), __entry->xid
		)
		);

		#define DEFINE_CB_EVENT(name) \
		DEFINE_EVENT(xprtrdma_cb_event, name, \
		#define DEFINE_CALLBACK_EVENT(name) \
		DEFINE_EVENT(xprtrdma_callback_class, \
		xprtrdma_cb_##name, \
		TP_PROTO( \
		const struct rpcrdma_xprt *r_xprt, \
		const struct rpc_rqst *rqst \
		), \
		TP_ARGS(rqst))
		TP_ARGS(r_xprt, rqst))

		/**
		** Connection events
		@@ -1177,8 +1178,8 @@ TRACE_EVENT(xprtrdma_cb_setup,
		)
		);

		DEFINE_CB_EVENT(xprtrdma_cb_call);
		DEFINE_CB_EVENT(xprtrdma_cb_reply);
		DEFINE_CALLBACK_EVENT(call);
		DEFINE_CALLBACK_EVENT(reply);

		/**
		** Server-side RPC/RDMA events

+3 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Copyright (c) 2015 Oracle. All rights reserved.
		* Copyright (c) 2015-2020, Oracle and/or its affiliates.
		*
		* Support for backward direction RPCs on RPC/RDMA.
		*/
		@@ -82,7 +82,7 @@ static int rpcrdma_bc_marshal_reply(struct rpc_rqst *rqst)
		&rqst->rq_snd_buf, rpcrdma_noch_pullup))
		return -EIO;

		trace_xprtrdma_cb_reply(rqst);
		trace_xprtrdma_cb_reply(r_xprt, rqst);
		return 0;
		}

		@@ -260,7 +260,7 @@ void rpcrdma_bc_receive_call(struct rpcrdma_xprt *r_xprt,
		*/
		req = rpcr_to_rdmar(rqst);
		req->rl_reply = rep;
		trace_xprtrdma_cb_call(rqst);
		trace_xprtrdma_cb_call(r_xprt, rqst);

		/* Queue rqst for ULP's callback service */
		bc_serv = xprt->bc_serv;