diff options
| author |   Song Liu <song@kernel.org> | 2021-12-07 15:23:40 -0800 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2021-12-08 11:55:45 -0800 |
| commit | 8d0f9e73efe7f0ff4b1d0d013044e8ef91782689 (patch) | |
| tree | 6f0357ac11d1631292f3d652a2f54013b2f4dc0d /tools/perf/util/bpf_counter.c | |
| parent | Merge branch 'samples: bpf: fix build issues with Clang/LLVM' (diff) | |
| download | linux-dev-8d0f9e73efe7f0ff4b1d0d013044e8ef91782689.tar.xz linux-dev-8d0f9e73efe7f0ff4b1d0d013044e8ef91782689.zip | |
perf/bpf_counter: Use bpf_map_create instead of bpf_create_map
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>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211207232340.2561471-1-song@kernel.org
Diffstat (limited to 'tools/perf/util/bpf_counter.c')
| -rw-r--r-- | tools/perf/util/bpf_counter.c | 18 |
1 files changed, 16 insertions, 2 deletions
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; |