Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Message-ID: <eb2348e3bf7192ab39dabdb19e7901e5cace02d4.camel@kernel.org>
Subject: Re: [PATCH] svcrdma: Fix tracepoint printk format
From:   Jeff Layton <jlayton@kernel.org>
To:     Chuck Lever <cel@kernel.org>, linux-nfs@vger.kernel.org
Cc:     Chuck Lever <chuck.lever@oracle.com>
Date:   Fri, 13 Oct 2023 09:14:46 -0400
In-Reply-To: <169719969566.6999.18083178189502993580.stgit@oracle-102.nfsv4bat.org>
References: <169719969566.6999.18083178189502993580.stgit@oracle-102.nfsv4bat.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 (3.48.4-1.module_f38+17164+63eeee4a) 
MIME-Version: 1.0
Precedence: bulk

On Fri, 2023-10-13 at 08:22 -0400, Chuck Lever wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
>=20
> Other tracepoints use "cq.id=3D" rather than "cq_id=3D". Let's make it
> more reliable to grep for the CQ restracker ID.
>=20
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  include/trace/events/rpcrdma.h |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>=20
> One more trivial fix to svcrdma for 6.7.
>=20
> diff --git a/include/trace/events/rpcrdma.h b/include/trace/events/rpcrdm=
a.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 =3D offset;
>  	),
> =20
> -	TP_printk("cq_id=3D%u cid=3D%d segno=3D%u %u@0x%016llx:0x%08x",
> +	TP_printk("cq.id=3D%u cid=3D%d segno=3D%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 =3D segment->rs_offset;
>  	),
> =20
> -	TP_printk("cq_id=3D%u cid=3D%d segno=3D%u position=3D%u %u@0x%016llx:0x=
%08x",
> +	TP_printk("cq.id=3D%u cid=3D%d segno=3D%u position=3D%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 =3D segment->rs_offset;
>  	),
> =20
> -	TP_printk("cq_id=3D%u cid=3D%d segno=3D%u %u@0x%016llx:0x%08x",
> +	TP_printk("cq.id=3D%u cid=3D%d segno=3D%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 =3D msglen;
>  	),
> =20
> -	TP_printk("cq_id=3D%u cid=3D%d hdr=3D%u msg=3D%u (total %u)",
> +	TP_printk("cq.id=3D%u cid=3D%d hdr=3D%u msg=3D%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;
>  	),
> =20
> -	TP_printk("cq_id=3D%u cid=3D%d num_sge=3D%u inv_rkey=3D0x%08x",
> +	TP_printk("cq.id=3D%u cid=3D%d num_sge=3D%u inv_rkey=3D0x%08x",
>  		__entry->cq_id, __entry->completion_id,
>  		__entry->num_sge, __entry->inv_rkey
>  	)
>=20
>=20

Reviewed-by: Jeff Layton <jlayton@kernel.org>