From: Christy Lee Date: Wed, 5 Jan 2022 00:06:01 +0000 (-0800) Subject: libbpf 1.0: Deprecate bpf_map__is_offload_neutral() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9855c131b9c8b0327ff5182f88bb1991f212415b;p=linux.git libbpf 1.0: Deprecate bpf_map__is_offload_neutral() Deprecate bpf_map__is_offload_neutral(). It’s most probably broken already. PERF_EVENT_ARRAY isn’t the only map that’s not suitable for hardware offloading. Applications can directly check map type instead. [0] Closes: https://github.com/libbpf/libbpf/issues/306 Signed-off-by: Christy Lee Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220105000601.2090044-1-christylee@fb.com --- diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index f874896c4154e..2a21d50516bc4 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -1655,7 +1655,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) j = 0; idx = 0; bpf_object__for_each_map(map, obj) { - if (!bpf_map__is_offload_neutral(map)) + if (bpf_map__type(map) != BPF_MAP_TYPE_PERF_EVENT_ARRAY) bpf_map__set_ifindex(map, ifindex); if (j < old_map_fds && idx == map_replace[j].idx) { diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index ddf1cc9e78033..88dd943ba545e 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -744,6 +744,7 @@ LIBBPF_API void *bpf_map__priv(const struct bpf_map *map); LIBBPF_API int bpf_map__set_initial_value(struct bpf_map *map, const void *data, size_t size); LIBBPF_API const void *bpf_map__initial_value(struct bpf_map *map, size_t *psize); +LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_map__type() instead") LIBBPF_API bool bpf_map__is_offload_neutral(const struct bpf_map *map); /**