lkml.org 
[lkml]   [2022]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH v2 06/19] netfs: Adjust the netfs_rreq tracepoint slightly
From
Date
On Tue, 2022-03-08 at 23:26 +0000, David Howells wrote:
> Adjust the netfs_rreq tracepoint to include the origin of the request and
> to increase the size of the "what trace" output strings by a character so
> that "ENCRYPT" and "DECRYPT" will fit without abbreviation.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: linux-cachefs@redhat.com
>
> Link: https://lore.kernel.org/r/164622996715.3564931.4252319907990358129.stgit@warthog.procyon.org.uk/ # v1
> ---
>
> fs/netfs/read_helper.c | 2 +-
> include/trace/events/netfs.h | 18 +++++++++---------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/fs/netfs/read_helper.c b/fs/netfs/read_helper.c
> index ef23ef9889d5..181aeda32649 100644
> --- a/fs/netfs/read_helper.c
> +++ b/fs/netfs/read_helper.c
> @@ -181,7 +181,7 @@ static void netfs_rreq_do_write_to_cache(struct netfs_io_request *rreq)
> struct iov_iter iter;
> int ret;
>
> - trace_netfs_rreq(rreq, netfs_rreq_trace_write);
> + trace_netfs_rreq(rreq, netfs_rreq_trace_copy);
>
> /* We don't want terminating writes trying to wake us up whilst we're
> * still going through the list.
> diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h
> index 2d0665b416bf..daf171de2142 100644
> --- a/include/trace/events/netfs.h
> +++ b/include/trace/events/netfs.h
> @@ -22,13 +22,13 @@
> E_(netfs_read_trace_write_begin, "WRITEBEGN")
>
> #define netfs_rreq_traces \
> - EM(netfs_rreq_trace_assess, "ASSESS") \
> - EM(netfs_rreq_trace_done, "DONE ") \
> - EM(netfs_rreq_trace_free, "FREE ") \
> - EM(netfs_rreq_trace_resubmit, "RESUBM") \
> - EM(netfs_rreq_trace_unlock, "UNLOCK") \
> - EM(netfs_rreq_trace_unmark, "UNMARK") \
> - E_(netfs_rreq_trace_write, "WRITE ")
> + EM(netfs_rreq_trace_assess, "ASSESS ") \
> + EM(netfs_rreq_trace_copy, "COPY ") \
> + EM(netfs_rreq_trace_done, "DONE ") \
> + EM(netfs_rreq_trace_free, "FREE ") \
> + EM(netfs_rreq_trace_resubmit, "RESUBMT") \
> + EM(netfs_rreq_trace_unlock, "UNLOCK ") \
> + E_(netfs_rreq_trace_unmark, "UNMARK ")
>
> #define netfs_sreq_sources \
> EM(NETFS_FILL_WITH_ZEROES, "ZERO") \
> @@ -134,7 +134,7 @@ TRACE_EVENT(netfs_rreq,
>
> TP_STRUCT__entry(
> __field(unsigned int, rreq )
> - __field(unsigned short, flags )
> + __field(unsigned int, flags )
> __field(enum netfs_rreq_trace, what )
> ),
>
> @@ -182,8 +182,8 @@ TRACE_EVENT(netfs_sreq,
>
> TP_printk("R=%08x[%u] %s %s f=%02x s=%llx %zx/%zx e=%d",
> __entry->rreq, __entry->index,
> - __print_symbolic(__entry->what, netfs_sreq_traces),
> __print_symbolic(__entry->source, netfs_sreq_sources),
> + __print_symbolic(__entry->what, netfs_sreq_traces),
> __entry->flags,
> __entry->start, __entry->transferred, __entry->len,
> __entry->error)
>
>

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

\
 
 \ /
  Last update: 2022-09-17 16:16    [W:1.129 / U:0.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site