diff mbox series

[v2,6/6] rpcrdma: Capture bytes received in Receive completion tracepoints

Message ID 161236946591.1030487.17569515553232560373.stgit@manet.1015granger.net (mailing list archive)
State New
Headers show
Series RPC/RDMA client fixes | expand

Commit Message

Chuck Lever III Feb. 3, 2021, 4:24 p.m. UTC
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 include/trace/events/rpcrdma.h |   50 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

Comments

Tom Talpey Feb. 3, 2021, 6:14 p.m. UTC | #1
Acked-By: Tom Talpey <tom@talpey.com>

On 2/3/2021 11:24 AM, Chuck Lever wrote:
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>   include/trace/events/rpcrdma.h |   50 ++++++++++++++++++++++++++++++++++++++--
>   1 file changed, 48 insertions(+), 2 deletions(-)
> 
> diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
> index 76e85e16854b..c838e7ac1c2d 100644
> --- a/include/trace/events/rpcrdma.h
> +++ b/include/trace/events/rpcrdma.h
> @@ -60,6 +60,51 @@ DECLARE_EVENT_CLASS(rpcrdma_completion_class,
>   				),					\
>   				TP_ARGS(wc, cid))
>   
> +DECLARE_EVENT_CLASS(rpcrdma_receive_completion_class,
> +	TP_PROTO(
> +		const struct ib_wc *wc,
> +		const struct rpc_rdma_cid *cid
> +	),
> +
> +	TP_ARGS(wc, cid),
> +
> +	TP_STRUCT__entry(
> +		__field(u32, cq_id)
> +		__field(int, completion_id)
> +		__field(u32, received)
> +		__field(unsigned long, status)
> +		__field(unsigned int, vendor_err)
> +	),
> +
> +	TP_fast_assign(
> +		__entry->cq_id = cid->ci_queue_id;
> +		__entry->completion_id = cid->ci_completion_id;
> +		__entry->status = wc->status;
> +		if (wc->status) {
> +			__entry->received = 0;
> +			__entry->vendor_err = wc->vendor_err;
> +		} else {
> +			__entry->received = wc->byte_len;
> +			__entry->vendor_err = 0;
> +		}
> +	),
> +
> +	TP_printk("cq.id=%u cid=%d status=%s (%lu/0x%x) received=%u",
> +		__entry->cq_id, __entry->completion_id,
> +		rdma_show_wc_status(__entry->status),
> +		__entry->status, __entry->vendor_err,
> +		__entry->received
> +	)
> +);
> +
> +#define DEFINE_RECEIVE_COMPLETION_EVENT(name)				\
> +		DEFINE_EVENT(rpcrdma_receive_completion_class, name,	\
> +				TP_PROTO(				\
> +					const struct ib_wc *wc,		\
> +					const struct rpc_rdma_cid *cid	\
> +				),					\
> +				TP_ARGS(wc, cid))
> +
>   DECLARE_EVENT_CLASS(xprtrdma_reply_class,
>   	TP_PROTO(
>   		const struct rpcrdma_rep *rep
> @@ -838,7 +883,8 @@ TRACE_EVENT(xprtrdma_post_linv_err,
>    ** Completion events
>    **/
>   
> -DEFINE_COMPLETION_EVENT(xprtrdma_wc_receive);
> +DEFINE_RECEIVE_COMPLETION_EVENT(xprtrdma_wc_receive);
> +
>   DEFINE_COMPLETION_EVENT(xprtrdma_wc_send);
>   DEFINE_COMPLETION_EVENT(xprtrdma_wc_fastreg);
>   DEFINE_COMPLETION_EVENT(xprtrdma_wc_li);
> @@ -1790,7 +1836,7 @@ TRACE_EVENT(svcrdma_post_recv,
>   	)
>   );
>   
> -DEFINE_COMPLETION_EVENT(svcrdma_wc_receive);
> +DEFINE_RECEIVE_COMPLETION_EVENT(svcrdma_wc_receive);
>   
>   TRACE_EVENT(svcrdma_rq_post_err,
>   	TP_PROTO(
> 
> 
>
diff mbox series

Patch

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index 76e85e16854b..c838e7ac1c2d 100644
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -60,6 +60,51 @@  DECLARE_EVENT_CLASS(rpcrdma_completion_class,
 				),					\
 				TP_ARGS(wc, cid))
 
+DECLARE_EVENT_CLASS(rpcrdma_receive_completion_class,
+	TP_PROTO(
+		const struct ib_wc *wc,
+		const struct rpc_rdma_cid *cid
+	),
+
+	TP_ARGS(wc, cid),
+
+	TP_STRUCT__entry(
+		__field(u32, cq_id)
+		__field(int, completion_id)
+		__field(u32, received)
+		__field(unsigned long, status)
+		__field(unsigned int, vendor_err)
+	),
+
+	TP_fast_assign(
+		__entry->cq_id = cid->ci_queue_id;
+		__entry->completion_id = cid->ci_completion_id;
+		__entry->status = wc->status;
+		if (wc->status) {
+			__entry->received = 0;
+			__entry->vendor_err = wc->vendor_err;
+		} else {
+			__entry->received = wc->byte_len;
+			__entry->vendor_err = 0;
+		}
+	),
+
+	TP_printk("cq.id=%u cid=%d status=%s (%lu/0x%x) received=%u",
+		__entry->cq_id, __entry->completion_id,
+		rdma_show_wc_status(__entry->status),
+		__entry->status, __entry->vendor_err,
+		__entry->received
+	)
+);
+
+#define DEFINE_RECEIVE_COMPLETION_EVENT(name)				\
+		DEFINE_EVENT(rpcrdma_receive_completion_class, name,	\
+				TP_PROTO(				\
+					const struct ib_wc *wc,		\
+					const struct rpc_rdma_cid *cid	\
+				),					\
+				TP_ARGS(wc, cid))
+
 DECLARE_EVENT_CLASS(xprtrdma_reply_class,
 	TP_PROTO(
 		const struct rpcrdma_rep *rep
@@ -838,7 +883,8 @@  TRACE_EVENT(xprtrdma_post_linv_err,
  ** Completion events
  **/
 
-DEFINE_COMPLETION_EVENT(xprtrdma_wc_receive);
+DEFINE_RECEIVE_COMPLETION_EVENT(xprtrdma_wc_receive);
+
 DEFINE_COMPLETION_EVENT(xprtrdma_wc_send);
 DEFINE_COMPLETION_EVENT(xprtrdma_wc_fastreg);
 DEFINE_COMPLETION_EVENT(xprtrdma_wc_li);
@@ -1790,7 +1836,7 @@  TRACE_EVENT(svcrdma_post_recv,
 	)
 );
 
-DEFINE_COMPLETION_EVENT(svcrdma_wc_receive);
+DEFINE_RECEIVE_COMPLETION_EVENT(svcrdma_wc_receive);
 
 TRACE_EVENT(svcrdma_rq_post_err,
 	TP_PROTO(