tools lib bpf: Add libbpf_get_error()
This function will turn a libbpf pointer into a standard error code (or 0 if the pointer is valid). This also allows removal of the dependency on linux/err.h in the public header file, which causes problems in userspace programs built against libbpf. Signed-off-by: Joe Stringer <joe@ovn.org> Acked-by: Wang Nan <wangnan0@huawei.com> Cc: Alexei Starovoitov <ast@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: netdev@vger.kernel.org Link: http://lkml.kernel.org/r/20170123011128.26534-5-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
7803ba7309
commit
e28ff1a838
|
@ -28,6 +28,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <asm/unistd.h>
|
#include <asm/unistd.h>
|
||||||
|
#include <linux/err.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/bpf.h>
|
#include <linux/bpf.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
|
@ -1542,3 +1543,10 @@ bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset)
|
||||||
}
|
}
|
||||||
return ERR_PTR(-ENOENT);
|
return ERR_PTR(-ENOENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
long libbpf_get_error(const void *ptr)
|
||||||
|
{
|
||||||
|
if (IS_ERR(ptr))
|
||||||
|
return PTR_ERR(ptr);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
#define __BPF_LIBBPF_H
|
#define __BPF_LIBBPF_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <linux/err.h>
|
|
||||||
#include <sys/types.h> // for size_t
|
#include <sys/types.h> // for size_t
|
||||||
|
|
||||||
enum libbpf_errno {
|
enum libbpf_errno {
|
||||||
|
@ -234,4 +234,6 @@ int bpf_map__set_priv(struct bpf_map *map, void *priv,
|
||||||
bpf_map_clear_priv_t clear_priv);
|
bpf_map_clear_priv_t clear_priv);
|
||||||
void *bpf_map__priv(struct bpf_map *map);
|
void *bpf_map__priv(struct bpf_map *map);
|
||||||
|
|
||||||
|
long libbpf_get_error(const void *ptr);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -13,7 +13,7 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz)
|
||||||
struct bpf_object *obj;
|
struct bpf_object *obj;
|
||||||
|
|
||||||
obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, NULL);
|
obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, NULL);
|
||||||
if (IS_ERR(obj))
|
if (libbpf_get_error(obj))
|
||||||
return TEST_FAIL;
|
return TEST_FAIL;
|
||||||
bpf_object__close(obj);
|
bpf_object__close(obj);
|
||||||
return TEST_OK;
|
return TEST_OK;
|
||||||
|
|
Loading…
Reference in a new issue