From nobody Sat May 18 14:25:18 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A13513CA83; Thu, 11 Apr 2024 05:43:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712814215; cv=none; b=uHHr2Enq/vNBsHdnzxKwnYqgKNJmN+IRSXpgPkeLKfO5yNYsWvY+ONgxgpOALF8L/VgPaLjRnAtZCvMLGN9FnPul0N+aOQHGoLg2Np56imO1nhHwzs89SxfdZ3IxjopJoaA45rEM1n+aPcgGnr9lgJXZMSjaPZhOgt4R+dMyT/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712814215; c=relaxed/simple; bh=Nw+jKwU0DfvkPmgZ/qYf2XlvVHgqRNhd2vibFo+Cl4E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aM8FQa44KHq7bAi/7rX5jIoL98qA9uvK6dE1ZEvVa0sOk25lTCSp0YIIGaL1sIup9kUaYF5UY5tx5mpfHDbIbQNjxj22eYu4z55TLZBCKbHgmLyVT/6NpwLSIQtzLI/Wze4bepb6aBFicDmt1+iSKBjGHr8PqNd7z0VwFxkx8Gc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eQDNQJmC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eQDNQJmC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A864DC43394; Thu, 11 Apr 2024 05:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712814214; bh=Nw+jKwU0DfvkPmgZ/qYf2XlvVHgqRNhd2vibFo+Cl4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eQDNQJmC2d4gZWKUtrM0yQE/X9ryuY+cW5JlOZBsKHRvgl0hOF8eBvCZ1fBd1E1vp Kcu4NISe7wcdYYli9Bj1S3/WwwJJPhNpdqiHoGJsaSj1iB4i7E3FgXLLtO9Pz23XXn QlpTtDrXGgHvONeLBouddgyQU88otf81EXCWpUcMLtndk5MrT4Fwtdegok4iyCxXC+ 4ktdPCoBq+GyCeAjnFyZknQFTMuPeZ+6oH42EjDlxz/NDujNMw3IRSUfRIWEfm2wJj bYoxt8l1JXR5Rias09g47idg5X9QJBgnEf54mkbPZbuqfCorRsV+IlXLyjQHBXCqxE IGl4yphAjoiVg== From: Geliang Tang To: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan Cc: Geliang Tang , bpf@vger.kernel.org, mptcp@lists.linux.dev, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v5 1/2] selftests/bpf: Add struct send_recv_arg Date: Thu, 11 Apr 2024 13:43:11 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Avoid setting total_bytes and stop as global variables, this patch adds a new struct named send_recv_arg to pass arguments between threads. Put these two variables together with fd into this struct and pass it to server thread, so that server thread can access these two variables without setting them as global ones. Signed-off-by: Geliang Tang --- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/te= sting/selftests/bpf/prog_tests/bpf_tcp_ca.c index 3da3030c9365..8f23b59574ff 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c @@ -20,7 +20,6 @@ =20 static const unsigned int total_bytes =3D 10 * 1024 * 1024; static int expected_stg =3D 0xeB9F; -static int stop; =20 static int settcpca(int fd, const char *tcp_ca) { @@ -33,13 +32,20 @@ static int settcpca(int fd, const char *tcp_ca) return 0; } =20 +struct send_recv_arg { + int fd; + uint32_t bytes; + int stop; +}; + static void *server(void *arg) { - int lfd =3D (int)(long)arg, err =3D 0, fd; + struct send_recv_arg *a =3D (struct send_recv_arg *)arg; ssize_t nr_sent =3D 0, bytes =3D 0; char batch[1500]; + int err =3D 0, fd; =20 - fd =3D accept(lfd, NULL, NULL); + fd =3D accept(a->fd, NULL, NULL); while (fd =3D=3D -1) { if (errno =3D=3D EINTR) continue; @@ -52,9 +58,9 @@ static void *server(void *arg) goto done; } =20 - while (bytes < total_bytes && !READ_ONCE(stop)) { + while (bytes < a->bytes && !READ_ONCE(a->stop)) { nr_sent =3D send(fd, &batch, - MIN(total_bytes - bytes, sizeof(batch)), 0); + MIN(a->bytes - bytes, sizeof(batch)), 0); if (nr_sent =3D=3D -1 && errno =3D=3D EINTR) continue; if (nr_sent =3D=3D -1) { @@ -64,13 +70,13 @@ static void *server(void *arg) bytes +=3D nr_sent; } =20 - ASSERT_EQ(bytes, total_bytes, "send"); + ASSERT_EQ(bytes, a->bytes, "send"); =20 done: if (fd >=3D 0) close(fd); if (err) { - WRITE_ONCE(stop, 1); + WRITE_ONCE(a->stop, 1); return ERR_PTR(err); } return NULL; @@ -79,18 +85,22 @@ static void *server(void *arg) static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) { ssize_t nr_recv =3D 0, bytes =3D 0; + struct send_recv_arg arg =3D { + .bytes =3D total_bytes, + .stop =3D 0, + }; int lfd =3D -1, fd =3D -1; pthread_t srv_thread; void *thread_ret; char batch[1500]; int err; =20 - WRITE_ONCE(stop, 0); - lfd =3D start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0); if (!ASSERT_NEQ(lfd, -1, "socket")) return; =20 + arg.fd =3D lfd; + fd =3D socket(AF_INET6, SOCK_STREAM, 0); if (!ASSERT_NEQ(fd, -1, "socket")) { close(lfd); @@ -122,12 +132,12 @@ static void do_test(const char *tcp_ca, const struct = bpf_map *sk_stg_map) goto done; } =20 - err =3D pthread_create(&srv_thread, NULL, server, (void *)(long)lfd); + err =3D pthread_create(&srv_thread, NULL, server, (void *)&arg); if (!ASSERT_OK(err, "pthread_create")) goto done; =20 /* recv total_bytes */ - while (bytes < total_bytes && !READ_ONCE(stop)) { + while (bytes < total_bytes && !READ_ONCE(arg.stop)) { nr_recv =3D recv(fd, &batch, MIN(total_bytes - bytes, sizeof(batch)), 0); if (nr_recv =3D=3D -1 && errno =3D=3D EINTR) @@ -139,7 +149,7 @@ static void do_test(const char *tcp_ca, const struct bp= f_map *sk_stg_map) =20 ASSERT_EQ(bytes, total_bytes, "recv"); =20 - WRITE_ONCE(stop, 1); + WRITE_ONCE(arg.stop, 1); pthread_join(srv_thread, &thread_ret); ASSERT_OK(IS_ERR(thread_ret), "thread_ret"); =20 --=20 2.40.1 From nobody Sat May 18 14:25:18 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7ED2EADD; Thu, 11 Apr 2024 05:43:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712814221; cv=none; b=qEjkjeldtjMGqY+XHqEljdUJCcPEupN9JltRhUEqyxNaYjZbZWjqfYzcJnl+HwnaJLlszE1f8aQUpyjSY3vLdrIFg7U1qWfLw782oWDALT4vhJB4aspHLokKUsCBbXjxezm2XLREr1itInD3h9uVHSBTtYMlrGNaK1LrXYeJRrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712814221; c=relaxed/simple; bh=P2QlzZZXD/atcoF2vwTJ7B2lr4396SBnG+qkncx9yvU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cnyq9CeqFtw937gcllRfYCcgg6YQWeuUE6CpZ0v1VSZ17xgLJDfedbouc4GmYVjzvhjp4lfyMlD6uXREhiLcD8LR1bAmpHboklxmnAHhKSf9eq3I+kqMWmjCOVwJxwFeek9H1AfhX/aIYNl4diN9147hvgF4WydTnMEJOFEHMxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DoOkRg6p; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DoOkRg6p" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6061BC433F1; Thu, 11 Apr 2024 05:43:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712814221; bh=P2QlzZZXD/atcoF2vwTJ7B2lr4396SBnG+qkncx9yvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DoOkRg6pFfzdUhTYJlOZQnh2weRLhSGbYir0EBnkXFUFQeb7nRMyTX2p4c/5ay7Tj 3tRHbt6UCm6h0jVU67ZXkYH3DUyhIjMWBDb6TQYOERmupbVCLrFp2AWQFqHdqg8CZV Qj2X4vGdjTf+GMwcUYIvGdtprdRT7wNMFvEdPRxtnEdwsXzR7CCLlJc4WIFIB25zBj wOhm0+msD/0GhHnd8qLGG7ZdYy3VuOq/a9JJBnEVfLnYQqpA7mW7X3EoYMX5zA24FS 222Uy2h+ZrC8wbmDrvHzqFsQs3yK8oTavx4Iv0uXdX/nZmO5aK0Oa3MrE/+ktNwByU KBFuKkaXYCoRA== From: Geliang Tang To: Andrii Nakryiko , Eduard Zingerman , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan Cc: Geliang Tang , bpf@vger.kernel.org, mptcp@lists.linux.dev, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v5 2/2] selftests/bpf: Export send_recv_data helper Date: Thu, 11 Apr 2024 13:43:12 +0800 Message-Id: <5231103be91fadcce3674a589542c63b6a5eedd4.1712813933.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch extracts the code to send and receive data into a new helper named send_recv_data() in network_helpers.c and export it in network_helpers.h. This helper will be used for MPTCP BPF selftests. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/network_helpers.c | 96 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 81 +--------------- 3 files changed, 98 insertions(+), 80 deletions(-) diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/= selftests/bpf/network_helpers.c index 04175e16195a..bb72cbb6c9ee 100644 --- a/tools/testing/selftests/bpf/network_helpers.c +++ b/tools/testing/selftests/bpf/network_helpers.c @@ -545,3 +545,99 @@ int set_hw_ring_size(char *ifname, struct ethtool_ring= param *ring_param) close(sockfd); return 0; } + +struct send_recv_arg { + int fd; + uint32_t bytes; + int stop; +}; + +static void *send_recv_server(void *arg) +{ + struct send_recv_arg *a =3D (struct send_recv_arg *)arg; + ssize_t nr_sent =3D 0, bytes =3D 0; + char batch[1500]; + int err =3D 0, fd; + + fd =3D accept(a->fd, NULL, NULL); + while (fd =3D=3D -1) { + if (errno =3D=3D EINTR) + continue; + err =3D -errno; + goto done; + } + + if (settimeo(fd, 0)) { + err =3D -errno; + goto done; + } + + while (bytes < a->bytes && !READ_ONCE(a->stop)) { + nr_sent =3D send(fd, &batch, + MIN(a->bytes - bytes, sizeof(batch)), 0); + if (nr_sent =3D=3D -1 && errno =3D=3D EINTR) + continue; + if (nr_sent =3D=3D -1) { + err =3D -errno; + break; + } + bytes +=3D nr_sent; + } + + if (bytes !=3D a->bytes) + log_err("Failed to send"); + +done: + if (fd >=3D 0) + close(fd); + if (err) { + WRITE_ONCE(a->stop, 1); + return ERR_PTR(err); + } + return NULL; +} + +int send_recv_data(int lfd, int fd, uint32_t total_bytes) +{ + ssize_t nr_recv =3D 0, bytes =3D 0; + struct send_recv_arg arg =3D { + .fd =3D lfd, + .bytes =3D total_bytes, + .stop =3D 0, + }; + pthread_t srv_thread; + void *thread_ret; + char batch[1500]; + int err =3D 0; + + err =3D pthread_create(&srv_thread, NULL, send_recv_server, (void *)&arg); + if (err) { + log_err("Failed to pthread_create"); + return err; + } + + /* recv total_bytes */ + while (bytes < total_bytes && !READ_ONCE(arg.stop)) { + nr_recv =3D recv(fd, &batch, + MIN(total_bytes - bytes, sizeof(batch)), 0); + if (nr_recv =3D=3D -1 && errno =3D=3D EINTR) + continue; + if (nr_recv =3D=3D -1) { + err =3D -errno; + break; + } + bytes +=3D nr_recv; + } + + if (bytes !=3D total_bytes) + log_err("Failed to recv"); + + WRITE_ONCE(arg.stop, 1); + pthread_join(srv_thread, &thread_ret); + if (IS_ERR(thread_ret) && !err) { + log_err("Failed to thread_ret"); + err =3D PTR_ERR(thread_ret); + } + + return err; +} diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/= selftests/bpf/network_helpers.h index 6457445cc6e2..70f4e4c92733 100644 --- a/tools/testing/selftests/bpf/network_helpers.h +++ b/tools/testing/selftests/bpf/network_helpers.h @@ -76,6 +76,7 @@ struct nstoken; */ struct nstoken *open_netns(const char *name); void close_netns(struct nstoken *token); +int send_recv_data(int lfd, int fd, uint32_t total_bytes); =20 static __u16 csum_fold(__u32 csum) { diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/te= sting/selftests/bpf/prog_tests/bpf_tcp_ca.c index 8f23b59574ff..0d811d08504a 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c @@ -32,75 +32,15 @@ static int settcpca(int fd, const char *tcp_ca) return 0; } =20 -struct send_recv_arg { - int fd; - uint32_t bytes; - int stop; -}; - -static void *server(void *arg) -{ - struct send_recv_arg *a =3D (struct send_recv_arg *)arg; - ssize_t nr_sent =3D 0, bytes =3D 0; - char batch[1500]; - int err =3D 0, fd; - - fd =3D accept(a->fd, NULL, NULL); - while (fd =3D=3D -1) { - if (errno =3D=3D EINTR) - continue; - err =3D -errno; - goto done; - } - - if (settimeo(fd, 0)) { - err =3D -errno; - goto done; - } - - while (bytes < a->bytes && !READ_ONCE(a->stop)) { - nr_sent =3D send(fd, &batch, - MIN(a->bytes - bytes, sizeof(batch)), 0); - if (nr_sent =3D=3D -1 && errno =3D=3D EINTR) - continue; - if (nr_sent =3D=3D -1) { - err =3D -errno; - break; - } - bytes +=3D nr_sent; - } - - ASSERT_EQ(bytes, a->bytes, "send"); - -done: - if (fd >=3D 0) - close(fd); - if (err) { - WRITE_ONCE(a->stop, 1); - return ERR_PTR(err); - } - return NULL; -} - static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) { - ssize_t nr_recv =3D 0, bytes =3D 0; - struct send_recv_arg arg =3D { - .bytes =3D total_bytes, - .stop =3D 0, - }; int lfd =3D -1, fd =3D -1; - pthread_t srv_thread; - void *thread_ret; - char batch[1500]; int err; =20 lfd =3D start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0); if (!ASSERT_NEQ(lfd, -1, "socket")) return; =20 - arg.fd =3D lfd; - fd =3D socket(AF_INET6, SOCK_STREAM, 0); if (!ASSERT_NEQ(fd, -1, "socket")) { close(lfd); @@ -132,26 +72,7 @@ static void do_test(const char *tcp_ca, const struct bp= f_map *sk_stg_map) goto done; } =20 - err =3D pthread_create(&srv_thread, NULL, server, (void *)&arg); - if (!ASSERT_OK(err, "pthread_create")) - goto done; - - /* recv total_bytes */ - while (bytes < total_bytes && !READ_ONCE(arg.stop)) { - nr_recv =3D recv(fd, &batch, - MIN(total_bytes - bytes, sizeof(batch)), 0); - if (nr_recv =3D=3D -1 && errno =3D=3D EINTR) - continue; - if (nr_recv =3D=3D -1) - break; - bytes +=3D nr_recv; - } - - ASSERT_EQ(bytes, total_bytes, "recv"); - - WRITE_ONCE(arg.stop, 1); - pthread_join(srv_thread, &thread_ret); - ASSERT_OK(IS_ERR(thread_ret), "thread_ret"); + ASSERT_OK(send_recv_data(lfd, fd, total_bytes), "send_recv_data"); =20 done: close(lfd); --=20 2.40.1