lkml.org 
[lkml]   [2015]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH V7 07/25] perf tools: Add a user event for AUX area tracing errors
On Tue, Mar 31, 2015 at 02:38:36PM +0300, Adrian Hunter wrote:
> Errors encountered when decoding an AUX area
> trace need to be reported to the user. However
> the "user" might be a script or another tool,
> so provide a new user event to capture those
> errors.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

> ---
> tools/perf/util/event.c | 1 +
> tools/perf/util/event.h | 16 ++++++++++++++++
> tools/perf/util/session.c | 25 +++++++++++++++++++++++++
> tools/perf/util/tool.h | 3 ++-
> 4 files changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> index cbf3775..6bde493 100644
> --- a/tools/perf/util/event.c
> +++ b/tools/perf/util/event.c
> @@ -31,6 +31,7 @@ static const char *perf_event__names[] = {
> [PERF_RECORD_ID_INDEX] = "ID_INDEX",
> [PERF_RECORD_AUXTRACE_INFO] = "AUXTRACE_INFO",
> [PERF_RECORD_AUXTRACE] = "AUXTRACE",
> + [PERF_RECORD_AUXTRACE_ERROR] = "AUXTRACE_ERROR",
> };
>
> const char *perf_event__name(unsigned int id)
> diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
> index 5dc9329..02327bb 100644
> --- a/tools/perf/util/event.h
> +++ b/tools/perf/util/event.h
> @@ -217,6 +217,7 @@ enum perf_user_event_type { /* above any possible kernel type */
> PERF_RECORD_ID_INDEX = 69,
> PERF_RECORD_AUXTRACE_INFO = 70,
> PERF_RECORD_AUXTRACE = 71,
> + PERF_RECORD_AUXTRACE_ERROR = 72,
> PERF_RECORD_HEADER_MAX
> };
>
> @@ -301,6 +302,20 @@ struct auxtrace_event {
> u32 reserved__; /* For alignment */
> };
>
> +#define MAX_AUXTRACE_ERROR_MSG 64
> +
> +struct auxtrace_error_event {
> + struct perf_event_header header;
> + u32 type;
> + u32 code;
> + u32 cpu;
> + u32 pid;
> + u32 tid;
> + u32 reserved__; /* For alignment */
> + u64 ip;
> + char msg[MAX_AUXTRACE_ERROR_MSG];
> +};
> +
> union perf_event {
> struct perf_event_header header;
> struct mmap_event mmap;
> @@ -318,6 +333,7 @@ union perf_event {
> struct id_index_event id_index;
> struct auxtrace_info_event auxtrace_info;
> struct auxtrace_event auxtrace;
> + struct auxtrace_error_event auxtrace_error;
> };
>
> void perf_event__print_totals(void);
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index a8c67cb..b4cac8b 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -288,6 +288,15 @@ static s64 process_event_auxtrace_stub(struct perf_tool *tool __maybe_unused,
> return event->auxtrace.size;
> }
>
> +static
> +int process_event_auxtrace_error_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;
> +}
> +
> void perf_tool__fill_defaults(struct perf_tool *tool)
> {
> if (tool->sample == NULL)
> @@ -328,6 +337,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
> tool->auxtrace_info = process_event_auxtrace_info_stub;
> if (tool->auxtrace == NULL)
> tool->auxtrace = process_event_auxtrace_stub;
> + if (tool->auxtrace_error == NULL)
> + tool->auxtrace_error = process_event_auxtrace_error_stub;
> }
>
> static void swap_sample_id_all(union perf_event *event, void *data)
> @@ -531,6 +542,17 @@ static void perf_event__auxtrace_swap(union perf_event *event,
> event->auxtrace.cpu = bswap_32(event->auxtrace.cpu);
> }
>
> +static void perf_event__auxtrace_error_swap(union perf_event *event,
> + bool sample_id_all __maybe_unused)
> +{
> + event->auxtrace_error.type = bswap_32(event->auxtrace_error.type);
> + event->auxtrace_error.code = bswap_32(event->auxtrace_error.code);
> + event->auxtrace_error.cpu = bswap_32(event->auxtrace_error.cpu);
> + event->auxtrace_error.pid = bswap_32(event->auxtrace_error.pid);
> + event->auxtrace_error.tid = bswap_32(event->auxtrace_error.tid);
> + event->auxtrace_error.ip = bswap_64(event->auxtrace_error.ip);
> +}
> +
> typedef void (*perf_event__swap_op)(union perf_event *event,
> bool sample_id_all);
>
> @@ -552,6 +574,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
> [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_AUXTRACE_ERROR] = perf_event__auxtrace_error_swap,
> [PERF_RECORD_HEADER_MAX] = NULL,
> };
>
> @@ -1041,6 +1064,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,
> /* setup for reading amidst mmap */
> lseek(fd, file_offset + event->header.size, SEEK_SET);
> return tool->auxtrace(tool, event, session);
> + case PERF_RECORD_AUXTRACE_ERROR:
> + return tool->auxtrace_error(tool, event, session);
> default:
> return -EINVAL;
> }
> diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h
> index 0146f8e..20afe19 100644
> --- a/tools/perf/util/tool.h
> +++ b/tools/perf/util/tool.h
> @@ -50,7 +50,8 @@ struct perf_tool {
> event_oe finished_round;
> event_op2 build_id,
> id_index,
> - auxtrace_info;
> + auxtrace_info,
> + auxtrace_error;
> event_op3 auxtrace;
> bool ordered_events;
> bool ordering_requires_timestamps;
> --
> 1.9.1
>


\
 
 \ /
  Last update: 2015-04-01 14:21    [W:0.135 / U:1.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site