Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Browse source

Alexei Starovoitov says:

====================
pull-request: bpf-next 2020-06-01

The following pull-request contains BPF updates for your *net-next* tree.

We've added 55 non-merge commits during the last 1 day(s) which contain
a total of 91 files changed, 4986 insertions(+), 463 deletions(-).

The main changes are:

1) Add rx_queue_mapping to bpf_sock from Amritha.

2) Add BPF ring buffer, from Andrii.

3) Attach and run programs through devmap, from David.

4) Allow SO_BINDTODEVICE opt in bpf_setsockopt, from Ferenc.

5) link based flow_dissector, from Jakub.

6) Use tracing helpers for lsm programs, from Jiri.

7) Several sk_msg fixes and extensions, from John.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2020-06-01 15:53:08 -07:00

parent efd7ed0f5f cf51abcded

commit 9a25c1df24

99 changed files with 5050 additions and 539 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

209

Documentation/bpf/ringbuf.rst

View file

2

MAINTAINERS

View file

2

drivers/net/ethernet/amazon/ena/ena_netdev.c

View file

2

drivers/net/ethernet/intel/i40e/i40e_txrx.c

View file

2

drivers/net/ethernet/intel/ice/ice_txrx_lib.c

View file

2

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file

2

drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

View file

2

drivers/net/ethernet/marvell/mvneta.c

View file

10

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c

View file

2

drivers/net/ethernet/sfc/rx.c

View file

2

drivers/net/ethernet/socionext/netsec.c

View file

2

drivers/net/ethernet/ti/cpsw_priv.c

View file

2

drivers/net/tun.c

View file

8

drivers/net/veth.c

View file

4

drivers/net/virtio_net.c

View file

64

include/linux/bpf-netns.h

View file

21

include/linux/bpf.h

View file

4

include/linux/bpf_types.h

View file

4

include/linux/bpf_verifier.h

View file

26

include/linux/skbuff.h

View file

8

include/linux/skmsg.h

View file

6

include/net/flow_dissector.h

View file

4

include/net/net_namespace.h

View file

18

include/net/netns/bpf.h

View file

2

include/net/sock.h

View file

9

include/net/tls.h

View file

17

include/net/xdp.h

View file

95

include/uapi/linux/bpf.h

View file

3

kernel/bpf/Makefile

View file

2

kernel/bpf/bpf_lsm.c

View file

2

kernel/bpf/cgroup.c

View file

2

kernel/bpf/core.c

View file

2

kernel/bpf/cpumap.c

View file

132

kernel/bpf/devmap.c

View file

34

kernel/bpf/helpers.c

View file

373

kernel/bpf/net_namespace.c

View file

501

kernel/bpf/ringbuf.c

View file

29

kernel/bpf/syscall.c

View file

195

kernel/bpf/verifier.c

View file

28

kernel/trace/bpf_trace.c

View file

18

net/core/dev.c

View file

94

net/core/filter.c

View file

124

net/core/flow_dissector.c

View file

98

net/core/skmsg.c

View file

10

net/core/sock.c

View file

2

net/ipv4/udp_tunnel.c

View file

2

net/ipv6/ip6_udp_tunnel.c

View file

20

net/tls/tls_sw.c

View file

10

tools/bpf/bpftool/btf.c

View file

14

tools/bpf/bpftool/cgroup.c

View file

91

tools/bpf/bpftool/feature.c

View file

6

tools/bpf/bpftool/gen.c

View file

8

tools/bpf/bpftool/iter.c

View file

55

tools/bpf/bpftool/link.c

View file

41

tools/bpf/bpftool/map.c

View file

12

tools/bpf/bpftool/net.c

View file

2

tools/bpf/bpftool/perf.c

View file

27

tools/bpf/bpftool/prog.c

View file

15

tools/bpf/bpftool/struct_ops.c

View file

95

tools/include/uapi/linux/bpf.h

View file

2

tools/lib/bpf/Build

View file

6

tools/lib/bpf/Makefile

View file

49

tools/lib/bpf/libbpf.c

View file

24

tools/lib/bpf/libbpf.h

View file

7

tools/lib/bpf/libbpf.map

View file

5

tools/lib/bpf/libbpf_probes.c

View file

288

tools/lib/bpf/ringbuf.c

View file

5

tools/testing/selftests/bpf/Makefile

View file

16

tools/testing/selftests/bpf/bench.c

View file

566

tools/testing/selftests/bpf/benchs/bench_ringbufs.c

View file

75

tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh Executable file

View file

166

tools/testing/selftests/bpf/prog_tests/flow_dissector.c

View file

594

tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c

View file

211

tools/testing/selftests/bpf/prog_tests/ringbuf.c

View file

102

tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c

View file

30

tools/testing/selftests/bpf/prog_tests/skb_helpers.c

View file

35

tools/testing/selftests/bpf/prog_tests/sockmap_basic.c

View file

97

tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c

View file

20

tools/testing/selftests/bpf/progs/bpf_flow.c

View file

33

tools/testing/selftests/bpf/progs/connect4_prog.c

View file

33

tools/testing/selftests/bpf/progs/perfbuf_bench.c

View file

60

tools/testing/selftests/bpf/progs/ringbuf_bench.c

View file

78

tools/testing/selftests/bpf/progs/test_ringbuf.c

View file

77

tools/testing/selftests/bpf/progs/test_ringbuf_multi.c

View file

28

tools/testing/selftests/bpf/progs/test_skb_helpers.c

View file

47

tools/testing/selftests/bpf/progs/test_skmsg_load_helpers.c

View file

46

tools/testing/selftests/bpf/progs/test_sockmap_kern.h

View file

22

tools/testing/selftests/bpf/progs/test_xdp_devmap_helpers.c

View file

44

tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c

View file

52

tools/testing/selftests/bpf/test_maps.c

View file

163

tools/testing/selftests/bpf/test_sockmap.c

View file

4

tools/testing/selftests/bpf/verifier/and.c

View file

4

tools/testing/selftests/bpf/verifier/array_access.c

View file

6

tools/testing/selftests/bpf/verifier/bounds.c

View file

2

tools/testing/selftests/bpf/verifier/calls.c

View file

4

tools/testing/selftests/bpf/verifier/direct_value_access.c

View file

2

tools/testing/selftests/bpf/verifier/helper_access_var_len.c

View file

6

tools/testing/selftests/bpf/verifier/helper_value_access.c

View file

8

tools/testing/selftests/bpf/verifier/value_ptr_arith.c

View file