diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-22 17:26:24 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-22 17:26:24 +0100 |
| commit | 7e74efcf76c16f851df5c838c143c4a1865ea9fa (patch) | |
| tree | 71aba57213c2f5c5a47fd1ab93d4fea100f68008 /tools/perf/util/parse-events.c | |
| parent | e9d9768824a18212712ae3afbebd5bfef05176f4 (diff) | |
| parent | a15ad2f5360c821f030c53266ebf467738249c68 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User Visible:
* Allow setting preferred callchain method in .perfconfig (Jiri Olsa)
* Show in what binaries/modules 'perf probe's are set (Masami Hiramatsu)
* Support distro-style debuginfo for uprobe in 'perf probe' (Masami Hiramatsu)
Developer stuff:
* Move some hashing and fs related code from tools/perf/util/
to tools/lib/ so that it can be used by more tools/ living
utilities (Borislav Petkov)
* Prepare DWARF unwinding code for using an elfutils alternative
unwinding library (Jiri Olsa)
* Fix DWARF unwind max_stack processing (Jiri Olsa)
* Add dwarf unwind 'perf test' entry (Jiri Olsa)
* 'perf probe' improvements including memory leak fixes,
sharing the intlist class with other tools, uprobes/kprobes
code sharing and use of ref_reloc_sym (Masami Hiramatsu)
* Shorten sample symbol resolving by adding cpumode to
struct addr_location (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/parse-events.c')
| -rw-r--r-- | tools/perf/util/parse-events.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index d248fca6d7e..1e15df10a88 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1091,12 +1091,12 @@ int is_valid_tracepoint(const char *event_string) static bool is_event_supported(u8 type, unsigned config) { bool ret = true; + int open_return; struct perf_evsel *evsel; struct perf_event_attr attr = { .type = type, .config = config, .disabled = 1, - .exclude_kernel = 1, }; struct { struct thread_map map; @@ -1108,7 +1108,20 @@ static bool is_event_supported(u8 type, unsigned config) evsel = perf_evsel__new(&attr); if (evsel) { - ret = perf_evsel__open(evsel, NULL, &tmap.map) >= 0; + open_return = perf_evsel__open(evsel, NULL, &tmap.map); + ret = open_return >= 0; + + if (open_return == -EACCES) { + /* + * This happens if the paranoid value + * /proc/sys/kernel/perf_event_paranoid is set to 2 + * Re-run with exclude_kernel set; we don't do that + * by default as some ARM machines do not support it. + * + */ + evsel->attr.exclude_kernel = 1; + ret = perf_evsel__open(evsel, NULL, &tmap.map) >= 0; + } perf_evsel__delete(evsel); } |