selftests/bpf: Fix bpf_nf failure upon test rerun
Subsystems (3)
Daniel Borkmann
maintainerPATCH 1/1 selftests/bpf: Fix bpf_nf failure upon test rerun
Alexei reported:
After fast forwarding bpf-next today bpf_nf test started to fail when run twice:
$ ./test_progs -t bpf_nf #17 bpf_nf:OK Summary: 1/10 PASSED, 0 SKIPPED, 0 FAILED
$ ./test_progs -t bpf_nf All error logs: test_bpf_nf_ct:PASS:test_bpf_nf__open_and_load 0 nsec test_bpf_nf_ct:PASS:iptables-legacy -t raw -A PREROUTING -j CONNMARK --set-mark 42/0 0 nsec (network_helpers.c:102: errno: Address already in use) Failed to bind socket test_bpf_nf_ct:FAIL:start_server unexpected start_server: actual -1 < expected 0 #17/1 bpf_nf/xdp-ct:FAIL test_bpf_nf_ct:PASS:test_bpf_nf__open_and_load 0 nsec test_bpf_nf_ct:PASS:iptables-legacy -t raw -A PREROUTING -j CONNMARK --set-mark 42/0 0 nsec (network_helpers.c:102: errno: Address already in use) Failed to bind socket test_bpf_nf_ct:FAIL:start_server unexpected start_server: actual -1 < expected 0 #17/2 bpf_nf/tc-bpf-ct:FAIL #17 bpf_nf:FAIL Summary: 0/8 PASSED, 0 SKIPPED, 1 FAILED
I was able to locally reproduce as well. Rearrange the connection teardown so that the client closes its connection first so that we don't need to linger in TCP time-wait.
Fixes e81fbd4c1ba7 ("selftests/bpf: Add existing connection bpf_*_ct_lookup() test")
Reported-by Alexei Starovoitov <[email protected]>
Signed-off-by Daniel Borkmann <[email protected]>
--- tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_nf.c +3 -2
@@ -123,12 +123,13 @@ static void test_bpf_nf_ct(int mode)ASSERT_EQ (skel->data->test_snat_addr,0 ,"Test for source natting" );ASSERT_EQ (skel->data->test_dnat_addr,0 ,"Test for destination natting" ); end: -if (srv_client_fd !=-1 ) -close (srv_client_fd);if (client_fd !=-1 )close (client_fd); +if (srv_client_fd !=-1 ) +close (srv_client_fd);if (srv_fd !=-1 )close (srv_fd); +snprintf (cmd,sizeof (cmd), iptables,"-D" );system (cmd);test_bpf_nf__destroy (skel);
Signature · 1 line
2.34.1
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 10 lines · On Mon, 26 Jun 2023 15:19:42 +0200 you wrote:
Alexei reported:
After fast forwarding bpf-next today
bpf_nftest started to fail when run twice:$ ./test_progs -t bpf_nf #17 bpf_nf:OK Summary: 1/10 PASSED, 0 SKIPPED, 0 FAILED[...]
Here is the summary with links:
- [bpf-next] selftests/bpf: Fix bpf_nf failure upon test rerun
https://git.kernel.org/bpf/bpf-next/c/17e8e5d6e09a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html