6d4104b077
Merge commit 1c8c5a9d38f60 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next") undid the fix from commit 36f9814a494 ("bpf: fix uapi hole for 32 bit compat applications") by taking the gpl_compatible 1-bit field definition from commit b85fab0e67b162 ("bpf: Add gpl_compatible flag to struct bpf_prog_info") as is. That breaks architectures with 16-bit alignment like m68k. Add 31-bit pad after gpl_compatible to restore alignment of following fields. Thanks to Dmitry V. Levin his analysis of this bug history. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Song Liu <songliubraving@fb.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
||
---|---|---|
include | ||
scripts | ||
src | ||
travis-ci/managers | ||
.travis.yml | ||
CHECKPOINT-COMMIT | ||
meson.build | ||
README.md |
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.h
include/uapi/linux/bpf.h
<->bpf-next/tools/include/uapi/linux/bpf.h
include/uapi/linux/btf.h
<->bpf-next/tools/include/uapi/linux/btf.h
include/uapi/linux/if_link.h
<->bpf-next/tools/include/uapi/linux/if_link.h
include/uapi/linux/if_xdp.h
<->bpf-next/tools/include/uapi/linux/if_xdp.h
include/uapi/linux/netlink.h
<->bpf-next/tools/include/uapi/linux/netlink.h
include/tools/libc_compat.h
<->bpf-next/tools/include/tools/libc_compat.h
Other 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.
Build
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