libbpf: deprecate forgotten btf__get_map_kv_tids()
Andrii Nakryiko
maintainerPATCH 1/1 libbpf: deprecate forgotten btf__get_map_kv_tids()
btf__get_map_kv_tids() is in the same group of APIs as btf_ext__reloc_func_info()/btf_ext__reloc_line_info() which were only used by BCC. It was missed to be marked as deprecated in [0]. Fixing that to complete [1].
[0] https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
[1] Closes: https://github.com/libbpf/libbpf/issues/277
--- tools/lib/bpf/btf.h | 1 + tools/lib/bpf/libbpf.c | 3 +++ 2 files changed, 4 insertions(+)
tools/lib/bpf/btf.h +1 -0
@@ -150,6 +150,7 @@ LIBBPF_API void btf__set_fd(struct btf *btf, int fd); LIBBPF_API const void *btf__raw_data(const struct btf *btf, __u32 *size); LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset); LIBBPF_API const char *btf__str_by_offset(const struct btf *btf, __u32 offset); +LIBBPF_DEPRECATED_SINCE(0, 7, "this API is not necessary when BTF-defined maps are used") LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, const char *map_name, __u32 expected_key_size, __u32 expected_value_size,
tools/lib/bpf/libbpf.c +3 -0
@@ -4202,9 +4202,12 @@ static int bpf_map_find_btf_info(struct bpf_object *obj, struct bpf_map *map)if (!bpf_map__is_internal (map)) {pr_warn ("Use of BPF_ANNOTATE_KV_PAIR is deprecated, use BTF-defined maps in .maps section instead\n" ); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ret =btf__get_map_kv_tids (obj->btf, map->name, def->key_size, def->value_size, &key_type_id, &value_type_id); +#pragma GCC diagnostic pop }else {/* * LLVM annotates global data differently in BTF, that is,
Signature · 1 line
2.30.2
Quoted 11 lines · Andrii Nakryiko
btf__get_map_kv_tids()is in the same group of APIs as btf_ext__reloc_func_info()/btf_ext__reloc_line_info() which were only used by BCC. It was missed to be marked as deprecated in [0]. Fixing that to complete [1].[0] https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/ [1] Closes: https://github.com/libbpf/libbpf/issues/277Cc Dave Marchevsky <[email protected]>Cc Yonghong Song <[email protected]>Signed-off-by Andrii Nakryiko <[email protected]>
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Thu, 3 Feb 2022 14:50:17 -0800 you wrote:
btf__get_map_kv_tids()is in the same group of APIs as btf_ext__reloc_func_info()/btf_ext__reloc_line_info() which were only used by BCC. It was missed to be marked as deprecated in [0]. Fixing that to complete [1].[0] https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
[1] Closes: https://github.com/libbpf/libbpf/issues/277[...]
Here is the summary with links:
- [bpf-next] libbpf: deprecate forgotten btf__get_map_kv_tids()
https://git.kernel.org/bpf/bpf-next/c/227a0713b319
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html