-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add three tracepoints to track the activity of the read helpers:
(1) netfs/netfs_read
This logs entry to the read helpers and also expansion of the range in
a readahead request.
(2) netfs/netfs_rreq
This logs the progress of netfs_read_request objects which track
read requests. A read request may be a compound of multiple
subrequests.
(3) netfs/netfs_sreq
This logs the progress of netfs_read_subrequest objects, which track
the contributions from various sources to a read request.
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-and-tested-by: Jeff Layton <jlayton@kernel.org>
Tested-by: Dave Wysochanski <dwysocha@redhat.com>
Tested-By: Marc Dionne <marc.dionne@auristor.com>
cc: Matthew Wilcox <willy@infradead.org>
cc: linux-mm@kvack.org
cc: linux-cachefs@redhat.com
cc: linux-afs@lists.infradead.org
cc: linux-nfs@vger.kernel.org
cc: linux-cifs@vger.kernel.org
cc: ceph-devel@vger.kernel.org
cc: v9fs-developer@lists.sourceforge.net
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/161118138060.1232039.5353374588021776217.stgit@warthog.procyon.org.uk/ # rfc
Link: https://lore.kernel.org/r/161161033468.2537118.14021843889844001905.stgit@warthog.procyon.org.uk/ # v2
Link: https://lore.kernel.org/r/161340395843.1303470.7355519662919639648.stgit@warthog.procyon.org.uk/ # v3
Link: https://lore.kernel.org/r/161539538693.286939.10171713520419106334.stgit@warthog.procyon.org.uk/ # v4
Link: https://lore.kernel.org/r/161653796447.2770958.1870655382450862155.stgit@warthog.procyon.org.uk/ # v5
Link: https://lore.kernel.org/r/161789078003.6155.17814844411672989942.stgit@warthog.procyon.org.uk/ # v6- Loading branch information
David Howells
committed
Apr 23, 2021
1 parent
3d3c950
commit 77b4d2c
Showing
3 changed files
with
226 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,199 @@ | ||
| /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| /* Network filesystem support module tracepoints | ||
| * | ||
| * Copyright (C) 2021 Red Hat, Inc. All Rights Reserved. | ||
| * Written by David Howells (dhowells@redhat.com) | ||
| */ | ||
| #undef TRACE_SYSTEM | ||
| #define TRACE_SYSTEM netfs | ||
|
|
||
| #if !defined(_TRACE_NETFS_H) || defined(TRACE_HEADER_MULTI_READ) | ||
| #define _TRACE_NETFS_H | ||
|
|
||
| #include <linux/tracepoint.h> | ||
|
|
||
| /* | ||
| * Define enums for tracing information. | ||
| */ | ||
| #ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY | ||
| #define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY | ||
|
|
||
| enum netfs_read_trace { | ||
| netfs_read_trace_expanded, | ||
| netfs_read_trace_readahead, | ||
| netfs_read_trace_readpage, | ||
| }; | ||
|
|
||
| enum netfs_rreq_trace { | ||
| netfs_rreq_trace_assess, | ||
| netfs_rreq_trace_done, | ||
| netfs_rreq_trace_free, | ||
| netfs_rreq_trace_resubmit, | ||
| netfs_rreq_trace_unlock, | ||
| netfs_rreq_trace_unmark, | ||
| netfs_rreq_trace_write, | ||
| }; | ||
|
|
||
| enum netfs_sreq_trace { | ||
| netfs_sreq_trace_download_instead, | ||
| netfs_sreq_trace_free, | ||
| netfs_sreq_trace_prepare, | ||
| netfs_sreq_trace_resubmit_short, | ||
| netfs_sreq_trace_submit, | ||
| netfs_sreq_trace_terminated, | ||
| netfs_sreq_trace_write, | ||
| netfs_sreq_trace_write_term, | ||
| }; | ||
|
|
||
| #endif | ||
|
|
||
| #define netfs_read_traces \ | ||
| EM(netfs_read_trace_expanded, "EXPANDED ") \ | ||
| EM(netfs_read_trace_readahead, "READAHEAD") \ | ||
| E_(netfs_read_trace_readpage, "READPAGE ") | ||
|
|
||
| #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 ") | ||
|
|
||
| #define netfs_sreq_sources \ | ||
| EM(NETFS_FILL_WITH_ZEROES, "ZERO") \ | ||
| EM(NETFS_DOWNLOAD_FROM_SERVER, "DOWN") \ | ||
| EM(NETFS_READ_FROM_CACHE, "READ") \ | ||
| E_(NETFS_INVALID_READ, "INVL") \ | ||
|
|
||
| #define netfs_sreq_traces \ | ||
| EM(netfs_sreq_trace_download_instead, "RDOWN") \ | ||
| EM(netfs_sreq_trace_free, "FREE ") \ | ||
| EM(netfs_sreq_trace_prepare, "PREP ") \ | ||
| EM(netfs_sreq_trace_resubmit_short, "SHORT") \ | ||
| EM(netfs_sreq_trace_submit, "SUBMT") \ | ||
| EM(netfs_sreq_trace_terminated, "TERM ") \ | ||
| EM(netfs_sreq_trace_write, "WRITE") \ | ||
| E_(netfs_sreq_trace_write_term, "WTERM") | ||
|
|
||
|
|
||
| /* | ||
| * Export enum symbols via userspace. | ||
| */ | ||
| #undef EM | ||
| #undef E_ | ||
| #define EM(a, b) TRACE_DEFINE_ENUM(a); | ||
| #define E_(a, b) TRACE_DEFINE_ENUM(a); | ||
|
|
||
| netfs_read_traces; | ||
| netfs_rreq_traces; | ||
| netfs_sreq_sources; | ||
| netfs_sreq_traces; | ||
|
|
||
| /* | ||
| * Now redefine the EM() and E_() macros to map the enums to the strings that | ||
| * will be printed in the output. | ||
| */ | ||
| #undef EM | ||
| #undef E_ | ||
| #define EM(a, b) { a, b }, | ||
| #define E_(a, b) { a, b } | ||
|
|
||
| TRACE_EVENT(netfs_read, | ||
| TP_PROTO(struct netfs_read_request *rreq, | ||
| loff_t start, size_t len, | ||
| enum netfs_read_trace what), | ||
|
|
||
| TP_ARGS(rreq, start, len, what), | ||
|
|
||
| TP_STRUCT__entry( | ||
| __field(unsigned int, rreq ) | ||
| __field(unsigned int, cookie ) | ||
| __field(loff_t, start ) | ||
| __field(size_t, len ) | ||
| __field(enum netfs_read_trace, what ) | ||
| ), | ||
|
|
||
| TP_fast_assign( | ||
| __entry->rreq = rreq->debug_id; | ||
| __entry->cookie = rreq->cookie_debug_id; | ||
| __entry->start = start; | ||
| __entry->len = len; | ||
| __entry->what = what; | ||
| ), | ||
|
|
||
| TP_printk("R=%08x %s c=%08x s=%llx %zx", | ||
| __entry->rreq, | ||
| __print_symbolic(__entry->what, netfs_read_traces), | ||
| __entry->cookie, | ||
| __entry->start, __entry->len) | ||
| ); | ||
|
|
||
| TRACE_EVENT(netfs_rreq, | ||
| TP_PROTO(struct netfs_read_request *rreq, | ||
| enum netfs_rreq_trace what), | ||
|
|
||
| TP_ARGS(rreq, what), | ||
|
|
||
| TP_STRUCT__entry( | ||
| __field(unsigned int, rreq ) | ||
| __field(unsigned short, flags ) | ||
| __field(enum netfs_rreq_trace, what ) | ||
| ), | ||
|
|
||
| TP_fast_assign( | ||
| __entry->rreq = rreq->debug_id; | ||
| __entry->flags = rreq->flags; | ||
| __entry->what = what; | ||
| ), | ||
|
|
||
| TP_printk("R=%08x %s f=%02x", | ||
| __entry->rreq, | ||
| __print_symbolic(__entry->what, netfs_rreq_traces), | ||
| __entry->flags) | ||
| ); | ||
|
|
||
| TRACE_EVENT(netfs_sreq, | ||
| TP_PROTO(struct netfs_read_subrequest *sreq, | ||
| enum netfs_sreq_trace what), | ||
|
|
||
| TP_ARGS(sreq, what), | ||
|
|
||
| TP_STRUCT__entry( | ||
| __field(unsigned int, rreq ) | ||
| __field(unsigned short, index ) | ||
| __field(short, error ) | ||
| __field(unsigned short, flags ) | ||
| __field(enum netfs_read_source, source ) | ||
| __field(enum netfs_sreq_trace, what ) | ||
| __field(size_t, len ) | ||
| __field(size_t, transferred ) | ||
| __field(loff_t, start ) | ||
| ), | ||
|
|
||
| TP_fast_assign( | ||
| __entry->rreq = sreq->rreq->debug_id; | ||
| __entry->index = sreq->debug_index; | ||
| __entry->error = sreq->error; | ||
| __entry->flags = sreq->flags; | ||
| __entry->source = sreq->source; | ||
| __entry->what = what; | ||
| __entry->len = sreq->len; | ||
| __entry->transferred = sreq->transferred; | ||
| __entry->start = sreq->start; | ||
| ), | ||
|
|
||
| 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), | ||
| __entry->flags, | ||
| __entry->start, __entry->transferred, __entry->len, | ||
| __entry->error) | ||
| ); | ||
|
|
||
| #endif /* _TRACE_NETFS_H */ | ||
|
|
||
| /* This part must be outside protection */ | ||
| #include <trace/define_trace.h> |