From 710f6c38bc5f49323b2d1e80ccb683f149477e51 Mon Sep 17 00:00:00 2001 From: Christy Lee Date: Fri, 11 Feb 2022 23:30:53 -0800 Subject: perf bpf: Stop using deprecated bpf_load_program() API bpf_load_program() API is deprecated, remove perf's usage of the deprecated function. Add a __weak function declaration for libbpf version compatibility. Signed-off-by: Christy Lee Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Jiri Olsa Cc: bpf@vger.kernel.org Cc: kernel-team@fb.com Link: https://lore.kernel.org/bpf/20220212073054.1052880-2-andrii@kernel.org Signed-off-by: Andrii Nakryiko Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/bpf-event.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tools/perf/util/bpf-event.c') diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c index a517eaa51eb3..bd1bc3c86cac 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c @@ -33,6 +33,19 @@ struct btf * __weak btf__load_from_kernel_by_id(__u32 id) return err ? ERR_PTR(err) : btf; } +int __weak bpf_prog_load(enum bpf_prog_type prog_type, + const char *prog_name __maybe_unused, + const char *license, + const struct bpf_insn *insns, size_t insn_cnt, + const struct bpf_prog_load_opts *opts) +{ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + return bpf_load_program(prog_type, insns, insn_cnt, license, + opts->kern_version, opts->log_buf, opts->log_size); +#pragma GCC diagnostic pop +} + struct bpf_program * __weak bpf_object__next_program(const struct bpf_object *obj, struct bpf_program *prev) { -- cgit v1.2.3