]> git.ipfire.org Git - thirdparty/linux.git/commit
selftests/bpf: Use bpf_tracing.h instead of bpf_tcp_helpers.h
authorMartin KaFai Lau <martin.lau@kernel.org>
Sat, 4 May 2024 00:50:45 +0000 (17:50 -0700)
committerAndrii Nakryiko <andrii@kernel.org>
Mon, 6 May 2024 20:40:24 +0000 (13:40 -0700)
commit8e6d9ae2e09f1f6ba65614a5e5c5a2a2e335dcba
tree811617fea13f0eb366fc71068a5e0ca0b1a56e6b
parenta9e7715ce8b3a62a2133e47e87107632a26ad1e2
selftests/bpf: Use bpf_tracing.h instead of bpf_tcp_helpers.h

The bpf programs that this patch changes require the BPF_PROG macro.
The BPF_PROG macro is defined in the libbpf's bpf_tracing.h.
Some tests include bpf_tcp_helpers.h which includes bpf_tracing.h.
They don't need other things from bpf_tcp_helpers.h other than
bpf_tracing.h. This patch simplifies it by directly including
the bpf_tracing.h.

The motivation of this unnecessary code churn is to retire
the bpf_tcp_helpers.h by directly using vmlinux.h. Right now,
the main usage of the bpf_tcp_helpers.h is the partial kernel
socket definitions (e.g. socket, sock, tcp_sock). While the test
cases continue to grow, fields are kept adding to those partial
socket definitions (e.g. the recent bpf_cc_cubic.c test which
tried to extend bpf_tcp_helpers.c but eventually used the
vmlinux.h instead).

The idea is to retire bpf_tcp_helpers.c and consistently use
vmlinux.h for the tests that require the kernel sockets. This
patch tackles the obvious tests that can directly use bpf_tracing.h
instead of bpf_tcp_helpers.h.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240504005045.848376-1-martin.lau@linux.dev
tools/testing/selftests/bpf/progs/timer.c
tools/testing/selftests/bpf/progs/timer_failure.c
tools/testing/selftests/bpf/progs/timer_mim.c
tools/testing/selftests/bpf/progs/timer_mim_reject.c