Commit 18b3ff9f authored by David Howells's avatar David Howells
Browse files

netfs: Adjust the netfs_rreq tracepoint slightly 



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: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
cc: linux-cachefs@redhat.com

Link: https://lore.kernel.org/r/164622996715.3564931.4252319907990358129.stgit@warthog.procyon.org.uk/ # v1
Link: https://lore.kernel.org/r/164678199468.1200972.17275585970238114726.stgit@warthog.procyon.org.uk/ # v2
Link: https://lore.kernel.org/r/164692898684.2099075.12153225958137716567.stgit@warthog.procyon.org.uk/ # v3
parent 3a4a38e6

fs/netfs/read_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

include/trace/events/netfs.h

+9 −9
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ 


#define netfs_rreq_traces					\

	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,		"RESUBM")	\

	EM(netfs_rreq_trace_resubmit,		"RESUBMT")	\

	EM(netfs_rreq_trace_unlock,		"UNLOCK ")	\

	EM(netfs_rreq_trace_unmark,		"UNMARK")	\

	E_(netfs_rreq_trace_write,		"WRITE ")

	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)