| From 4afc2007e263e4589fb7773a557b19feaf98ad6e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 16 Sep 2022 11:41:29 -0700 |
| Subject: perf stat: Fix BPF program section name |
| |
| From: Namhyung Kim <namhyung@kernel.org> |
| |
| [ Upstream commit 0d77326c3369e255715ed2440a78894ccc98dd69 ] |
| |
| It seems the recent libbpf got more strict about the section name. |
| I'm seeing a failure like this: |
| |
| $ sudo ./perf stat -a --bpf-counters --for-each-cgroup ^. sleep 1 |
| libbpf: prog 'on_cgrp_switch': missing BPF prog type, check ELF section name 'perf_events' |
| libbpf: prog 'on_cgrp_switch': failed to load: -22 |
| libbpf: failed to load object 'bperf_cgroup_bpf' |
| libbpf: failed to load BPF skeleton 'bperf_cgroup_bpf': -22 |
| Failed to load cgroup skeleton |
| |
| The section name should be 'perf_event' (without the trailing 's'). |
| Although it's related to the libbpf change, it'd be better fix the |
| section name in the first place. |
| |
| Fixes: 944138f048f7d759 ("perf stat: Enable BPF counter with --for-each-cgroup") |
| Signed-off-by: Namhyung Kim <namhyung@kernel.org> |
| Cc: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: bpf@vger.kernel.org |
| Cc: Ian Rogers <irogers@google.com> |
| Cc: Ingo Molnar <mingo@kernel.org> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Song Liu <songliubraving@fb.com> |
| Link: https://lore.kernel.org/r/20220916184132.1161506-2-namhyung@kernel.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/perf/util/bpf_skel/bperf_cgroup.bpf.c b/tools/perf/util/bpf_skel/bperf_cgroup.bpf.c |
| index 292c430768b5..c72f8ad96f75 100644 |
| --- a/tools/perf/util/bpf_skel/bperf_cgroup.bpf.c |
| +++ b/tools/perf/util/bpf_skel/bperf_cgroup.bpf.c |
| @@ -176,7 +176,7 @@ static int bperf_cgroup_count(void) |
| } |
| |
| // This will be attached to cgroup-switches event for each cpu |
| -SEC("perf_events") |
| +SEC("perf_event") |
| int BPF_PROG(on_cgrp_switch) |
| { |
| return bperf_cgroup_count(); |
| -- |
| 2.35.1 |
| |