| commit | 5188b0ca5c16a0c4dabeebe9f83ebb2c7702ec15 | [log] [tgz] |
|---|---|---|
| author | Andrii Nakryiko <andriin@fb.com> | Wed May 15 21:00:15 2019 -0700 |
| committer | Andrii Nakryiko <andrii.nakryiko@gmail.com> | Thu May 16 09:40:04 2019 -0700 |
| tree | 4b947fc3e9373afde86fbd6665ddc584d02aa92c | |
| parent | c1cdd86d6b4968c7e59ae3b30b327caf517d8a98 [diff] |
sync: latest libbpf changes from kernel Syncing latest libbpf commits from kernel repository. Baseline commit: ba02de1aa04e392e15ef503c6dd5166915d9d4de Checkpoint commit: 35c99ffa20edd3c24be352d28a63cd3a23121282 Andrii Nakryiko (1): libbpf: detect supported kernel BTF features and sanitize BTF Björn Töpel (3): libbpf: fix invalid munmap call libbpf: proper XSKMAP cleanup libbpf: remove unnecessary cast-to-void Daniel Borkmann (2): bpf, libbpf: handle old kernels more graceful wrt global data sections bpf, libbpf: fix segfault in bpf_object__init_maps' pr_debug statement Daniel T. Lee (1): libbpf: fix samples/bpf build failure due to undefined UINT32_MAX Magnus Karlsson (1): libbpf: remove compile time warning from libbpf_util.h Martin KaFai Lau (2): bpf: Sync bpf.h to tools bpf: Support BPF_MAP_TYPE_SK_STORAGE in bpf map probing Matt Mullins (1): tools: sync bpf.h McCabe, Robert J (1): libbpf: fix BPF_LOG_BUF_SIZE off-by-one error Quentin Monnet (1): tools: bpf: synchronise BPF UAPI header with tools Vineet Gupta (1): tools/bpf: fix perf build error with uClibc (seen on ARC) include/uapi/linux/bpf.h | 177 +++++++++++++++++++---------- src/bpf.c | 2 + src/bpf.h | 3 +- src/libbpf.c | 236 ++++++++++++++++++++++++++++++++++++--- src/libbpf_internal.h | 27 +++++ src/libbpf_probes.c | 84 +++++++++++++- src/libbpf_util.h | 2 +- src/xsk.c | 184 +++++++++++++++--------------- 8 files changed, 544 insertions(+), 171 deletions(-) create mode 100644 src/libbpf_internal.h -- 2.17.1
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