Hi David,

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.

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 30791ac41927ebd3e75486f9504b6d2280463bf0:

  tcp md5sig: Use skb's saddr when replying to an incoming segment (2017-12-12 
11:15:42 -0500)

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 9147efcbe0b7cc96b18eb64b1a3f0d4bba81443c:

  bpf: add schedule points to map alloc/free (2017-12-12 15:27:22 -0800)

----------------------------------------------------------------
Alexei Starovoitov (1):
      Merge branch 'bpf-misc-fixes'

Daniel Borkmann (3):
      bpf: fix corruption on concurrent perf_event_output calls
      bpf: fix build issues on um due to mising bpf_perf_event.h
      bpf: fix broken BPF selftest build

Eric Dumazet (1):
      bpf: add schedule points to map alloc/free

 arch/um/include/asm/Kbuild              |  1 +
 kernel/bpf/hashtab.c                    |  2 ++
 kernel/trace/bpf_trace.c                | 19 ++++++++++++-------
 tools/include/uapi/asm/bpf_perf_event.h |  7 +++++++
 tools/testing/selftests/bpf/Makefile    | 13 +------------
 5 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 tools/include/uapi/asm/bpf_perf_event.h

Reply via email to