mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-29 17:25:38 +00:00
4b3529edbb
-----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQTFp0I1jqZrAX+hPRXbK58LschIgwUCZlWtmQAKCRDbK58LschI g0TUAQDT76jx7Rq1DShCtZ3eqiBMNkYczK8b+GqNsSG8YGduaAEA1jn/GN+H65Rh atQZ/pYAfLZflMV04+XE0GyBr5q1uQg= =NczG -----END PGP SIGNATURE----- Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next Daniel Borkmann says: ==================== pull-request: bpf-next 2024-05-28 We've added 23 non-merge commits during the last 11 day(s) which contain a total of 45 files changed, 696 insertions(+), 277 deletions(-). The main changes are: 1) Rename skb's mono_delivery_time to tstamp_type for extensibility and add SKB_CLOCK_TAI type support to bpf_skb_set_tstamp(), from Abhishek Chauhan. 2) Add netfilter CT zone ID and direction to bpf_ct_opts so that arbitrary CT zones can be used from XDP/tc BPF netfilter CT helper functions, from Brad Cowie. 3) Several tweaks to the instruction-set.rst IETF doc to address the Last Call review comments, from Dave Thaler. 4) Small batch of riscv64 BPF JIT optimizations in order to emit more compressed instructions to the JITed image for better icache efficiency, from Xiao Wang. 5) Sort bpftool C dump output from BTF, aiming to simplify vmlinux.h diffing and forcing more natural type definitions ordering, from Mykyta Yatsenko. 6) Use DEV_STATS_INC() macro in BPF redirect helpers to silence a syzbot/KCSAN race report for the tx_errors counter, from Jiang Yunshui. 7) Un-constify bpf_func_info in bpftool to fix compilation with LLVM 17+ which started treating const structs as constants and thus breaking full BTF program name resolution, from Ivan Babrou. 8) Fix up BPF program numbers in test_sockmap selftest in order to reduce some of the test-internal array sizes, from Geliang Tang. 9) Small cleanup in Makefile.btf script to use test-ge check for v1.25-only pahole, from Alan Maguire. 10) Fix bpftool's make dependencies for vmlinux.h in order to avoid needless rebuilds in some corner cases, from Artem Savkov. * tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next: (23 commits) bpf, net: Use DEV_STAT_INC() bpf, docs: Fix instruction.rst indentation bpf, docs: Clarify call local offset bpf, docs: Add table captions bpf, docs: clarify sign extension of 64-bit use of 32-bit imm bpf, docs: Use RFC 2119 language for ISA requirements bpf, docs: Move sentence about returning R0 to abi.rst bpf: constify member bpf_sysctl_kern:: Table riscv, bpf: Try RVC for reg move within BPF_CMPXCHG JIT riscv, bpf: Use STACK_ALIGN macro for size rounding up riscv, bpf: Optimize zextw insn with Zba extension selftests/bpf: Handle forwarding of UDP CLOCK_TAI packets net: Add additional bit to support clockid_t timestamp type net: Rename mono_delivery_time to tstamp_type for scalabilty selftests/bpf: Update tests for new ct zone opts for nf_conntrack kfuncs net: netfilter: Make ct zone opts configurable for bpf ct helpers selftests/bpf: Fix prog numbers in test_sockmap bpf: Remove unused variable "prev_state" bpftool: Un-const bpf_func_info to fix it for llvm 17 and newer bpf: Fix order of args in call to bpf_map_kvcalloc ... ==================== Link: https://lore.kernel.org/r/20240528105924.30905-1-daniel@iogearbox.net Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
||
---|---|---|
.. | ||
gnu | ||
.gitignore | ||
asm_goto_workaround.h | ||
bpf_insn.h | ||
cookie_uid_helper_example.c | ||
cpustat_kern.c | ||
cpustat_user.c | ||
do_hbm_test.sh | ||
fds_example.c | ||
hash_func01.h | ||
hbm_edt_kern.c | ||
hbm_kern.h | ||
hbm_out_kern.c | ||
hbm.c | ||
hbm.h | ||
ibumad_kern.c | ||
ibumad_user.c | ||
lathist_kern.c | ||
lathist_user.c | ||
lwt_len_hist_user.c | ||
lwt_len_hist.bpf.c | ||
lwt_len_hist.sh | ||
Makefile | ||
Makefile.target | ||
map_perf_test_user.c | ||
map_perf_test.bpf.c | ||
net_shared.h | ||
offwaketime_user.c | ||
offwaketime.bpf.c | ||
parse_ldabs.c | ||
parse_simple.c | ||
parse_varlen.c | ||
README.rst | ||
run_cookie_uid_helper_example.sh | ||
sampleip_kern.c | ||
sampleip_user.c | ||
sock_example.c | ||
sock_example.h | ||
sock_flags.bpf.c | ||
sockex1_kern.c | ||
sockex1_user.c | ||
sockex2_kern.c | ||
sockex2_user.c | ||
sockex3_kern.c | ||
sockex3_user.c | ||
spintest_user.c | ||
spintest.bpf.c | ||
syscall_nrs.c | ||
syscall_tp_kern.c | ||
syscall_tp_user.c | ||
task_fd_query_kern.c | ||
task_fd_query_user.c | ||
tc_l2_redirect_kern.c | ||
tc_l2_redirect_user.c | ||
tc_l2_redirect.sh | ||
tcbpf1_kern.c | ||
tcp_basertt_kern.c | ||
tcp_bpf.readme | ||
tcp_bufs_kern.c | ||
tcp_clamp_kern.c | ||
tcp_cong_kern.c | ||
tcp_dumpstats_kern.c | ||
tcp_iw_kern.c | ||
tcp_rwnd_kern.c | ||
tcp_synrto_kern.c | ||
tcp_tos_reflect_kern.c | ||
test_cgrp2_array_pin.c | ||
test_cgrp2_attach.c | ||
test_cgrp2_sock2.c | ||
test_cgrp2_sock2.sh | ||
test_cgrp2_sock.c | ||
test_cgrp2_sock.sh | ||
test_cgrp2_tc.bpf.c | ||
test_cgrp2_tc.sh | ||
test_cls_bpf.sh | ||
test_current_task_under_cgroup_user.c | ||
test_current_task_under_cgroup.bpf.c | ||
test_lru_dist.c | ||
test_lwt_bpf.c | ||
test_lwt_bpf.sh | ||
test_map_in_map_user.c | ||
test_map_in_map.bpf.c | ||
test_overhead_kprobe.bpf.c | ||
test_overhead_raw_tp.bpf.c | ||
test_overhead_tp.bpf.c | ||
test_overhead_user.c | ||
test_override_return.sh | ||
test_probe_write_user_user.c | ||
test_probe_write_user.bpf.c | ||
trace_event_kern.c | ||
trace_event_user.c | ||
trace_output_user.c | ||
trace_output.bpf.c | ||
tracex1_user.c | ||
tracex1.bpf.c | ||
tracex2_user.c | ||
tracex2.bpf.c | ||
tracex3_user.c | ||
tracex3.bpf.c | ||
tracex4_user.c | ||
tracex4.bpf.c | ||
tracex5_user.c | ||
tracex5.bpf.c | ||
tracex6_user.c | ||
tracex6.bpf.c | ||
tracex7_user.c | ||
tracex7.bpf.c | ||
xdp2skb_meta_kern.c | ||
xdp2skb_meta.sh | ||
xdp_adjust_tail_kern.c | ||
xdp_adjust_tail_user.c | ||
xdp_fwd_kern.c | ||
xdp_fwd_user.c | ||
xdp_router_ipv4_user.c | ||
xdp_router_ipv4.bpf.c | ||
xdp_sample_shared.h | ||
xdp_sample_user.c | ||
xdp_sample_user.h | ||
xdp_sample.bpf.c | ||
xdp_sample.bpf.h | ||
xdp_tx_iptunnel_common.h | ||
xdp_tx_iptunnel_kern.c | ||
xdp_tx_iptunnel_user.c |
eBPF sample programs ==================== This directory contains a test stubs, verifier test-suite and examples for using eBPF. The examples use libbpf from tools/lib/bpf. Note that the XDP-specific samples have been removed from this directory and moved to the xdp-tools repository: https://github.com/xdp-project/xdp-tools See the commit messages removing each tool from this directory for how to convert specific command invocations between the old samples and the utilities in xdp-tools. Build dependencies ================== Compiling requires having installed: * clang * llvm * pahole Consult :ref:`Documentation/process/changes.rst <changes>` for the minimum version numbers required and how to update them. Note that LLVM's tool 'llc' must support target 'bpf', list version and supported targets with command: ``llc --version`` Clean and configuration ----------------------- It can be needed to clean tools, samples or kernel before trying new arch or after some changes (on demand):: make -C tools clean make -C samples/bpf clean make clean Configure kernel, defconfig for instance (see "tools/testing/selftests/bpf/config" for a reference config):: make defconfig Kernel headers -------------- There are usually dependencies to header files of the current kernel. To avoid installing devel kernel headers system wide, as a normal user, simply call:: make headers_install This will create a local "usr/include" directory in the git/build top level directory, that the make system will automatically pick up first. Compiling ========= For building the BPF samples, issue the below command from the kernel top level directory:: make M=samples/bpf It is also possible to call make from this directory. This will just hide the invocation of make as above. Manually compiling LLVM with 'bpf' support ------------------------------------------ Since version 3.7.0, LLVM adds a proper LLVM backend target for the BPF bytecode architecture. By default llvm will build all non-experimental backends including bpf. To generate a smaller llc binary one can use:: -DLLVM_TARGETS_TO_BUILD="BPF" We recommend that developers who want the fastest incremental builds use the Ninja build system, you can find it in your system's package manager, usually the package is ninja or ninja-build. Quick sniplet for manually compiling LLVM and clang (build dependencies are ninja, cmake and gcc-c++):: $ git clone https://github.com/llvm/llvm-project.git $ mkdir -p llvm-project/llvm/build $ cd llvm-project/llvm/build $ cmake .. -G "Ninja" -DLLVM_TARGETS_TO_BUILD="BPF;X86" \ -DLLVM_ENABLE_PROJECTS="clang" \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_BUILD_RUNTIME=OFF $ ninja It is also possible to point make to the newly compiled 'llc' or 'clang' command via redefining LLC or CLANG on the make command line:: make M=samples/bpf LLC=~/git/llvm-project/llvm/build/bin/llc CLANG=~/git/llvm-project/llvm/build/bin/clang Cross compiling samples ----------------------- In order to cross-compile, say for arm64 targets, export CROSS_COMPILE and ARCH environment variables before calling make. But do this before clean, configuration and header install steps described above. This will direct make to build samples for the cross target:: export ARCH=arm64 export CROSS_COMPILE="aarch64-linux-gnu-" Headers can be also installed on RFS of target board if need to keep them in sync (not necessarily and it creates a local "usr/include" directory also):: make INSTALL_HDR_PATH=~/some_sysroot/usr headers_install Pointing LLC and CLANG is not necessarily if it's installed on HOST and have in its targets appropriate arm64 arch (usually it has several arches). Build samples:: make M=samples/bpf Or build samples with SYSROOT if some header or library is absent in toolchain, say libelf, providing address to file system containing headers and libs, can be RFS of target board:: make M=samples/bpf SYSROOT=~/some_sysroot