| commit | 21742bc952bce83e91ea9d4986aa68d23db3082e | [log] [tgz] |
|---|---|---|
| author | Andrii Nakryiko <andriin@fb.com> | Wed Jun 12 22:04:57 2019 -0700 |
| committer | Andrii Nakryiko <andrii.nakryiko@gmail.com> | Fri Jun 14 16:53:36 2019 -0700 |
| tree | c93da30b7ff72693bb15301ddd346ae9e2345936 | |
| parent | 39de6711795f6d1583ae96ed8d13892bc4475ac1 [diff] |
libbpf: fix check for presence of associated BTF for map creation
Kernel internally checks that either key or value type ID is specified,
before using btf_fd. Do the same in libbpf's map creation code for
determining when to retry map creation w/o BTF.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: fba01a0689a9 ("libbpf: use negative fd to specify missing BTF")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This is a mirror of bpf-next linux tree's tools/lib/bpf directory plus its supporting header files.
The following files will by sync'ed with bpf-next repo:
src/ <-> bpf-next/tools/lib/bpf/include/uapi/linux/bpf_common.h <-> bpf-next/tools/include/uapi/linux/bpf_common.hinclude/uapi/linux/bpf.h <-> bpf-next/tools/include/uapi/linux/bpf.hinclude/uapi/linux/btf.h <-> bpf-next/tools/include/uapi/linux/btf.hinclude/uapi/linux/if_link.h <-> bpf-next/tools/include/uapi/linux/if_link.hinclude/uapi/linux/if_xdp.h <-> bpf-next/tools/include/uapi/linux/if_xdp.hinclude/uapi/linux/netlink.h <-> bpf-next/tools/include/uapi/linux/netlink.hinclude/tools/libc_compat.h <-> bpf-next/tools/include/tools/libc_compat.hOther header files at this repo (include/linux/*.h) are reduced versions of their counterpart files at bpf-next's tools/include/linux/*.h to make compilation successful.
libelf is an internal dependency of libbpf and thus it is required to link against and must be installed on the system for applications to work. pkg-config is used by default to find libelf, and the program called can be overridden with PKG_CONFIG. If using pkg-config at build time is not desired, it can be disabled by setting NO_PKG_CONFIG=1 when calling make.
To build both static libbpf.a and shared libbpf.so:
$ cd src
$ make
To build only static libbpf.a library in directory build/ and install them together with libbpf headers in a staging directory root/:
$ cd src $ mkdir build root $ BUILD_STATIC_ONLY=y OBJDIR=build DESTDIR=root make install
To build both static libbpf.a and shared libbpf.so against a custom libelf dependency installed in /build/root/ and install them together with libbpf headers in a build directory /build/root/:
$ cd src $ PKG_CONFIG_PATH=/build/root/lib64/pkgconfig DESTDIR=/build/root make install
To integrate libbpf into a project which uses Meson building system define [wrap-git] file in subprojects folder. To add libbpf dependency to the parent parent project, e.g. for libbpf_static_dep:
libbpf_obj = subproject('libbpf', required : true)
libbpf_static_dep = libbpf_proj.get_variable('libbpf_static_dep')
To validate changes to meson.build
$ python3 meson.py build $ ninja -C build/
To install headers, libs and pkgconfig
$ cd build
$ ninja install