Commit 85ed4729 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf auxtrace: Add helpers for AUX area tracing errors

Add functions to synthesize, count and print AUX area tracing error
events.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1428594864-29309-11-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f6986c95
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/log2.h> #include <linux/log2.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
#include "auxtrace.h" #include "auxtrace.h"
#include "event.h" #include "event.h"
#include "session.h"
#include "debug.h" #include "debug.h"
#include "parse-options.h" #include "parse-options.h"
...@@ -172,6 +174,28 @@ auxtrace_record__init(struct perf_evlist *evlist __maybe_unused, int *err) ...@@ -172,6 +174,28 @@ auxtrace_record__init(struct perf_evlist *evlist __maybe_unused, int *err)
return NULL; return NULL;
} }
void auxtrace_synth_error(struct auxtrace_error_event *auxtrace_error, int type,
int code, int cpu, pid_t pid, pid_t tid, u64 ip,
const char *msg)
{
size_t size;
memset(auxtrace_error, 0, sizeof(struct auxtrace_error_event));
auxtrace_error->header.type = PERF_RECORD_AUXTRACE_ERROR;
auxtrace_error->type = type;
auxtrace_error->code = code;
auxtrace_error->cpu = cpu;
auxtrace_error->pid = pid;
auxtrace_error->tid = tid;
auxtrace_error->ip = ip;
strlcpy(auxtrace_error->msg, msg, MAX_AUXTRACE_ERROR_MSG);
size = (void *)auxtrace_error->msg - (void *)auxtrace_error +
strlen(auxtrace_error->msg) + 1;
auxtrace_error->header.size = PERF_ALIGN(size, sizeof(u64));
}
int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr, int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr,
struct perf_tool *tool, struct perf_tool *tool,
struct perf_session *session, struct perf_session *session,
...@@ -336,6 +360,63 @@ int itrace_parse_synth_opts(const struct option *opt, const char *str, ...@@ -336,6 +360,63 @@ int itrace_parse_synth_opts(const struct option *opt, const char *str,
return -EINVAL; return -EINVAL;
} }
static const char * const auxtrace_error_type_name[] = {
[PERF_AUXTRACE_ERROR_ITRACE] = "instruction trace",
};
static const char *auxtrace_error_name(int type)
{
const char *error_type_name = NULL;
if (type < PERF_AUXTRACE_ERROR_MAX)
error_type_name = auxtrace_error_type_name[type];
if (!error_type_name)
error_type_name = "unknown AUX";
return error_type_name;
}
size_t perf_event__fprintf_auxtrace_error(union perf_event *event, FILE *fp)
{
struct auxtrace_error_event *e = &event->auxtrace_error;
int ret;
ret = fprintf(fp, " %s error type %u",
auxtrace_error_name(e->type), e->type);
ret += fprintf(fp, " cpu %d pid %d tid %d ip %#"PRIx64" code %u: %s\n",
e->cpu, e->pid, e->tid, e->ip, e->code, e->msg);
return ret;
}
void perf_session__auxtrace_error_inc(struct perf_session *session,
union perf_event *event)
{
struct auxtrace_error_event *e = &event->auxtrace_error;
if (e->type < PERF_AUXTRACE_ERROR_MAX)
session->evlist->stats.nr_auxtrace_errors[e->type] += 1;
}
void events_stats__auxtrace_error_warn(const struct events_stats *stats)
{
int i;
for (i = 0; i < PERF_AUXTRACE_ERROR_MAX; i++) {
if (!stats->nr_auxtrace_errors[i])
continue;
ui__warning("%u %s errors\n",
stats->nr_auxtrace_errors[i],
auxtrace_error_name(i));
}
}
int perf_event__process_auxtrace_error(struct perf_tool *tool __maybe_unused,
union perf_event *event,
struct perf_session *session __maybe_unused)
{
perf_event__fprintf_auxtrace_error(event, stdout);
return 0;
}
int auxtrace_mmap__read(struct auxtrace_mmap *mm, struct auxtrace_record *itr, int auxtrace_mmap__read(struct auxtrace_mmap *mm, struct auxtrace_record *itr,
struct perf_tool *tool, process_auxtrace_t fn) struct perf_tool *tool, process_auxtrace_t fn)
{ {
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/types.h> #include <linux/types.h>
#include "../perf.h" #include "../perf.h"
#include "event.h"
#include "session.h" #include "session.h"
union perf_event; union perf_event;
...@@ -32,6 +33,7 @@ struct perf_tool; ...@@ -32,6 +33,7 @@ struct perf_tool;
struct option; struct option;
struct record_opts; struct record_opts;
struct auxtrace_info_event; struct auxtrace_info_event;
struct events_stats;
enum itrace_period_type { enum itrace_period_type {
PERF_ITRACE_PERIOD_INSTRUCTIONS, PERF_ITRACE_PERIOD_INSTRUCTIONS,
...@@ -222,14 +224,26 @@ int auxtrace_record__info_fill(struct auxtrace_record *itr, ...@@ -222,14 +224,26 @@ int auxtrace_record__info_fill(struct auxtrace_record *itr,
void auxtrace_record__free(struct auxtrace_record *itr); void auxtrace_record__free(struct auxtrace_record *itr);
u64 auxtrace_record__reference(struct auxtrace_record *itr); u64 auxtrace_record__reference(struct auxtrace_record *itr);
void auxtrace_synth_error(struct auxtrace_error_event *auxtrace_error, int type,
int code, int cpu, pid_t pid, pid_t tid, u64 ip,
const char *msg);
int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr, int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr,
struct perf_tool *tool, struct perf_tool *tool,
struct perf_session *session, struct perf_session *session,
perf_event__handler_t process); perf_event__handler_t process);
int perf_event__process_auxtrace_error(struct perf_tool *tool,
union perf_event *event,
struct perf_session *session);
int itrace_parse_synth_opts(const struct option *opt, const char *str, int itrace_parse_synth_opts(const struct option *opt, const char *str,
int unset); int unset);
void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts); void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts);
size_t perf_event__fprintf_auxtrace_error(union perf_event *event, FILE *fp);
void perf_session__auxtrace_error_inc(struct perf_session *session,
union perf_event *event);
void events_stats__auxtrace_error_warn(const struct events_stats *stats);
static inline int auxtrace__process_event(struct perf_session *session, static inline int auxtrace__process_event(struct perf_session *session,
union perf_event *event, union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
......
...@@ -221,6 +221,11 @@ enum perf_user_event_type { /* above any possible kernel type */ ...@@ -221,6 +221,11 @@ enum perf_user_event_type { /* above any possible kernel type */
PERF_RECORD_HEADER_MAX PERF_RECORD_HEADER_MAX
}; };
enum auxtrace_error_type {
PERF_AUXTRACE_ERROR_ITRACE = 1,
PERF_AUXTRACE_ERROR_MAX
};
/* /*
* The kernel collects the number of events it couldn't send in a stretch and * The kernel collects the number of events it couldn't send in a stretch and
* when possible sends this number in a PERF_RECORD_LOST event. The number of * when possible sends this number in a PERF_RECORD_LOST event. The number of
...@@ -245,6 +250,7 @@ struct events_stats { ...@@ -245,6 +250,7 @@ struct events_stats {
u32 nr_invalid_chains; u32 nr_invalid_chains;
u32 nr_unknown_id; u32 nr_unknown_id;
u32 nr_unprocessable_samples; u32 nr_unprocessable_samples;
u32 nr_auxtrace_errors[PERF_AUXTRACE_ERROR_MAX];
}; };
struct attr_event { struct attr_event {
......
...@@ -1093,6 +1093,7 @@ static s64 perf_session__process_user_event(struct perf_session *session, ...@@ -1093,6 +1093,7 @@ static s64 perf_session__process_user_event(struct perf_session *session,
lseek(fd, file_offset + event->header.size, SEEK_SET); lseek(fd, file_offset + event->header.size, SEEK_SET);
return tool->auxtrace(tool, event, session); return tool->auxtrace(tool, event, session);
case PERF_RECORD_AUXTRACE_ERROR: case PERF_RECORD_AUXTRACE_ERROR:
perf_session__auxtrace_error_inc(session, event);
return tool->auxtrace_error(tool, event, session); return tool->auxtrace_error(tool, event, session);
default: default:
return -EINVAL; return -EINVAL;
...@@ -1282,6 +1283,8 @@ static void perf_session__warn_about_errors(const struct perf_session *session) ...@@ -1282,6 +1283,8 @@ static void perf_session__warn_about_errors(const struct perf_session *session)
if (oe->nr_unordered_events != 0) if (oe->nr_unordered_events != 0)
ui__warning("%u out of order events recorded.\n", oe->nr_unordered_events); ui__warning("%u out of order events recorded.\n", oe->nr_unordered_events);
events_stats__auxtrace_error_warn(stats);
} }
volatile int session_done; volatile int session_done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment