libbpf: Wrap libbpf API direct err with libbpf_err
PATCH v2 1/1 libbpf: Wrap libbpf API direct err with libbpf_err
From: Tao Chen <[email protected]>
Just wrap the direct err with libbpf_err, keep consistency with other APIs.
Acked-by Eduard Zingerman <[email protected]>
Signed-off-by Tao Chen <[email protected]>
--- tools/lib/bpf/libbpf.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
Change list:
- v1 -> v2:
- wrap err for bpf_map__set_value_size
- v1:
https://lore.kernel.org/bpf/[email protected]
tools/lib/bpf/libbpf.c +13 -13
@@ -9145,12 +9145,12 @@ int bpf_object__gen_loader(struct bpf_object *obj, struct gen_loader_opts *opts)struct bpf_gen *gen;if (!opts) -return -EFAULT ; +return libbpf_err (-EFAULT );if (!OPTS_VALID (opts, gen_loader_opts)) -return -EINVAL ; +return libbpf_err (-EINVAL ); gen =calloc (sizeof (*gen),1 );if (!gen) -return -ENOMEM ; +return libbpf_err (-ENOMEM ); gen->opts = opts; gen->swapped_endian = !is_native_endianness (obj); obj->gen_loader = gen;
@@ -9262,13 +9262,13 @@ int bpf_program__set_insns(struct bpf_program *prog,struct bpf_insn *insns;if (prog->obj->loaded) -return -EBUSY ; +return libbpf_err (-EBUSY ); insns =libbpf_reallocarray (prog->insns, new_insn_cnt,sizeof (*insns));/* NULL is a valid return from reallocarray if the new count is zero */ if (!insns && new_insn_cnt) {pr_warn ("prog '%s': failed to realloc prog code\n" , prog->name); -return -ENOMEM ; +return libbpf_err (-ENOMEM ); }memcpy (insns, new_insns, new_insn_cnt *sizeof (*insns));
@@ -9379,11 +9379,11 @@ const char *bpf_program__log_buf(const struct bpf_program *prog, size_t *log_sizint bpf_program__set_log_buf (struct bpf_program *prog,char *log_buf,size_t log_size) {if (log_size && !log_buf) -return -EINVAL ; +return libbpf_err (-EINVAL );if (prog->log_size >UINT_MAX ) -return -EINVAL ; +return libbpf_err (-EINVAL );if (prog->obj->loaded) -return -EBUSY ; +return libbpf_err (-EBUSY ); prog->log_buf = log_buf; prog->log_size = log_size;
@@ -10307,7 +10307,7 @@ int bpf_map__set_value_size(struct bpf_map *map, __u32 size)int err;if (map->def.type !=BPF_MAP_TYPE_ARRAY ) -return -EOPNOTSUPP ; +return libbpf_err (-EOPNOTSUPP ); mmap_old_sz =bpf_map_mmap_sz (map); mmap_new_sz =array_map_mmap_sz (size, map->def.max_entries);
@@ -10315,7 +10315,7 @@ int bpf_map__set_value_size(struct bpf_map *map, __u32 size)if (err) {pr_warn ("map '%s': failed to resize memory-mapped region: %s\n" ,bpf_map__name (map),errstr (err)); -return err; +return libbpf_err (err); } err =map_btf_datasec_resize (map, size);if (err && err != -ENOENT ) {
@@ -13070,17 +13070,17 @@ int bpf_link__update_map(struct bpf_link *link, const struct bpf_map *map)int err;if (!bpf_map__is_struct_ops (map)) -return -EINVAL ; +return libbpf_err (-EINVAL );if (map->fd <0 ) {pr_warn ("map '%s': can't use BPF map without FD (was it created?)\n" , map->name); -return -EINVAL ; +return libbpf_err (-EINVAL ); } st_ops_link = container_of(link, struct bpf_link_struct_ops, link);/* Ensure the type of a link is correct */ if (st_ops_link->map_fd <0 ) -return -EINVAL ; +return libbpf_err (-EINVAL ); err =bpf_map_update_elem (map->fd, &zero, map->st_ops->kern_vdata,0 );/* It can be EBUSY if the map has been used to create or
Signature · 1 line
2.43.0
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 9 lines · On Wed, 19 Feb 2025 23:37:11 +0800 you wrote:
From: Tao Chen <[email protected]>
Just wrap the direct err with
libbpf_err, keep consistency with other APIs.Acked-by Eduard Zingerman <[email protected]>Signed-off-by Tao Chen <[email protected]>[...]
Here is the summary with links:
- [bpf-next,v2] libbpf: Wrap libbpf API direct err with libbpf_err
https://git.kernel.org/bpf/bpf-next/c/e8af068239ca
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html