libbpf: Add missed btf_ext__raw_data() API

Another API that was declared in libbpf.map but actual implementation
was missing. btf_ext__get_raw_data() was intended as a discouraged alias
to consistently-named btf_ext__raw_data(), so make this an actuality.

Fixes: 20eccf29e297 ("libbpf: hide and discourage inconsistently named getters")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/bpf/20240201172027.604869-5-andrii@kernel.org
This commit is contained in:
Andrii Nakryiko
2024-02-01 09:20:26 -08:00
committed by Andrii Nakryiko
parent 5b7613e50f
commit 95b4beb502
3 changed files with 7 additions and 3 deletions

View File

@@ -3050,12 +3050,16 @@ done:
return btf_ext; return btf_ext;
} }
const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size) const void *btf_ext__raw_data(const struct btf_ext *btf_ext, __u32 *size)
{ {
*size = btf_ext->data_size; *size = btf_ext->data_size;
return btf_ext->data; return btf_ext->data;
} }
__attribute__((alias("btf_ext__raw_data")))
const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size);
struct btf_dedup; struct btf_dedup;
static struct btf_dedup *btf_dedup_new(struct btf *btf, const struct btf_dedup_opts *opts); static struct btf_dedup *btf_dedup_new(struct btf *btf, const struct btf_dedup_opts *opts);

View File

@@ -325,7 +325,6 @@ LIBBPF_0.7.0 {
bpf_xdp_detach; bpf_xdp_detach;
bpf_xdp_query; bpf_xdp_query;
bpf_xdp_query_id; bpf_xdp_query_id;
btf_ext__raw_data;
libbpf_probe_bpf_helper; libbpf_probe_bpf_helper;
libbpf_probe_bpf_map_type; libbpf_probe_bpf_map_type;
libbpf_probe_bpf_prog_type; libbpf_probe_bpf_prog_type;
@@ -413,4 +412,5 @@ LIBBPF_1.4.0 {
global: global:
bpf_token_create; bpf_token_create;
btf__new_split; btf__new_split;
btf_ext__raw_data;
} LIBBPF_1.3.0; } LIBBPF_1.3.0;

View File

@@ -2732,7 +2732,7 @@ static int finalize_btf(struct bpf_linker *linker)
/* Emit .BTF.ext section */ /* Emit .BTF.ext section */
if (linker->btf_ext) { if (linker->btf_ext) {
raw_data = btf_ext__get_raw_data(linker->btf_ext, &raw_sz); raw_data = btf_ext__raw_data(linker->btf_ext, &raw_sz);
if (!raw_data) if (!raw_data)
return -ENOMEM; return -ENOMEM;