2023-10-13 12:22:34

by Chuck Lever

Subject: [PATCH] svcrdma: Fix tracepoint printk format

From: Chuck Lever <[email protected]>

Other tracepoints use "cq.id=" rather than "cq_id=". Let's make it
more reliable to grep for the CQ restracker ID.

Signed-off-by: Chuck Lever <[email protected]>
---
include/trace/events/rpcrdma.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

One more trivial fix to svcrdma for 6.7.

diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
index f8069ef2ee0f..718df1d9b834 100644
--- a/include/trace/events/rpcrdma.h
+++ b/include/trace/events/rpcrdma.h
@@ -1667,7 +1667,7 @@ TRACE_EVENT(svcrdma_encode_wseg,
__entry->offset = offset;
),

- TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
+ TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
__entry->cq_id, __entry->completion_id,
__entry->segno, __entry->length,
(unsigned long long)__entry->offset, __entry->handle
@@ -1703,7 +1703,7 @@ TRACE_EVENT(svcrdma_decode_rseg,
__entry->offset = segment->rs_offset;
),

- TP_printk("cq_id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x",
+ TP_printk("cq.id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x",
__entry->cq_id, __entry->completion_id,
__entry->segno, __entry->position, __entry->length,
(unsigned long long)__entry->offset, __entry->handle
@@ -1740,7 +1740,7 @@ TRACE_EVENT(svcrdma_decode_wseg,
__entry->offset = segment->rs_offset;
),

- TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
+ TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
__entry->cq_id, __entry->completion_id,
__entry->segno, __entry->length,
(unsigned long long)__entry->offset, __entry->handle
@@ -1959,7 +1959,7 @@ TRACE_EVENT(svcrdma_send_pullup,
__entry->msglen = msglen;
),

- TP_printk("cq_id=%u cid=%d hdr=%u msg=%u (total %u)",
+ TP_printk("cq.id=%u cid=%d hdr=%u msg=%u (total %u)",
__entry->cq_id, __entry->completion_id,
__entry->hdrlen, __entry->msglen,
__entry->hdrlen + __entry->msglen)
@@ -2014,7 +2014,7 @@ TRACE_EVENT(svcrdma_post_send,
wr->ex.invalidate_rkey : 0;
),

- TP_printk("cq_id=%u cid=%d num_sge=%u inv_rkey=0x%08x",
+ TP_printk("cq.id=%u cid=%d num_sge=%u inv_rkey=0x%08x",
__entry->cq_id, __entry->completion_id,
__entry->num_sge, __entry->inv_rkey
)

2023-10-13 13:14:54

by Jeffrey Layton

Subject: Re: [PATCH] svcrdma: Fix tracepoint printk format

On Fri, 2023-10-13 at 08:22 -0400, Chuck Lever wrote:
> From: Chuck Lever <[email protected]>
>
> Other tracepoints use "cq.id=" rather than "cq_id=". Let's make it
> more reliable to grep for the CQ restracker ID.
>
> Signed-off-by: Chuck Lever <[email protected]>
> ---
> include/trace/events/rpcrdma.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> One more trivial fix to svcrdma for 6.7.
>
> diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
> index f8069ef2ee0f..718df1d9b834 100644
> --- a/include/trace/events/rpcrdma.h
> +++ b/include/trace/events/rpcrdma.h
> @@ -1667,7 +1667,7 @@ TRACE_EVENT(svcrdma_encode_wseg,
> __entry->offset = offset;
> ),
>
> - TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> + TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->segno, __entry->length,
> (unsigned long long)__entry->offset, __entry->handle
> @@ -1703,7 +1703,7 @@ TRACE_EVENT(svcrdma_decode_rseg,
> __entry->offset = segment->rs_offset;
> ),
>
> - TP_printk("cq_id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x",
> + TP_printk("cq.id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->segno, __entry->position, __entry->length,
> (unsigned long long)__entry->offset, __entry->handle
> @@ -1740,7 +1740,7 @@ TRACE_EVENT(svcrdma_decode_wseg,
> __entry->offset = segment->rs_offset;
> ),
>
> - TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> + TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->segno, __entry->length,
> (unsigned long long)__entry->offset, __entry->handle
> @@ -1959,7 +1959,7 @@ TRACE_EVENT(svcrdma_send_pullup,
> __entry->msglen = msglen;
> ),
>
> - TP_printk("cq_id=%u cid=%d hdr=%u msg=%u (total %u)",
> + TP_printk("cq.id=%u cid=%d hdr=%u msg=%u (total %u)",
> __entry->cq_id, __entry->completion_id,
> __entry->hdrlen, __entry->msglen,
> __entry->hdrlen + __entry->msglen)
> @@ -2014,7 +2014,7 @@ TRACE_EVENT(svcrdma_post_send,
> wr->ex.invalidate_rkey : 0;
> ),
>
> - TP_printk("cq_id=%u cid=%d num_sge=%u inv_rkey=0x%08x",
> + TP_printk("cq.id=%u cid=%d num_sge=%u inv_rkey=0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->num_sge, __entry->inv_rkey
> )
>
>

Reviewed-by: Jeff Layton <[email protected]>

2023-10-13 13:22:16

by Benjamin Coddington

Subject: Re: [PATCH] svcrdma: Fix tracepoint printk format

On 13 Oct 2023, at 8:22, Chuck Lever wrote:

> From: Chuck Lever <[email protected]>
>
> Other tracepoints use "cq.id=" rather than "cq_id=". Let's make it
> more reliable to grep for the CQ restracker ID.
>
> Signed-off-by: Chuck Lever <[email protected]>
> ---
> include/trace/events/rpcrdma.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> One more trivial fix to svcrdma for 6.7.
>
> diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdma.h
> index f8069ef2ee0f..718df1d9b834 100644
> --- a/include/trace/events/rpcrdma.h
> +++ b/include/trace/events/rpcrdma.h
> @@ -1667,7 +1667,7 @@ TRACE_EVENT(svcrdma_encode_wseg,
> __entry->offset = offset;
> ),
>
> - TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> + TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->segno, __entry->length,
> (unsigned long long)__entry->offset, __entry->handle
> @@ -1703,7 +1703,7 @@ TRACE_EVENT(svcrdma_decode_rseg,
> __entry->offset = segment->rs_offset;
> ),
>
> - TP_printk("cq_id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x",
> + TP_printk("cq.id=%u cid=%d segno=%u position=%u %u@0x%016llx:0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->segno, __entry->position, __entry->length,
> (unsigned long long)__entry->offset, __entry->handle
> @@ -1740,7 +1740,7 @@ TRACE_EVENT(svcrdma_decode_wseg,
> __entry->offset = segment->rs_offset;
> ),
>
> - TP_printk("cq_id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> + TP_printk("cq.id=%u cid=%d segno=%u %u@0x%016llx:0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->segno, __entry->length,
> (unsigned long long)__entry->offset, __entry->handle
> @@ -1959,7 +1959,7 @@ TRACE_EVENT(svcrdma_send_pullup,
> __entry->msglen = msglen;
> ),
>
> - TP_printk("cq_id=%u cid=%d hdr=%u msg=%u (total %u)",
> + TP_printk("cq.id=%u cid=%d hdr=%u msg=%u (total %u)",
> __entry->cq_id, __entry->completion_id,
> __entry->hdrlen, __entry->msglen,
> __entry->hdrlen + __entry->msglen)
> @@ -2014,7 +2014,7 @@ TRACE_EVENT(svcrdma_post_send,
> wr->ex.invalidate_rkey : 0;
> ),
>
> - TP_printk("cq_id=%u cid=%d num_sge=%u inv_rkey=0x%08x",
> + TP_printk("cq.id=%u cid=%d num_sge=%u inv_rkey=0x%08x",
> __entry->cq_id, __entry->completion_id,
> __entry->num_sge, __entry->inv_rkey
> )

Reviewed-by: Benjamin Coddington <[email protected]>

Ben