| Message ID | 20211207232340.2561471-1-song@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8d0f9e73efe7f0ff4b1d0d013044e8ef91782689 |
| Delegated to: | BPF |
| Headers | show |
| Series | [v2,bpf-next] perf/bpf_counter: use bpf_map_create instead of bpf_create_map | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Tue, 7 Dec 2021 15:23:40 -0800 you wrote: > bpf_create_map is deprecated. Replace it with bpf_map_create. Also add a > __weak bpf_map_create() so that when older version of libbpf is linked as > a shared library, it falls back to bpf_create_map(). > > Fixes: 992c4225419a ("libbpf: Unify low-level map creation APIs w/ new bpf_map_create()") > Signed-off-by: Song Liu <song@kernel.org> > > [...] Here is the summary with links: - [v2,bpf-next] perf/bpf_counter: use bpf_map_create instead of bpf_create_map https://git.kernel.org/bpf/bpf-next/c/8d0f9e73efe7 You are awesome, thank you!
diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c index c17d4a43ce06..5a97fd7d0a71 100644 --- a/tools/perf/util/bpf_counter.c +++ b/tools/perf/util/bpf_counter.c @@ -307,6 +307,20 @@ static bool bperf_attr_map_compatible(int attr_map_fd) (map_info.value_size == sizeof(struct perf_event_attr_map_entry)); } +int __weak +bpf_map_create(enum bpf_map_type map_type, + const char *map_name __maybe_unused, + __u32 key_size, + __u32 value_size, + __u32 max_entries, + const struct bpf_map_create_opts *opts __maybe_unused) +{ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + return bpf_create_map(map_type, key_size, value_size, max_entries, 0); +#pragma GCC diagnostic pop +} + static int bperf_lock_attr_map(struct target *target) { char path[PATH_MAX]; @@ -320,10 +334,10 @@ static int bperf_lock_attr_map(struct target *target) } if (access(path, F_OK)) { - map_fd = bpf_create_map(BPF_MAP_TYPE_HASH, + map_fd = bpf_map_create(BPF_MAP_TYPE_HASH, NULL, sizeof(struct perf_event_attr), sizeof(struct perf_event_attr_map_entry), - ATTR_MAP_SIZE, 0); + ATTR_MAP_SIZE, NULL); if (map_fd < 0) return -1;
bpf_create_map is deprecated. Replace it with bpf_map_create. Also add a __weak bpf_map_create() so that when older version of libbpf is linked as a shared library, it falls back to bpf_create_map(). Fixes: 992c4225419a ("libbpf: Unify low-level map creation APIs w/ new bpf_map_create()") Signed-off-by: Song Liu <song@kernel.org> --- Changes v1 => v2: 1. Add weak bpf_map_create(). (Andrii) --- tools/perf/util/bpf_counter.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)