Hi David,
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix a compilation warning in xdp redirect tracepoint due to
missing bpf.h include that pulls in struct bpf_map, from Xie.
2) Limit the maximum number of attachable BPF progs for a given
perf event as long as uabi is not frozen yet. The hard upper
limit is now 64 and therefore the same as with BPF multi-prog
for cgroups. Also add related error checking for the sample
BPF loader when enabling and attaching to the perf event, from
Yonghong.
3) Specifically set the RLIMIT_MEMLOCK for the test_verifier_log
case, so that the test case can always pass and not fail in
some environments due to too low default limit, also from
Yonghong.
4) Fix up a missing license header comment for kernel/bpf/offload.c,
from Jakub.
5) Several fixes for bpftool, among others a crash on incorrect
arguments when json output is used, error message handling
fixes on unknown options and proper destruction of json writer
for some exit cases, all from Quentin.
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 2e724dca7749223204bbae21745c0e3fc932700a:
tipc: eliminate access after delete in group_filter_msg() (2017-11-27
14:44:45 -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 0ec9552b43b98deb882bf48efd347be4bd7afc9f:
samples/bpf: add error checking for perf ioctl calls in bpf loader
(2017-12-01 02:59:21 +0100)
----------------------------------------------------------------
Daniel Borkmann (1):
Merge branch 'bpftool-misc-fixes'
Jakub Kicinski (1):
bpf: offload: add a license header
Quentin Monnet (6):
tools: bpftool: fix crash on bad parameters with JSON
tools: bpftool: clean up the JSON writer before exiting in usage()
tools: bpftool: make error message from getopt_long() JSON-friendly
tools: bpftool: remove spurious line break from error message
tools: bpftool: unify installation directories
tools: bpftool: declare phony targets as such
Xie XiuQi (1):
trace/xdp: fix compile warning: 'struct bpf_map' declared inside
parameter list
Yonghong Song (3):
tools/bpf: adjust rlimit RLIMIT_MEMLOCK for test_verifier_log
bpf: set maximum number of attached progs to 64 for a single perf tp
samples/bpf: add error checking for perf ioctl calls in bpf loader
include/trace/events/xdp.h | 1 +
kernel/bpf/core.c | 3 ++-
kernel/bpf/offload.c | 15 +++++++++++
kernel/trace/bpf_trace.c | 8 ++++++
samples/bpf/bpf_load.c | 14 ++++++++--
tools/bpf/bpftool/Documentation/Makefile | 2 +-
tools/bpf/bpftool/Makefile | 7 ++---
tools/bpf/bpftool/main.c | 36 ++++++++++++++++---------
tools/bpf/bpftool/main.h | 5 ++--
tools/testing/selftests/bpf/test_verifier_log.c | 7 +++++
10 files changed, 77 insertions(+), 21 deletions(-)
