diff options
| author | Quentin Monnet <quentin@isovalent.com> | 2021-07-29 17:20:25 +0100 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2021-07-29 17:23:52 -0700 |
| commit | 86f4b7f2578f69284fa782be54e700c42c757897 (patch) | |
| tree | 9944eb0e0bfd66dae5ccbe9d91b8c0beed0ace82 /tools/perf/util/bpf-event.c | |
| parent | 369e955b3d1c12f6ec2e51a95911bb80ada55d79 (diff) | |
| download | linux-stable-86f4b7f2578f69284fa782be54e700c42c757897.tar.gz linux-stable-86f4b7f2578f69284fa782be54e700c42c757897.tar.bz2 linux-stable-86f4b7f2578f69284fa782be54e700c42c757897.zip | |
tools: Replace btf__get_from_id() with btf__load_from_kernel_by_id()
Replace the calls to function btf__get_from_id(), which we plan to
deprecate before the library reaches v1.0, with calls to
btf__load_from_kernel_by_id() in tools/ (bpftool, perf, selftests).
Update the surrounding code accordingly (instead of passing a pointer to
the btf struct, get it as a return value from the function).
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210729162028.29512-6-quentin@isovalent.com
Diffstat (limited to 'tools/perf/util/bpf-event.c')
| -rw-r--r-- | tools/perf/util/bpf-event.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c index 17a9844e4fbf..996d025b8ed8 100644 --- a/tools/perf/util/bpf-event.c +++ b/tools/perf/util/bpf-event.c @@ -223,10 +223,10 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session, free(info_linear); return -1; } - if (btf__get_from_id(info->btf_id, &btf)) { + btf = btf__load_from_kernel_by_id(info->btf_id); + if (libbpf_get_error(btf)) { pr_debug("%s: failed to get BTF of id %u, aborting\n", __func__, info->btf_id); err = -1; - btf = NULL; goto out; } perf_env__fetch_btf(env, info->btf_id, btf); @@ -478,7 +478,8 @@ static void perf_env__add_bpf_info(struct perf_env *env, u32 id) if (btf_id == 0) goto out; - if (btf__get_from_id(btf_id, &btf)) { + btf = btf__load_from_kernel_by_id(btf_id); + if (libbpf_get_error(btf)) { pr_debug("%s: failed to get BTF of id %u, aborting\n", __func__, btf_id); goto out; |