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

Browse source

Daniel Borkmann says:

====================
pull-request: bpf 2017-12-13

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

The main changes are:

1) Addition of explicit scheduling points to map alloc/free
   in order to avoid having to hold the CPU for too long,
   from Eric.

2) Fixing of a corruption in overlapping perf_event_output
   calls from different BPF prog types on the same CPU out
   of different contexts, from Daniel.

3) Fallout fixes for recent correction of broken uapi for
   BPF_PROG_TYPE_PERF_EVENT. um had a missing asm header
   that needed to be pulled in from asm-generic and for
   BPF selftests the asm-generic include did not work,
   so similar asm include scheme was adapted for that
   problematic header that perf is having with other
   header files under tools, from Daniel.
====================

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

...

This commit is contained in:

David S. Miller 2017-12-13 17:30:04 -05:00

parent f6e168b4a1 9147efcbe0

commit 8c8f67a46f

5 changed files with 23 additions and 19 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

1

arch/um/include/asm/Kbuild

View file

2

kernel/bpf/hashtab.c

View file

19

kernel/trace/bpf_trace.c

View file

7

tools/include/uapi/asm/bpf_perf_event.h

View file

13

tools/testing/selftests/bpf/Makefile

View file