Hi David, The following pull-request contains BPF updates for your *net* tree.
The main changes are: 1) Fix a out-of-bounds access in __bpf_redirect_no_mac, from Willem. 2) Fix bpf_setsockopt to reset sock dst on SO_MARK changes, from Peter. 3) Fix map in map masking to prevent out-of-bounds access under speculative execution, from Daniel. 4) Fix bpf_setsockopt's SO_MAX_PACING_RATE to support TCP internal pacing, from Yuchung. 5) Fix json writer license in bpftool, from Thomas. 6) Fix AF_XDP to check if an actually queue exists during umem setup, from Krzysztof. 7) Several fixes to BPF stackmap's build id handling. Another fix for bpftool build to account for libbfd variations wrt linking requirements, from Stanislav. 8) Fix BPF samples build with clang by working around missing asm goto, from Yonghong. 9) Fix libbpf to retry program load on signal interrupt, from Lorenz. 10) Various minor compile warning fixes in BPF code, from Mathieu. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Thanks a lot! ---------------------------------------------------------------- The following changes since commit 7939f8beecf1cfb10d255be65bfbd3793fae82a1: Merge tag 'trace-v5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (2019-01-16 05:28:26 +1200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to e7c87bd6cc4ec7b0ac1ed0a88a58f8206c577488: bpf: in __bpf_redirect_no_mac pull mac only if present (2019-01-20 01:11:48 +0100) ---------------------------------------------------------------- Daniel Borkmann (2): bpf: pull in pkt_sched.h header for tooling to fix bpftool build bpf: fix inner map masking to prevent oob under speculation Krzysztof Kazimierczak (1): xsk: Check if a queue exists during umem setup Lorenz Bauer (1): bpf: libbpf: retry loading program on EAGAIN Mathieu Malaterre (3): bpf: Make function btf_name_offset_valid static bpf: Annotate implicit fall through in cgroup_dev_func_proto bpf: Correctly annotate implicit fall through in bpf_base_func_proto Peter Oskolkov (1): bpf: bpf_setsockopt: reset sock dst on SO_MARK changes Stanislav Fomichev (5): selftests/bpf: install with_tunnels.sh for test_flow_dissector.sh tools/bpf: properly account for libbfd variations bpf: don't assume build-id length is always 20 bytes bpf: zero out build_id for BPF_STACK_BUILD_ID_IP selftests/bpf: retry tests that expect build-id Thomas Gleixner (1): tools: bpftool: Cleanup license mess Willem de Bruijn (1): bpf: in __bpf_redirect_no_mac pull mac only if present Yonghong Song (1): samples/bpf: workaround clang asm goto compilation errors Yuchung Cheng (1): bpf: fix SO_MAX_PACING_RATE to support TCP internal pacing kernel/bpf/btf.c | 2 +- kernel/bpf/cgroup.c | 1 + kernel/bpf/map_in_map.c | 17 +- kernel/bpf/stackmap.c | 9 +- net/core/filter.c | 32 +- net/core/lwt_bpf.c | 1 + net/xdp/xdp_umem.c | 16 +- samples/bpf/Makefile | 1 + samples/bpf/asm_goto_workaround.h | 16 + tools/bpf/bpftool/Makefile | 9 +- tools/bpf/bpftool/json_writer.c | 7 +- tools/bpf/bpftool/json_writer.h | 5 - tools/include/uapi/linux/pkt_sched.h | 1163 ++++++++++++++++++++++++++++++ tools/lib/bpf/bpf.c | 19 +- tools/testing/selftests/bpf/Makefile | 1 + tools/testing/selftests/bpf/test_progs.c | 30 + 16 files changed, 1293 insertions(+), 36 deletions(-) create mode 100644 samples/bpf/asm_goto_workaround.h create mode 100644 tools/include/uapi/linux/pkt_sched.h