aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/bpf-event.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-02-15 04:19:11 -0500
committerIngo Molnar <mingo@kernel.org>2019-02-15 04:19:11 -0500
commit43f4e6279f05eefac058a3524e184cecae463bfe (patch)
treea29a7fe7e0f187fd7eecc3bbf3dc4daee3fddc14 /tools/perf/util/bpf-event.c
parent02106f883cd745523f7766d90a739f983f19e650 (diff)
parent44ec8396e2dadf0f0806767642cfac9e04d0d5b1 (diff)
Merge tag 'perf-core-for-mingo-5.1-20190214' 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: perf list: Jiri Olsa: - Display metric expressions for --details option perf record: Alexey Budankov: - Implement --affinity=node|cpu option, leftover, the other patches in this kit were already applied. perf trace: Arnaldo Carvalho de Melo: - Fix segfaults due to not properly handling negative file descriptor syscall args. - Fix segfault related to the 'waitid' 'options' prefix showing logic. - Filter out 'gnome-terminal*' if it is a parent of 'perf trace', to reduce the syscall feedback loop in system wide sessions. BPF: Song Liu: - Silence "Couldn't synthesize bpf events" warning for EPERM. Build system: Arnaldo Carvalho de Melo: - Fix the test-all.c feature detection fast path that was broken for quite a while leading to longer build times. Event parsing: Jiri Olsa: - Fix legacy events symbol separator parsing cs-etm: Mathieu Poirier: - Fix some error path return errors and plug some memory leaks. - Add proper header file for symbols - Remove unused structure fields. - Modularize auxtrace_buffer fetch, decoder and packet processing loop. Vendor events: Paul Clarke: - Add assorted metrics for the Power8 and Power9 architectures. perf report: Thomas Richter: - Add s390 diagnostic sampling descriptor size Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/bpf-event.c')
-rw-r--r--tools/perf/util/bpf-event.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
index 796ef793f4ce..62dda96b0096 100644
--- a/tools/perf/util/bpf-event.c
+++ b/tools/perf/util/bpf-event.c
@@ -236,8 +236,8 @@ int perf_event__synthesize_bpf_events(struct perf_tool *tool,
236 pr_debug("%s: can't get next program: %s%s", 236 pr_debug("%s: can't get next program: %s%s",
237 __func__, strerror(errno), 237 __func__, strerror(errno),
238 errno == EINVAL ? " -- kernel too old?" : ""); 238 errno == EINVAL ? " -- kernel too old?" : "");
239 /* don't report error on old kernel */ 239 /* don't report error on old kernel or EPERM */
240 err = (errno == EINVAL) ? 0 : -1; 240 err = (errno == EINVAL || errno == EPERM) ? 0 : -1;
241 break; 241 break;
242 } 242 }
243 fd = bpf_prog_get_fd_by_id(id); 243 fd = bpf_prog_get_fd_by_id(id);