| Message ID | 20190202021432.1213891-1-ast@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | pull-request: bpf-next 2019-02-01 | expand |
From: Alexei Starovoitov <ast@kernel.org> Date: Fri, 1 Feb 2019 18:14:32 -0800 > The following pull-request contains BPF updates for your *net-next* tree. > > The main changes are: > > 1) introduce bpf_spin_lock, from Alexei. > > 2) convert xdp samples to libbpf, from Maciej. > > 3) skip verifier tests for unsupported program/map types, from Stanislav. > > 4) powerpc64 JIT support for BTF line info, from Sandipan. > > 5) assorted fixed, from Valdis, Jesper, Jiong. > > Please consider pulling these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git Pulled, thanks Alexei. I'll push this out to net-next as soon as my build testing completes.
Hi David, The following pull-request contains BPF updates for your *net-next* tree. The main changes are: 1) introduce bpf_spin_lock, from Alexei. 2) convert xdp samples to libbpf, from Maciej. 3) skip verifier tests for unsupported program/map types, from Stanislav. 4) powerpc64 JIT support for BTF line info, from Sandipan. 5) assorted fixed, from Valdis, Jesper, Jiong. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git Thanks a lot! ---------------------------------------------------------------- The following changes since commit 630afc7734bac1229ef601b65769a898189e1b3d: Merge branch 'hns3-next' (2019-01-30 14:50:04 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git for you to fetch changes up to 5974b7c1e40da80a5986f0464ae47687ce4a8021: Merge branch 'shifts-cleanup' (2019-02-01 18:03:50 -0800) ---------------------------------------------------------------- Alexei Starovoitov (10): bpf: introduce bpf_spin_lock bpf: add support for bpf_spin_lock to cgroup local storage tools/bpf: sync include/uapi/linux/bpf.h selftests/bpf: add bpf_spin_lock verifier tests selftests/bpf: add bpf_spin_lock C test bpf: introduce BPF_F_LOCK flag tools/bpf: sync uapi/bpf.h libbpf: introduce bpf_map_lookup_elem_flags() selftests/bpf: test for BPF_F_LOCK Merge branch 'shifts-cleanup' Daniel Borkmann (3): Merge branch 'bpf-tests-probe-kernel-support' Merge branch 'bpf-spinlocks' Merge branch 'bpf-xdp-sample-libbpf' Jesper Dangaard Brouer (1): samples/bpf: xdp_redirect_cpu have not need for read_trace_pipe Jiong Wang (2): nfp: bpf: correct the behavior for shifts by zero nfp: bpf: complete ALU32 logic shift supports Maciej Fijalkowski (7): libbpf: Add a helper for retrieving a map fd for a given name samples/bpf: Convert XDP samples to libbpf usage samples/bpf: Extend RLIMIT_MEMLOCK for xdp_{sample_pkts, router_ipv4} xdp: Provide extack messages when prog attachment failed samples/bpf: Add a "force" flag to XDP samples libbpf: Add a support for getting xdp prog id on ifindex samples/bpf: Check the prog id before exiting Sandipan Das (1): bpf: powerpc64: add JIT support for bpf line info Stanislav Fomichev (6): selftests/bpf: skip sockmap in test_maps if kernel doesn't have support selftests/bpf: skip verifier tests for unsupported program types selftests/bpf: skip verifier tests for unsupported map types selftests/bpf: mark verifier test that uses bpf_trace_printk as BPF_PROG_TYPE_TRACEPOINT bpf: BPF_PROG_TYPE_CGROUP_{SKB, SOCK, SOCK_ADDR} require cgroups enabled selftests/bpf: remove generated verifier/tests.h on 'make clean' Valdis Kletnieks (3): bpf: fix bitrotted kerneldoc bpf: fix missing prototype warnings bpf, cgroups: clean up kerneldoc warnings arch/powerpc/net/bpf_jit_comp64.c | 1 + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 92 ++++++- include/linux/bpf-cgroup.h | 2 +- include/linux/bpf.h | 39 ++- include/linux/bpf_types.h | 2 + include/linux/bpf_verifier.h | 1 + include/linux/btf.h | 1 + include/linux/filter.h | 4 +- include/uapi/linux/bpf.h | 8 +- kernel/Kconfig.locks | 3 + kernel/bpf/arraymap.c | 23 +- kernel/bpf/btf.c | 42 +++ kernel/bpf/cgroup.c | 3 +- kernel/bpf/core.c | 5 +- kernel/bpf/hashtab.c | 63 ++++- kernel/bpf/helpers.c | 96 +++++++ kernel/bpf/local_storage.c | 16 +- kernel/bpf/map_in_map.c | 5 + kernel/bpf/syscall.c | 45 ++- kernel/bpf/verifier.c | 171 +++++++++++- kernel/cgroup/cgroup.c | 2 +- net/core/dev.c | 12 +- net/core/filter.c | 16 +- samples/bpf/Makefile | 8 +- samples/bpf/xdp1_user.c | 34 ++- samples/bpf/xdp_adjust_tail_user.c | 38 ++- samples/bpf/xdp_redirect_cpu_user.c | 196 ++++++++++---- samples/bpf/xdp_redirect_map_user.c | 106 ++++++-- samples/bpf/xdp_redirect_user.c | 103 +++++-- samples/bpf/xdp_router_ipv4_user.c | 179 ++++++++---- samples/bpf/xdp_rxq_info_user.c | 41 ++- samples/bpf/xdp_sample_pkts_user.c | 81 +++++- samples/bpf/xdp_tx_iptunnel_user.c | 71 +++-- samples/bpf/xdpsock_user.c | 30 +- tools/include/uapi/linux/bpf.h | 8 +- tools/lib/bpf/bpf.c | 13 + tools/lib/bpf/bpf.h | 2 + tools/lib/bpf/libbpf.c | 6 + tools/lib/bpf/libbpf.h | 4 + tools/lib/bpf/libbpf.map | 3 + tools/lib/bpf/netlink.c | 85 ++++++ tools/testing/selftests/bpf/Makefile | 10 +- tools/testing/selftests/bpf/bpf_helpers.h | 4 + tools/testing/selftests/bpf/test_map_lock.c | 66 +++++ tools/testing/selftests/bpf/test_maps.c | 13 +- tools/testing/selftests/bpf/test_progs.c | 117 +++++++- tools/testing/selftests/bpf/test_spin_lock.c | 108 ++++++++ tools/testing/selftests/bpf/test_verifier.c | 149 +++++++++- tools/testing/selftests/bpf/verifier/spin_lock.c | 331 +++++++++++++++++++++++ tools/testing/selftests/bpf/verifier/unpriv.c | 1 + 50 files changed, 2197 insertions(+), 262 deletions(-) create mode 100644 tools/testing/selftests/bpf/test_map_lock.c create mode 100644 tools/testing/selftests/bpf/test_spin_lock.c create mode 100644 tools/testing/selftests/bpf/verifier/spin_lock.c