Commit b9551da8 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann
Browse files

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: 20eccf29 ("libbpf: hide and discourage inconsistently named getters")
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/bpf/20240201172027.604869-5-andrii@kernel.org
parent c81a8ab1

tools/lib/bpf/btf.c

+5 −1
Original line number Diff line number Diff line
@@ -3050,12 +3050,16 @@ struct btf_ext *btf_ext__new(const __u8 *data, __u32 size) 
	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;

	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;



static struct btf_dedup *btf_dedup_new(struct btf *btf, const struct btf_dedup_opts *opts);

tools/lib/bpf/libbpf.map

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ LIBBPF_0.7.0 { 
		bpf_xdp_detach;

		bpf_xdp_query;

		bpf_xdp_query_id;

		btf_ext__raw_data;

		libbpf_probe_bpf_helper;

		libbpf_probe_bpf_map_type;

		libbpf_probe_bpf_prog_type;
@@ -413,4 +412,5 @@ LIBBPF_1.4.0 { 
	global:

		bpf_token_create;

		btf__new_split;

		btf_ext__raw_data;

} LIBBPF_1.3.0;

tools/lib/bpf/linker.c

+1 −1
Original line number Diff line number Diff line
@@ -2732,7 +2732,7 @@ static int finalize_btf(struct bpf_linker *linker) 


	/* Emit .BTF.ext section */

	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)

			return -ENOMEM;