linux/samples/bpf, branch v4.15

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

2017-12-03T18:08:30Z

Daniel Borkmann says: ==================== pull-request: bpf 2017-12-02 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. ==================== Signed-off-by: David S. Miller

samples/bpf: add error checking for perf ioctl calls in bpf loader

2017-12-01T01:59:21Z

load_bpf_file() should fail if ioctl with command PERF_EVENT_IOC_ENABLE and PERF_EVENT_IOC_SET_BPF fails. When they do fail, proper error messages are printed. With this change, the below "syscall_tp" run shows that the maximum number of bpf progs attaching to the same perf tracepoint is indeed enforced. $ ./syscall_tp -i 64 prog #0: map ids 4 5 ... prog #63: map ids 382 383 $ ./syscall_tp -i 65 prog #0: map ids 4 5 ... prog #64: map ids 388 389 ioctl PERF_EVENT_IOC_SET_BPF failed err Argument list too long Signed-off-by: Yonghong Song Signed-off-by: Daniel Borkmann

kbuild: remove all dummy assignments to obj-

2017-11-18T02:46:06Z

Now kbuild core scripts create empty built-in.o where necessary. Remove "obj- := dummy.o" tricks. Signed-off-by: Masahiro Yamada

xdp: sample: Missing curly braces in read_route()

2017-11-14T13:00:13Z

The assert statement is supposed to be part of the else branch but the curly braces were accidentally left off. Fixes: 3e29cd0e6563 ("xdp: Sample xdp program implementing ip forward") Signed-off-by: Dan Carpenter Acked-by: Daniel Borkmann Signed-off-by: David S. Miller

bpf: Revert bpf_overrid_function() helper changes.

2017-11-11T09:24:55Z

NACK'd by x86 maintainer. Signed-off-by: David S. Miller

bpf: Fix tcp_clamp_kern.c sample program

2017-11-11T06:52:41Z

The program was returning -1 in some cases which is not allowed by the verifier any longer. Fixes: 390ee7e29fc8 ("bpf: enforce return code for cgroup-bpf programs") Signed-off-by: Lawrence Brakmo Signed-off-by: David S. Miller

bpf: Fix tcp_iw_kern.c sample program

2017-11-11T06:52:41Z

bpf: Fix tcp_cong_kern.c sample program

2017-11-11T06:52:41Z

bpf: Fix tcp_bufs_kern.c sample program

2017-11-11T06:52:41Z

bpf: Fix tcp_rwnd_kern.c sample program

2017-11-11T06:52:41Z