selftests/bpf: Allow auto port binding for cgroup connect

Allow auto port binding for cgroup connect test to avoid binding conflict.

Result:
./test_progs -a cgroup_v1v2
59      cgroup_v1v2:OK
Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED

Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev>
Link: https://lore.kernel.org/r/20250227142646.59711-2-jiayuan.chen@linux.dev
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c b/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c
index 64abba72ac10714bd97b911fe8a19ba662733936..37c1cc52ed98e5f718939d4de0651b40643c7ab2 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c
+++ b/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c
@@ -10,12 +10,18 @@
 static int run_test(int cgroup_fd, int server_fd, bool classid)
 {
        struct connect4_dropper *skel;
-       int fd, err = 0;
+       int fd, err = 0, port;
 
        skel = connect4_dropper__open_and_load();
        if (!ASSERT_OK_PTR(skel, "skel_open"))
                return -1;
 
+       port = get_socket_local_port(server_fd);
+       if (!ASSERT_GE(port, 0, "get_socket_local_port"))
+               return -1;
+
+       skel->bss->port = ntohs(port);
+
        skel->links.connect_v4_dropper =
                bpf_program__attach_cgroup(skel->progs.connect_v4_dropper,
                                           cgroup_fd);
@@ -48,10 +54,9 @@ void test_cgroup_v1v2(void)
 {
        struct network_helper_opts opts = {};
        int server_fd, client_fd, cgroup_fd;
-       static const int port = 60120;
 
        /* Step 1: Check base connectivity works without any BPF. */
-       server_fd = start_server(AF_INET, SOCK_STREAM, NULL, port, 0);
+       server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
        if (!ASSERT_GE(server_fd, 0, "server_fd"))
                return;
        client_fd = connect_to_fd_opts(server_fd, &opts);
@@ -66,7 +71,7 @@ void test_cgroup_v1v2(void)
        cgroup_fd = test__join_cgroup("/connect_dropper");
        if (!ASSERT_GE(cgroup_fd, 0, "cgroup_fd"))
                return;
-       server_fd = start_server(AF_INET, SOCK_STREAM, NULL, port, 0);
+       server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
        if (!ASSERT_GE(server_fd, 0, "server_fd")) {
                close(cgroup_fd);
                return;

diff --git a/tools/testing/selftests/bpf/progs/connect4_dropper.c b/tools/testing/selftests/bpf/progs/connect4_dropper.c
index d3f4c5e4fb696e33df8327065bdc200490e6b01a..a3819a5d09c8f345f261d256d9f0b52bc2ac0fbc 100644 (file)
--- a/tools/testing/selftests/bpf/progs/connect4_dropper.c
+++ b/tools/testing/selftests/bpf/progs/connect4_dropper.c
@@ -13,12 +13,14 @@
 #define VERDICT_REJECT 0
 #define VERDICT_PROCEED        1
 
+int port;
+
 SEC("cgroup/connect4")
 int connect_v4_dropper(struct bpf_sock_addr *ctx)
 {
        if (ctx->type != SOCK_STREAM)
                return VERDICT_PROCEED;
-       if (ctx->user_port == bpf_htons(60120))
+       if (ctx->user_port == bpf_htons(port))
                return VERDICT_REJECT;
        return VERDICT_PROCEED;
 }