On Tue, Mar 31, 2015 at 02:38:32PM +0300, Adrian Hunter wrote: > Add two user events for AUX area tracing. > > PERF_RECORD_AUXTRACE_INFO contains metadata, > consisting primarily the type of the > AUX area tracing data plus some amount > of architecture-specific information. > There should be only one > PERF_RECORD_AUXTRACE_INFO event. > > PERF_RECORD_AUXTRACE identifies AUX area > tracing data copied from the mmapped > AUX area tracing region. The actual > data is not part of the event but > immediately follows it. > > Signed-off-by: Adrian Hunter <[email protected]>
Acked-by: Jiri Olsa <[email protected]> > --- > tools/perf/util/event.c | 2 ++ > tools/perf/util/event.h | 22 +++++++++++++++ > tools/perf/util/session.c | 69 > +++++++++++++++++++++++++++++++++++++++++++++++ > tools/perf/util/tool.h | 9 ++++++- > 4 files changed, 101 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c > index d5efa50..cbf3775 100644 > --- a/tools/perf/util/event.c > +++ b/tools/perf/util/event.c > @@ -29,6 +29,8 @@ static const char *perf_event__names[] = { > [PERF_RECORD_HEADER_BUILD_ID] = "BUILD_ID", > [PERF_RECORD_FINISHED_ROUND] = "FINISHED_ROUND", > [PERF_RECORD_ID_INDEX] = "ID_INDEX", > + [PERF_RECORD_AUXTRACE_INFO] = "AUXTRACE_INFO", > + [PERF_RECORD_AUXTRACE] = "AUXTRACE", > }; > > const char *perf_event__name(unsigned int id) > diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h > index c4ffe2b..5dc9329 100644 > --- a/tools/perf/util/event.h > +++ b/tools/perf/util/event.h > @@ -215,6 +215,8 @@ enum perf_user_event_type { /* above any possible kernel > type */ > PERF_RECORD_HEADER_BUILD_ID = 67, > PERF_RECORD_FINISHED_ROUND = 68, > PERF_RECORD_ID_INDEX = 69, > + PERF_RECORD_AUXTRACE_INFO = 70, > + PERF_RECORD_AUXTRACE = 71, > PERF_RECORD_HEADER_MAX > }; > > @@ -281,6 +283,24 @@ struct id_index_event { > struct id_index_entry entries[0]; > }; > > +struct auxtrace_info_event { > + struct perf_event_header header; > + u32 type; > + u32 reserved__; /* For alignment */ > + u64 priv[]; > +}; > + > +struct auxtrace_event { > + struct perf_event_header header; > + u64 size; > + u64 offset; > + u64 reference; > + u32 idx; > + u32 tid; > + u32 cpu; > + u32 reserved__; /* For alignment */ > +}; > + > union perf_event { > struct perf_event_header header; > struct mmap_event mmap; > @@ -296,6 +316,8 @@ union perf_event { > struct tracing_data_event tracing_data; > struct build_id_event build_id; > struct id_index_event id_index; > + struct auxtrace_info_event auxtrace_info; > + struct auxtrace_event auxtrace; > }; > > void perf_event__print_totals(void); > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c > index adf0740..a8c67cb 100644 > --- a/tools/perf/util/session.c > +++ b/tools/perf/util/session.c > @@ -254,6 +254,40 @@ static int process_id_index_stub(struct perf_tool *tool > __maybe_unused, > return 0; > } > > +static int process_event_auxtrace_info_stub(struct perf_tool *tool > __maybe_unused, > + union perf_event *event __maybe_unused, > + struct perf_session *session __maybe_unused) > +{ > + dump_printf(": unhandled!\n"); > + return 0; > +} > + > +static int skipn(int fd, off_t n) > +{ > + char buf[4096]; > + ssize_t ret; > + > + while (n > 0) { > + ret = read(fd, buf, MIN(n, sizeof(buf))); > + if (ret <= 0) > + return ret; > + n -= ret; > + } > + > + return 0; > +} > + > +static s64 process_event_auxtrace_stub(struct perf_tool *tool __maybe_unused, > + union perf_event *event, > + struct perf_session *session > + __maybe_unused) > +{ > + dump_printf(": unhandled!\n"); > + if (perf_data_file__is_pipe(session->file)) > + skipn(perf_data_file__fd(session->file), event->auxtrace.size); > + return event->auxtrace.size; > +} > + > void perf_tool__fill_defaults(struct perf_tool *tool) > { > if (tool->sample == NULL) > @@ -290,6 +324,10 @@ void perf_tool__fill_defaults(struct perf_tool *tool) > } > if (tool->id_index == NULL) > tool->id_index = process_id_index_stub; > + if (tool->auxtrace_info == NULL) > + tool->auxtrace_info = process_event_auxtrace_info_stub; > + if (tool->auxtrace == NULL) > + tool->auxtrace = process_event_auxtrace_stub; > } > > static void swap_sample_id_all(union perf_event *event, void *data) > @@ -470,6 +508,29 @@ static void perf_event__tracing_data_swap(union > perf_event *event, > event->tracing_data.size = bswap_32(event->tracing_data.size); > } > > +static void perf_event__auxtrace_info_swap(union perf_event *event, > + bool sample_id_all __maybe_unused) > +{ > + size_t size; > + > + event->auxtrace_info.type = bswap_32(event->auxtrace_info.type); > + > + size = event->header.size; > + size -= (void *)&event->auxtrace_info.priv - (void *)event; > + mem_bswap_64(event->auxtrace_info.priv, size); > +} > + > +static void perf_event__auxtrace_swap(union perf_event *event, > + bool sample_id_all __maybe_unused) > +{ > + event->auxtrace.size = bswap_64(event->auxtrace.size); > + event->auxtrace.offset = bswap_64(event->auxtrace.offset); > + event->auxtrace.reference = bswap_64(event->auxtrace.reference); > + event->auxtrace.idx = bswap_32(event->auxtrace.idx); > + event->auxtrace.tid = bswap_32(event->auxtrace.tid); > + event->auxtrace.cpu = bswap_32(event->auxtrace.cpu); > +} > + > typedef void (*perf_event__swap_op)(union perf_event *event, > bool sample_id_all); > > @@ -489,6 +550,8 @@ static perf_event__swap_op perf_event__swap_ops[] = { > [PERF_RECORD_HEADER_TRACING_DATA] = perf_event__tracing_data_swap, > [PERF_RECORD_HEADER_BUILD_ID] = NULL, > [PERF_RECORD_ID_INDEX] = perf_event__all64_swap, > + [PERF_RECORD_AUXTRACE_INFO] = perf_event__auxtrace_info_swap, > + [PERF_RECORD_AUXTRACE] = perf_event__auxtrace_swap, > [PERF_RECORD_HEADER_MAX] = NULL, > }; > > @@ -972,6 +1035,12 @@ static s64 perf_session__process_user_event(struct > perf_session *session, > return tool->finished_round(tool, event, oe); > case PERF_RECORD_ID_INDEX: > return tool->id_index(tool, event, session); > + case PERF_RECORD_AUXTRACE_INFO: > + return tool->auxtrace_info(tool, event, session); > + case PERF_RECORD_AUXTRACE: > + /* setup for reading amidst mmap */ > + lseek(fd, file_offset + event->header.size, SEEK_SET); > + return tool->auxtrace(tool, event, session); > default: > return -EINVAL; > } > diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h > index 51d9e56..0146f8e 100644 > --- a/tools/perf/util/tool.h > +++ b/tools/perf/util/tool.h > @@ -3,6 +3,8 @@ > > #include <stdbool.h> > > +#include <linux/types.h> > + > struct perf_session; > union perf_event; > struct perf_evlist; > @@ -29,6 +31,9 @@ typedef int (*event_op2)(struct perf_tool *tool, union > perf_event *event, > typedef int (*event_oe)(struct perf_tool *tool, union perf_event *event, > struct ordered_events *oe); > > +typedef s64 (*event_op3)(struct perf_tool *tool, union perf_event *event, > + struct perf_session *session); > + > struct perf_tool { > event_sample sample, > read; > @@ -44,7 +49,9 @@ struct perf_tool { > event_op2 tracing_data; > event_oe finished_round; > event_op2 build_id, > - id_index; > + id_index, > + auxtrace_info; > + event_op3 auxtrace; > bool ordered_events; > bool ordering_requires_timestamps; > }; > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
