diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-02 15:27:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-02 15:29:58 -0700 |
| commit | ae8a76fb8b5d03fa2adc7249dc6131ba6a0c6119 (patch) | |
| tree | b197a7452b46abf51ffab8485236ccab69664d5c /tools/testing/selftests/bpf/progs/test_tcp_estats.c | |
| parent | d31e95585ca697fb31440c6fe30113adc85ecfbd (diff) | |
| parent | 358fdb456288d48874d44a064a82bfb0d9963fa0 (diff) | |
| download | linux-ae8a76fb8b5d03fa2adc7249dc6131ba6a0c6119.tar.gz linux-ae8a76fb8b5d03fa2adc7249dc6131ba6a0c6119.tar.bz2 linux-ae8a76fb8b5d03fa2adc7249dc6131ba6a0c6119.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2019-11-02
The following pull-request contains BPF updates for your *net-next* tree.
We've added 30 non-merge commits during the last 7 day(s) which contain
a total of 41 files changed, 1864 insertions(+), 474 deletions(-).
The main changes are:
1) Fix long standing user vs kernel access issue by introducing
bpf_probe_read_user() and bpf_probe_read_kernel() helpers, from Daniel.
2) Accelerated xskmap lookup, from Björn and Maciej.
3) Support for automatic map pinning in libbpf, from Toke.
4) Cleanup of BTF-enabled raw tracepoints, from Alexei.
5) Various fixes to libbpf and selftests.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/bpf/progs/test_tcp_estats.c')
| -rw-r--r-- | tools/testing/selftests/bpf/progs/test_tcp_estats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/progs/test_tcp_estats.c b/tools/testing/selftests/bpf/progs/test_tcp_estats.c index c8c595da38d4..87b7d934ce73 100644 --- a/tools/testing/selftests/bpf/progs/test_tcp_estats.c +++ b/tools/testing/selftests/bpf/progs/test_tcp_estats.c @@ -38,7 +38,7 @@ #include <sys/socket.h> #include "bpf_helpers.h" -#define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;}) +#define _(P) ({typeof(P) val = 0; bpf_probe_read_kernel(&val, sizeof(val), &P); val;}) #define TCP_ESTATS_MAGIC 0xBAADBEEF /* This test case needs "sock" and "pt_regs" data structure. |