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

Browse source

Alexei Starovoitov says:

====================
pull-request: bpf 2018-02-22

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

The main changes are:

1) two urgent fixes for bpf_tail_call logic for x64 and arm64 JITs, from Daniel.

2) cond_resched points in percpu array alloc/free paths, from Eric.

3) lockdep and other minor fixes, from Yonghong, Arnd, Anders, Li.
====================

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

...

This commit is contained in:

David S. Miller 2018-02-23 12:34:18 -05:00

parent d903ec7711 16338a9b3a

commit 2217009443

10 changed files with 80 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

arch/arm64/net/bpf_jit_comp.c

View file

37

arch/x86/include/asm/nospec-branch.h

View file

9

arch/x86/net/bpf_jit_comp.c

View file

5

kernel/bpf/arraymap.c

View file

3

kernel/bpf/lpm_trie.c

View file

6

net/core/filter.c

View file

1

tools/testing/selftests/bpf/.gitignore vendored

View file

2

tools/testing/selftests/bpf/test_maps.c

View file

1

tools/testing/selftests/bpf/test_tcpbpf_kern.c

View file

26

tools/testing/selftests/bpf/test_verifier.c

View file