mbox series

pull-request: bpf 2018-04-25

Message ID 20180425220450.17024-1-daniel@iogearbox.net
State Accepted, archived
Delegated to: David Miller
Headers show
Series pull-request: bpf 2018-04-25 | expand

Pull-request

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

Message

Daniel Borkmann April 25, 2018, 10:04 p.m. UTC
Hi David,

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

The main changes are:

1) Fix to clear the percpu metadata_dst that could otherwise carry
   stale ip_tunnel_info, from William.

2) Fix that reduces the number of passes in x64 JIT with regards to
   dead code sanitation to avoid risk of prog rejection, from Gianluca.

3) Several fixes of sockmap programs, besides others, fixing a double
   page_put() in error path, missing refcount hold for pinned sockmap,
   adding required -target bpf for clang in sample Makefile, from John.

4) Fix to disable preemption in __BPF_PROG_RUN_ARRAY() paths, from Roman.

5) Fix tools/bpf/ Makefile with regards to a lex/yacc build error
   seen on older gcc-5, from John.

Please consider pulling these changes from:

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

Would be great if you have a chance to merge net into net-next after
that since sockmap fixes are needed in bpf-next later on to avoid
ugly merge conflicts.

Thanks a lot!

----------------------------------------------------------------

The following changes since commit 77621f024d6be732e43366a42203486b6ec89acd:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (2018-04-23 16:22:24 -0400)

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 9c299a32ede98dc9faafb267034ed830a15304db:

  bpf: fix for lex/yacc build error with gcc-5 (2018-04-25 23:27:46 +0200)

----------------------------------------------------------------
Daniel Borkmann (1):
      Merge branch 'bpf-sockmap-fixes'

Gianluca Borello (1):
      bpf, x64: fix JIT emission for dead code

John Fastabend (6):
      bpf: Document sockmap '-target bpf' requirement for PROG_TYPE_SK_MSG
      bpf: sockmap sample use clang flag, -target bpf
      bpf: sockmap, map_release does not hold refcnt for pinned maps
      bpf: sockmap, sk_wait_event needed to handle blocking cases
      bpf: sockmap, fix double page_put on ENOMEM error in redirect path
      bpf: fix for lex/yacc build error with gcc-5

Roman Gushchin (1):
      bpf: disable and restore preemption in __BPF_PROG_RUN_ARRAY

William Tu (1):
      bpf: clear the ip_tunnel_info.

 Documentation/bpf/bpf_devel_QA.txt | 10 +++++++-
 arch/x86/net/bpf_jit_comp.c        | 12 ++++++++-
 include/linux/bpf.h                |  4 ++-
 kernel/bpf/arraymap.c              |  3 ++-
 kernel/bpf/sockmap.c               | 51 +++++++++++++++++++++++++++++++++++---
 kernel/bpf/syscall.c               |  4 +--
 net/core/filter.c                  |  1 +
 samples/sockmap/Makefile           |  7 ++++--
 tools/bpf/Makefile                 |  2 ++
 9 files changed, 82 insertions(+), 12 deletions(-)

Comments

David Miller April 26, 2018, 3:05 a.m. UTC | #1
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 26 Apr 2018 00:04:50 +0200

> The following pull-request contains BPF updates for your *net* tree.
 ...
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

Pulled, thanks Daniel.

> Would be great if you have a chance to merge net into net-next after
> that since sockmap fixes are needed in bpf-next later on to avoid
> ugly merge conflicts.

Done.
Daniel Borkmann April 26, 2018, 4:42 a.m. UTC | #2
On 04/26/2018 05:05 AM, David Miller wrote:
> From: Daniel Borkmann <daniel@iogearbox.net>
> Date: Thu, 26 Apr 2018 00:04:50 +0200
> 
>> The following pull-request contains BPF updates for your *net* tree.
>  ...
>> Please consider pulling these changes from:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
> 
> Pulled, thanks Daniel.
> 
>> Would be great if you have a chance to merge net into net-next after
>> that since sockmap fixes are needed in bpf-next later on to avoid
>> ugly merge conflicts.
> 
> Done.

Awesome, thanks!