mbox series

pull-request: bpf 2018-07-07

Message ID 20180708035826.2159429-1-ast@kernel.org
State Accepted, archived
Delegated to: David Miller
Headers show
Series pull-request: bpf 2018-07-07 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

Message

Alexei Starovoitov July 8, 2018, 3:58 a.m. UTC
Hi David,

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

Plenty of fixes for different components:

1) A set of critical fixes for sockmap and sockhash, from John Fastabend.

2) fixes for several race conditions in af_xdp, from Magnus Karlsson.

3) hash map refcnt fix, from Mauricio Vasquez.

4) samples/bpf fixes, from Taeung Song.

5) ifup+mtu check for xdp_redirect, from Toshiaki Makita.

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 d0fbad0aec1df29717fab736eb24c8a49cf2c70b:

  Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (2018-07-02 12:40:59 -0700)

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 d8d7218ad842e18fc6976b87c08ed749e8d56313:

  xdp: XDP_REDIRECT should check IFF_UP and MTU (2018-07-07 15:25:35 -0700)

----------------------------------------------------------------
Alexei Starovoitov (3):
      Merge branch 'af_xdp-fixes'
      Merge branch 'sockmap-fixes'
      Merge branch 'sockhash-fixes'

John Fastabend (6):
      bpf: sockmap, error path can not release psock in multi-map case
      bpf: sockmap, hash table is RCU so readers do not need locks
      bpf: fix sk_skb programs without skb->dev assigned
      bpf: sockhash, disallow bpf_tcp_close and update in parallel
      bpf: sockmap, consume_skb in close path
      bpf: sockmap, convert bpf_compute_data_pointers to bpf_*_sk_skb

Magnus Karlsson (4):
      xsk: fix potential lost completion message in SKB path
      xsk: frame could be completed more than once in SKB path
      samples/bpf: deal with EBUSY return code from sendmsg in xdpsock sample
      xsk: fix potential race in SKB TX completion code

Mauricio Vasquez B (1):
      bpf: hash map: decrement counter on error

Taeung Song (4):
      samples/bpf: add missing <linux/if_vlan.h>
      samples/bpf: Check the result of system()
      samples/bpf: Check the error of write() and read()
      samples/bpf: add .gitignore file

Toshiaki Makita (1):
      xdp: XDP_REDIRECT should check IFF_UP and MTU

 include/linux/filter.h           |   6 +--
 include/net/tcp.h                |   4 ++
 include/net/xdp_sock.h           |   4 ++
 kernel/bpf/devmap.c              |   7 ++-
 kernel/bpf/hashtab.c             |  16 ++++--
 kernel/bpf/sockmap.c             |  43 +++++++++------
 kernel/bpf/syscall.c             |   4 +-
 net/core/filter.c                | 110 +++++++++++++++++++++++++++++++++++----
 net/xdp/xsk.c                    |  10 ++--
 net/xdp/xsk_queue.h              |   9 +---
 samples/bpf/.gitignore           |  49 +++++++++++++++++
 samples/bpf/parse_varlen.c       |   6 +--
 samples/bpf/test_overhead_user.c |  19 +++++--
 samples/bpf/trace_event_user.c   |  27 ++++++++--
 samples/bpf/xdpsock_user.c       |   2 +-
 15 files changed, 257 insertions(+), 59 deletions(-)
 create mode 100644 samples/bpf/.gitignore

Comments

David Miller July 8, 2018, 4:07 a.m. UTC | #1
From: Alexei Starovoitov <ast@kernel.org>
Date: Sat, 7 Jul 2018 20:58:26 -0700

> The following pull-request contains BPF updates for your *net* tree.
> 
> Plenty of fixes for different components:
> 
> 1) A set of critical fixes for sockmap and sockhash, from John Fastabend.
> 
> 2) fixes for several race conditions in af_xdp, from Magnus Karlsson.
> 
> 3) hash map refcnt fix, from Mauricio Vasquez.
> 
> 4) samples/bpf fixes, from Taeung Song.
> 
> 5) ifup+mtu check for xdp_redirect, from Toshiaki Makita.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

Pulled, thanks Alexei.