pull-request: bpf 2018-04-21

pull-request: bpf 2018-04-21

[Daniel Borkmann]

Hi David,

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

The main changes are:

1) Fix a deadlock between mm->mmap_sem and bpf_event_mutex when
   one task is detaching a BPF prog via perf_event_detach_bpf_prog()
   and another one dumping through bpf_prog_array_copy_info(). For
   the latter we move the copy_to_user() out of the bpf_event_mutex
   lock to fix it, from Yonghong.

2) Fix test_sock and test_sock_addr.sh failures. The former was
   hitting rlimit issues and the latter required ping to specify
   the address family, from Yonghong.

3) Remove a dead check in sockmap's sock_map_alloc(), from Jann.

4) Add generated files to BPF kselftests gitignore that were previously
   missed, from Anders.

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 1cc5954f44150bb70cac07c3cc5df7cf0dfb61ec:

  ip_gre: clear feature flags when incompatible o_flags are set (2018-04-10 11:03:32 -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 6ab690aa439803347743c0d899ac422774fdd5e7:

  bpf: sockmap remove dead check (2018-04-20 22:09:51 +0200)

----------------------------------------------------------------
Anders Roxell (1):
      selftests: bpf: update .gitignore with missing generated files

Jann Horn (1):
      bpf: sockmap remove dead check

Yonghong Song (2):
      bpf/tracing: fix a deadlock in perf_event_detach_bpf_prog
      tools/bpf: fix test_sock and test_sock_addr.sh failure

 include/linux/bpf.h                           |  4 +--
 kernel/bpf/core.c                             | 45 +++++++++++++++++----------
 kernel/bpf/sockmap.c                          |  3 --
 kernel/trace/bpf_trace.c                      | 25 ++++++++++++---
 tools/testing/selftests/bpf/.gitignore        |  3 ++
 tools/testing/selftests/bpf/test_sock.c       |  1 +
 tools/testing/selftests/bpf/test_sock_addr.c  |  1 +
 tools/testing/selftests/bpf/test_sock_addr.sh |  4 +--
 8 files changed, 59 insertions(+), 27 deletions(-)

Re: pull-request: bpf 2018-04-21

[David Miller]

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Sat, 21 Apr 2018 02:22:24 +0200

> The following pull-request contains BPF updates for your *net* tree.
> 
> The main changes are:
> 
> 1) Fix a deadlock between mm->mmap_sem and bpf_event_mutex when
>    one task is detaching a BPF prog via perf_event_detach_bpf_prog()
>    and another one dumping through bpf_prog_array_copy_info(). For
>    the latter we move the copy_to_user() out of the bpf_event_mutex
>    lock to fix it, from Yonghong.
> 
> 2) Fix test_sock and test_sock_addr.sh failures. The former was
>    hitting rlimit issues and the latter required ping to specify
>    the address family, from Yonghong.
> 
> 3) Remove a dead check in sockmap's sock_map_alloc(), from Jann.
> 
> 4) Add generated files to BPF kselftests gitignore that were previously
>    missed, from Anders.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

Pulled, thanks Daniel.