Skip to content

Commit dbe7d46

Browse files
mrpreAlexei Starovoitov
authored andcommitted
selftests/bpf: Allow auto port binding for bpf nf
Allow auto port binding for bpf nf test to avoid binding conflict. ./test_progs -a bpf_nf 24/1 bpf_nf/xdp-ct:OK 24/2 bpf_nf/tc-bpf-ct:OK 24/3 bpf_nf/alloc_release:OK 24/4 bpf_nf/insert_insert:OK 24/5 bpf_nf/lookup_insert:OK 24/6 bpf_nf/set_timeout_after_insert:OK 24/7 bpf_nf/set_status_after_insert:OK 24/8 bpf_nf/change_timeout_after_alloc:OK 24/9 bpf_nf/change_status_after_alloc:OK 24/10 bpf_nf/write_not_allowlisted_field:OK 24 bpf_nf:OK Summary: 1/10 PASSED, 0 SKIPPED, 0 FAILED Signed-off-by: Jiayuan Chen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 27e3162 commit dbe7d46

File tree

1 file changed

+6
-3
lines changed
  • tools/testing/selftests/bpf/prog_tests

1 file changed

+6
-3
lines changed

tools/testing/selftests/bpf/prog_tests/bpf_nf.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,14 @@ static void test_bpf_nf_ct(int mode)
7272
if (!ASSERT_OK(system(cmd), cmd))
7373
goto end;
7474

75-
srv_port = (mode == TEST_XDP) ? 5005 : 5006;
76-
srv_fd = start_server(AF_INET, SOCK_STREAM, "127.0.0.1", srv_port, TIMEOUT_MS);
75+
srv_fd = start_server(AF_INET, SOCK_STREAM, "127.0.0.1", 0, TIMEOUT_MS);
7776
if (!ASSERT_GE(srv_fd, 0, "start_server"))
7877
goto end;
7978

79+
srv_port = get_socket_local_port(srv_fd);
80+
if (!ASSERT_GE(srv_port, 0, "get_sock_local_port"))
81+
goto end;
82+
8083
client_fd = connect_to_server(srv_fd);
8184
if (!ASSERT_GE(client_fd, 0, "connect_to_server"))
8285
goto end;
@@ -91,7 +94,7 @@ static void test_bpf_nf_ct(int mode)
9194
skel->bss->saddr = peer_addr.sin_addr.s_addr;
9295
skel->bss->sport = peer_addr.sin_port;
9396
skel->bss->daddr = peer_addr.sin_addr.s_addr;
94-
skel->bss->dport = htons(srv_port);
97+
skel->bss->dport = srv_port;
9598

9699
if (mode == TEST_XDP)
97100
prog_fd = bpf_program__fd(skel->progs.nf_xdp_ct_test);

0 commit comments

Comments
 (0)