diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-22 21:15:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-22 21:15:59 -0400 |
| commit | 986e54cd685e8166bc8b4f4c47de44709e541510 (patch) | |
| tree | f65c405a84425c608db7233819654e70f61d566a /tools/testing/selftests/bpf/.gitignore | |
| parent | 660e309ddd6aa99bb4d2a859c4a0b56965e744ef (diff) | |
| parent | 6ab690aa439803347743c0d899ac422774fdd5e7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-04-21
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/bpf/.gitignore')
| -rw-r--r-- | tools/testing/selftests/bpf/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index 9cf83f895d98..5e1ab2f0eb79 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -12,3 +12,6 @@ test_tcpbpf_user test_verifier_log feature test_libbpf_open +test_sock +test_sock_addr +urandom_read |