diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-03 21:08:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-03 21:08:30 +0300 |
| commit | c2eb6d07a63cb01f0ef978b28927335198c544ce (patch) | |
| tree | 3f9b643506ffabc7c72cab62b14890e0ad4c8755 /include/trace | |
| parent | e4485c7484f4ed218aabdb659980b5c1c0ddff29 (diff) | |
| parent | 0ec9552b43b98deb882bf48efd347be4bd7afc9f (diff) | |
| download | linux-c2eb6d07a63cb01f0ef978b28927335198c544ce.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
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 <davem@davemloft.net>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/xdp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/trace/events/xdp.h b/include/trace/events/xdp.h index 4cd0f05d0113..8989a92c571a 100644 --- a/include/trace/events/xdp.h +++ b/include/trace/events/xdp.h @@ -8,6 +8,7 @@ #include <linux/netdevice.h> #include <linux/filter.h> #include <linux/tracepoint.h> +#include <linux/bpf.h> #define __XDP_ACT_MAP(FN) \ FN(ABORTED) \ |