mirror of https://gitee.com/openkylin/linux.git
d2f30f5172
Daniel Borkmann says:
====================
pull-request: bpf 2018-05-24
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix a bug in the original fix to prevent out of bounds speculation when
multiple tail call maps from different branches or calls end up at the
same tail call helper invocation, from Daniel.
2) Two selftest fixes, one in reuseport_bpf_numa where test is skipped in
case of missing numa support and another one to update kernel config to
properly support xdp_meta.sh test, from Anders.
...
Would be great if you have a chance to merge net into net-next after that.
The verifier fix would be needed later as a dependency in bpf-next for
upcomig work there. When you do the merge there's a trivial conflict on
BPF side with
|
||
|---|---|---|
| .. | ||
| forwarding | ||
| .gitignore | ||
| Makefile | ||
| config | ||
| fib-onlink-tests.sh | ||
| fib_tests.sh | ||
| in_netns.sh | ||
| msg_zerocopy.c | ||
| msg_zerocopy.sh | ||
| netdevice.sh | ||
| pmtu.sh | ||
| psock_fanout.c | ||
| psock_lib.h | ||
| psock_tpacket.c | ||
| reuseaddr_conflict.c | ||
| reuseport_bpf.c | ||
| reuseport_bpf_cpu.c | ||
| reuseport_bpf_numa.c | ||
| reuseport_dualstack.c | ||
| rtnetlink.sh | ||
| run_afpackettests | ||
| run_netsocktests | ||
| socket.c | ||
| test_bpf.sh | ||