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

Daniel Borkmann says:

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

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

There are two small conflicts when pulling, resolve as follows:

1) Merge conflict in tools/lib/bpf/libbpf.c between 551175f2183c ("libbpf: Factor
   out common ELF operations and improve logging") in bpf-next and 5766050da0b7
   ("libbpf: Fix map index used in error message") in net-next. Resolve by taking
   the hunk in bpf-next:

        [...]
        scn = elf_sec_by_idx(obj, obj->efile.btf_maps_shndx);
        data = elf_sec_data(obj, scn);
        if (!scn || !data) {
                pr_warn("elf: failed to get %s map definitions for %s\n",
                        MAPS_ELF_SEC, obj->path);
                return -EINVAL;
        }
        [...]

2) Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c between
   61acb2f844fe ("xsk: i40e: ice: ixgbe: mlx5: Test for dma_need_sync earlier for
   better performance") in bpf-next and 93970113e83e ("net/mlx5e: RX, Add a prefetch
   command for small L1_CACHE_BYTES") in net-next. Resolve the two locations by retaining
   net_prefetch() and taking xsk_buff_dma_sync_for_cpu() from bpf-next. Should look like:

        [...]
        xdp_set_data_meta_invalid(xdp);
        xsk_buff_dma_sync_for_cpu(xdp, rq->xsk_pool);
        net_prefetch(xdp->data);
        [...]

We've added 133 non-merge commits during the last 14 day(s) which contain
a total of 246 files changed, 13832 insertions(+), 3105 deletions(-).

The main changes are:

1) Initial support for sleepable BPF programs along with bpf_copy_from_user() helper
   for tracing to reliably access user memory, from Alexei Starovoitov.

2) Add BPF infra for writing and parsing TCP header options, from Martin KaFai Lau.

3) bpf_d_path() helper for returning full path for given 'struct path', from Jiri Olsa.

4) AF_XDP support for shared umems between devices and queues, from Magnus Karlsson.

5) Initial prep work for full BPF-to-BPF call support in libbpf, from Andrii Nakryiko.

6) Generalize bpf_sk_storage map & add local storage for inodes, from KP Singh.

7) Implement sockmap/hash updates from BPF context, from Lorenz Bauer.

8) BPF xor verification for scalar types & add BPF link iterator, from Yonghong Song.

9) Use target's prog type for BPF_PROG_TYPE_EXT prog verification, from Udip Pant.

10) Rework BPF tracing samples to use libbpf loader, from Daniel T. Lee.

11) Fix xdpsock sample to really cycle through all buffers, from Weqaar Janjua.

12) Improve type safety for tun/veth XDP frame handling, from Maciej Żenczykowski.

13) Various smaller cleanups and improvements all over the place.
====================

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

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
index 786fedf524366f1769a4939b9adfa12427d7e7b6,902ce77d01781d34bf80da216aa785b5938ddec4..bb6669d2a916bd3e89db4bba689d75523ad93fa2
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
@@@ -48,8 -48,8 +48,8 @@@ struct sk_buff *mlx5e_xsk_skb_from_cqe_
  
        xdp->data_end = xdp->data + cqe_bcnt32;
        xdp_set_data_meta_invalid(xdp);
-       xsk_buff_dma_sync_for_cpu(xdp);
+       xsk_buff_dma_sync_for_cpu(xdp, rq->xsk_pool);
 -      prefetch(xdp->data);
 +      net_prefetch(xdp->data);
  
        rcu_read_lock();
        consumed = mlx5e_xdp_handle(rq, NULL, &cqe_bcnt32, xdp);
@@@ -99,8 -99,8 +99,8 @@@ struct sk_buff *mlx5e_xsk_skb_from_cqe_
  
        xdp->data_end = xdp->data + cqe_bcnt;
        xdp_set_data_meta_invalid(xdp);
-       xsk_buff_dma_sync_for_cpu(xdp);
+       xsk_buff_dma_sync_for_cpu(xdp, rq->xsk_pool);
 -      prefetch(xdp->data);
 +      net_prefetch(xdp->data);
  
        if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_RESP_SEND)) {
                rq->stats->wqe_err++;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc include/uapi/linux/bpf.h
Simple merge

diff --cc kernel/bpf/bpf_iter.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/ethtool/ioctl.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc tools/bpf/resolve_btfids/main.c
Simple merge

diff --cc tools/include/uapi/linux/bpf.h
Simple merge

diff --cc tools/lib/bpf/btf_dump.c
Simple merge

diff --cc tools/testing/selftests/bpf/Makefile
Simple merge