Skip to content

Commit e9dd229

Browse files
author
Alexei Starovoitov
committed
Merge branch 'retire-progs-test_sock_addr'
Jordan Rife says: ==================== Retire progs/test_sock_addr.c This patch series migrates remaining tests from bpf/test_sock_addr.c to prog_tests/sock_addr.c and progs/verifier_sock_addr.c in order to fully retire the old-style test program and expands test coverage to test previously untested scenarios related to sockaddr hooks. This is a continuation of the work started recently during the expansion of prog_tests/sock_addr.c. Link: https://lore.kernel.org/bpf/20240429214529.2644801-1-jrife@google.com/T/#u ======= Patches ======= * Patch 1 moves tests that check valid return values for recvmsg hooks into progs/verifier_sock_addr.c, a new addition to the verifier test suite. * Patches 2-5 lay the groundwork for test migration, enabling prog_tests/sock_addr.c to handle more test dimensions. * Patches 6-11 move existing tests to prog_tests/sock_addr.c. * Patch 12 removes some redundant test cases. * Patches 14-17 expand on existing test coverage. ==================== Link: https://lore.kernel.org/r/20240510190246.3247730-1-jrife@google.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
2 parents 20a759d + a3d3eb9 commit e9dd229

19 files changed

Lines changed: 2142 additions & 1424 deletions

tools/testing/selftests/bpf/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ test_dev_cgroup
1717
test_verifier_log
1818
feature
1919
test_sock
20-
test_sock_addr
2120
urandom_read
2221
test_sockmap
2322
test_lirc_mode2_user

tools/testing/selftests/bpf/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ TEST_PROGS := test_kmod.sh \
115115
test_xdp_redirect_multi.sh \
116116
test_xdp_meta.sh \
117117
test_xdp_veth.sh \
118-
test_sock_addr.sh \
119118
test_tunnel.sh \
120119
test_lwt_seg6local.sh \
121120
test_lirc_mode2.sh \
@@ -140,7 +139,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \
140139
test_xdp_vlan.sh test_bpftool.py
141140

142141
# Compile but not part of 'make run_tests'
143-
TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \
142+
TEST_GEN_PROGS_EXTENDED = test_skb_cgroup_id_user \
144143
flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \
145144
test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \
146145
xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \
@@ -296,7 +295,6 @@ NETWORK_HELPERS := $(OUTPUT)/network_helpers.o
296295
$(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS)
297296
$(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)
298297
$(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS)
299-
$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(NETWORK_HELPERS)
300298
$(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS)
301299
$(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS)
302300
$(OUTPUT)/get_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)

0 commit comments

Comments
 (0)