Hi David, hi Jakub, hi Paolo, hi Eric, The following pull-request contains BPF updates for your *net* tree. We've added 21 non-merge commits during the last 8 day(s) which contain a total of 21 files changed, 450 insertions(+), 36 deletions(-). The main changes are: 1) Adjust bpf_mem_alloc buckets to match ksize(), from Hou Tao. 2) Check whether override is allowed in kprobe mult, from Jiri Olsa. 3) Fix btf_id symbol generation with ld.lld, from Jiri and Nick. 4) Fix potential deadlock when using queue and stack maps from NMI, from Toke Høiland-Jørgensen. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Thanks a lot! Also thanks to reporters, reviewers and testers of commits in this pull-request: Alan Maguire, Biju Das, Björn Töpel, Dan Carpenter, Daniel Borkmann, Eduard Zingerman, Hsin-Wei Hung, Marcus Seyfarth, Nathan Chancellor, Satya Durga Srinivasu Prabhala, Song Liu, Stephen Rothwell ---------------------------------------------------------------- The following changes since commit ac28b1ec6135649b5d78b028e47264cb3ebca5ea: net: ipv4: fix one memleak in __inet_del_ifa() (2023-09-08 08:02:17 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to c0bb9fb0e52a64601d38b3739b729d9138d4c8a1: bpf: Fix BTF_ID symbol generation collision in tools/ (2023-09-15 12:08:27 -0700) ---------------------------------------------------------------- Alexei Starovoitov (1): Merge branch 'fix-the-unmatched-unit_size-of-bpf_mem_cache' Andrii Nakryiko (1): selftests/bpf: ensure all CI arches set CONFIG_BPF_KPROBE_OVERRIDE=y Artem Savkov (1): selftests/bpf: fix unpriv_disabled check in test_verifier Christophe JAILLET (1): bpf: Fix a erroneous check after snprintf() Eduard Zingerman (2): bpf: Avoid dummy bpf_offload_netdev in __bpf_prog_dev_bound_init selftests/bpf: Offloaded prog after non-offloaded should not cause BUG Hou Tao (5): bpf: Adjust size_index according to the value of KMALLOC_MIN_SIZE bpf: Don't prefill for unused bpf_mem_cache bpf: Ensure unit_size is matched with slab cache object size selftests/bpf: Test all valid alloc sizes for bpf mem allocator bpf: Skip unit_size checking for global per-cpu allocator Ilya Leoshkevich (1): netfilter, bpf: Adjust timeouts of non-confirmed CTs in bpf_ct_insert_entry() Jiri Olsa (5): bpf: Add override check to kprobe multi link attach selftests/bpf: Add kprobe_multi override test selftests/bpf: Fix kprobe_multi_test/attach_override test bpf: Fix uprobe_multi get_pid_task error path bpf: Fix BTF_ID symbol generation collision Martin KaFai Lau (1): Merge branch 'Avoid dummy bpf_offload_netdev in __bpf_prog_dev_bound_init' Nick Desaulniers (1): bpf: Fix BTF_ID symbol generation collision in tools/ Randy Dunlap (1): bpf, cgroup: fix multiple kernel-doc warnings Stanislav Fomichev (2): bpf: Clarify error expectations from bpf_clone_redirect selftests/bpf: Update bpf_clone_redirect expected return code Toke Høiland-Jørgensen (1): bpf: Avoid deadlock when using queue and stack maps from NMI include/linux/btf_ids.h | 2 +- include/uapi/linux/bpf.h | 4 +- kernel/bpf/btf.c | 2 +- kernel/bpf/cgroup.c | 13 ++- kernel/bpf/memalloc.c | 94 +++++++++++++++- kernel/bpf/offload.c | 12 +- kernel/bpf/queue_stack_maps.c | 21 +++- kernel/trace/bpf_trace.c | 20 +++- net/netfilter/nf_conntrack_bpf.c | 2 + tools/include/linux/btf_ids.h | 2 +- tools/include/uapi/linux/bpf.h | 4 +- tools/testing/selftests/bpf/DENYLIST.aarch64 | 10 +- tools/testing/selftests/bpf/config | 1 + tools/testing/selftests/bpf/config.x86_64 | 1 - tools/testing/selftests/bpf/prog_tests/empty_skb.c | 12 +- .../selftests/bpf/prog_tests/kprobe_multi_test.c | 37 +++++++ .../testing/selftests/bpf/prog_tests/test_bpf_ma.c | 50 +++++++++ .../selftests/bpf/prog_tests/xdp_dev_bound_only.c | 61 ++++++++++ .../selftests/bpf/progs/kprobe_multi_override.c | 13 +++ tools/testing/selftests/bpf/progs/test_bpf_ma.c | 123 +++++++++++++++++++++ tools/testing/selftests/bpf/test_verifier.c | 2 +- 21 files changed, 450 insertions(+), 36 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_ma.c create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_override.c create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_ma.c