1. Patchew
  2. MPTCP
  3. View series

[PATCH mptcp-next v2] Squash to "selftests/bpf: Add bpf scheduler test" - drop has_bytes_sent

Geliang Tang posted 1 patch 1 month ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/f27360078ccfc5c9324d2f2fbd3207e3bc553b3c.1725959373.git.tanggeliang@kylinos.cn
There is a newer version of this series
.../testing/selftests/bpf/prog_tests/mptcp.c  | 48 ++++++++++---------
.../selftests/bpf/progs/mptcp_bpf_bytes.c     | 36 ++++++++++++++
2 files changed, 62 insertions(+), 22 deletions(-)
create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c
[PATCH mptcp-next v2] Squash to "selftests/bpf: Add bpf scheduler test" - drop has_bytes_sent
Posted by Geliang Tang 1 month ago 
From: Geliang Tang <tanggeliang@kylinos.cn>

Drop ss_search() and has_bytes_sent(), add a new bpf program to check
the bytes_sent.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
v2:
 - address Matt's comments. (thanks)
---
 .../testing/selftests/bpf/prog_tests/mptcp.c  | 48 ++++++++++---------
 .../selftests/bpf/progs/mptcp_bpf_bytes.c     | 36 ++++++++++++++
 2 files changed, 62 insertions(+), 22 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 2476f0a083bc..273039ecd7ac 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -10,6 +10,7 @@
 #include "mptcp_sock.skel.h"
 #include "mptcpify.skel.h"
 #include "mptcp_subflow.skel.h"
+#include "mptcp_bpf_bytes.skel.h"
 #include "mptcp_bpf_first.skel.h"
 #include "mptcp_bpf_bkup.skel.h"
 #include "mptcp_bpf_rr.skel.h"
@@ -489,56 +490,59 @@ static struct nstoken *sched_init(char *flags, char *sched)
 	return NULL;
 }
 
-static int ss_search(char *src, char *dst, char *port, char *keyword)
-{
-	return SYS_NOFAIL("ip netns exec %s ss -enita src %s dst %s %s %d | grep -q '%s'",
-			  NS_TEST, src, dst, port, PORT_1, keyword);
-}
-
-static int has_bytes_sent(char *dst)
-{
-	return ss_search(ADDR_1, dst, "sport", "bytes_sent:");
-}
-
 static void send_data_and_verify(char *sched, bool addr1, bool addr2)
 {
+	int server_fd, client_fd, err;
+	struct mptcp_bpf_bytes *skel;
 	struct timespec start, end;
-	int server_fd, client_fd;
 	unsigned int delta_ms;
 
+	skel = mptcp_bpf_bytes__open_and_load();
+	if (!ASSERT_OK_PTR(skel, "open_and_load: bytes"))
+		return;
+
+	skel->bss->pid = getpid();
+
+	err = mptcp_bpf_bytes__attach(skel);
+	if (!ASSERT_OK(err, "skel_attach: bytes"))
+		goto skel_destroy;
+
 	server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
 	if (!ASSERT_OK_FD(server_fd, "start_mptcp_server"))
-		return;
+		goto skel_destroy;
 
 	client_fd = connect_to_fd(server_fd, 0);
 	if (!ASSERT_OK_FD(client_fd, "connect_to_fd"))
-		goto fail;
+		goto close_server;
 
 	if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
-		goto fail;
+		goto close_client;
 
 	if (!ASSERT_OK(send_recv_data(server_fd, client_fd, total_bytes),
 		       "send_recv_data"))
-		goto fail;
+		goto close_client;
 
 	if (clock_gettime(CLOCK_MONOTONIC, &end) < 0)
-		goto fail;
+		goto close_client;
 
 	delta_ms = (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec - start.tv_nsec) / 1000000;
 	printf("%s: %u ms\n", sched, delta_ms);
 
 	if (addr1)
-		CHECK(has_bytes_sent(ADDR_1), sched, "should have bytes_sent on addr1\n");
+		ASSERT_GT(skel->bss->bytes_sent_1, 0, "should have bytes_sent on addr1");
 	else
-		CHECK(!has_bytes_sent(ADDR_1), sched, "shouldn't have bytes_sent on addr1\n");
+		ASSERT_EQ(skel->bss->bytes_sent_1, 0, "shouldn't have bytes_sent on addr1");
 	if (addr2)
-		CHECK(has_bytes_sent(ADDR_2), sched, "should have bytes_sent on addr2\n");
+		ASSERT_GT(skel->bss->bytes_sent_2, 0, "should have bytes_sent on addr2");
 	else
-		CHECK(!has_bytes_sent(ADDR_2), sched, "shouldn't have bytes_sent on addr2\n");
+		ASSERT_EQ(skel->bss->bytes_sent_2, 0, "shouldn't have bytes_sent on addr2");
 
+close_client:
 	close(client_fd);
-fail:
+close_server:
 	close(server_fd);
+skel_destroy:
+	mptcp_bpf_bytes__destroy(skel);
 }
 
 static void test_default(void)
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c
new file mode 100644
index 000000000000..aa84b137f344
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2024, Kylin Software */
+
+/* vmlinux.h, bpf_helpers.h and other 'define' */
+#include "bpf_tracing_net.h"
+#include "mptcp_bpf.h"
+
+char _license[] SEC("license") = "GPL";
+u64 bytes_sent_1 = 0;
+u64 bytes_sent_2 = 0;
+int pid;
+
+SEC("fexit/mptcp_sched_get_send")
+int BPF_PROG(trace_mptcp_sched_get_send, struct mptcp_sock *msk)
+{
+	struct mptcp_subflow_context *subflow;
+
+	if (bpf_get_current_pid_tgid() >> 32 != pid)
+		return 0;
+
+	mptcp_for_each_subflow(msk, subflow) {
+		struct tcp_sock *tp;
+		struct sock *ssk;
+
+		subflow = bpf_core_cast(subflow, struct mptcp_subflow_context);
+		ssk = mptcp_subflow_tcp_sock(subflow);
+		tp = bpf_core_cast(ssk, struct tcp_sock);
+
+		if (subflow->subflow_id == 1)
+			bytes_sent_1 = tp->bytes_sent;
+		else if (subflow->subflow_id == 2)
+			bytes_sent_2 = tp->bytes_sent;
+	}
+
+	return 0;
+}
-- 
2.43.0
Re: [PATCH mptcp-next v2] Squash to "selftests/bpf: Add bpf scheduler test" - drop has_bytes_sent
Posted by Geliang Tang 1 month ago 
On Tue, 2024-09-10 at 17:10 +0800, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> Drop ss_search() and has_bytes_sent(), add a new bpf program to check
> the bytes_sent.
> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
> v2:
>  - address Matt's comments. (thanks)
> ---
>  .../testing/selftests/bpf/prog_tests/mptcp.c  | 48 ++++++++++-------
> --
>  .../selftests/bpf/progs/mptcp_bpf_bytes.c     | 36 ++++++++++++++
>  2 files changed, 62 insertions(+), 22 deletions(-)
>  create mode 100644
> tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index 2476f0a083bc..273039ecd7ac 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -10,6 +10,7 @@
>  #include "mptcp_sock.skel.h"
>  #include "mptcpify.skel.h"
>  #include "mptcp_subflow.skel.h"
> +#include "mptcp_bpf_bytes.skel.h"
>  #include "mptcp_bpf_first.skel.h"
>  #include "mptcp_bpf_bkup.skel.h"
>  #include "mptcp_bpf_rr.skel.h"
> @@ -489,56 +490,59 @@ static struct nstoken *sched_init(char *flags,
> char *sched)
>  	return NULL;
>  }
>  
> -static int ss_search(char *src, char *dst, char *port, char
> *keyword)
> -{
> -	return SYS_NOFAIL("ip netns exec %s ss -enita src %s dst %s
> %s %d | grep -q '%s'",
> -			  NS_TEST, src, dst, port, PORT_1, keyword);
> -}
> -
> -static int has_bytes_sent(char *dst)
> -{
> -	return ss_search(ADDR_1, dst, "sport", "bytes_sent:");
> -}
> -
>  static void send_data_and_verify(char *sched, bool addr1, bool
> addr2)
>  {
> +	int server_fd, client_fd, err;
> +	struct mptcp_bpf_bytes *skel;
>  	struct timespec start, end;
> -	int server_fd, client_fd;
>  	unsigned int delta_ms;
>  
> +	skel = mptcp_bpf_bytes__open_and_load();
> +	if (!ASSERT_OK_PTR(skel, "open_and_load: bytes"))
> +		return;
> +
> +	skel->bss->pid = getpid();
> +
> +	err = mptcp_bpf_bytes__attach(skel);
> +	if (!ASSERT_OK(err, "skel_attach: bytes"))
> +		goto skel_destroy;
> +
>  	server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
>  	if (!ASSERT_OK_FD(server_fd, "start_mptcp_server"))
> -		return;
> +		goto skel_destroy;
>  
>  	client_fd = connect_to_fd(server_fd, 0);
>  	if (!ASSERT_OK_FD(client_fd, "connect_to_fd"))
> -		goto fail;
> +		goto close_server;
>  
>  	if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
> -		goto fail;
> +		goto close_client;
>  
>  	if (!ASSERT_OK(send_recv_data(server_fd, client_fd,
> total_bytes),
>  		       "send_recv_data"))
> -		goto fail;
> +		goto close_client;
>  
>  	if (clock_gettime(CLOCK_MONOTONIC, &end) < 0)
> -		goto fail;
> +		goto close_client;
>  
>  	delta_ms = (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec
> - start.tv_nsec) / 1000000;
>  	printf("%s: %u ms\n", sched, delta_ms);
>  
>  	if (addr1)
> -		CHECK(has_bytes_sent(ADDR_1), sched, "should have
> bytes_sent on addr1\n");
> +		ASSERT_GT(skel->bss->bytes_sent_1, 0, "should have
> bytes_sent on addr1");
>  	else
> -		CHECK(!has_bytes_sent(ADDR_1), sched, "shouldn't
> have bytes_sent on addr1\n");
> +		ASSERT_EQ(skel->bss->bytes_sent_1, 0, "shouldn't
> have bytes_sent on addr1");
>  	if (addr2)
> -		CHECK(has_bytes_sent(ADDR_2), sched, "should have
> bytes_sent on addr2\n");
> +		ASSERT_GT(skel->bss->bytes_sent_2, 0, "should have
> bytes_sent on addr2");
>  	else
> -		CHECK(!has_bytes_sent(ADDR_2), sched, "shouldn't
> have bytes_sent on addr2\n");
> +		ASSERT_EQ(skel->bss->bytes_sent_2, 0, "shouldn't
> have bytes_sent on addr2");
>  
> +close_client:
>  	close(client_fd);
> -fail:
> +close_server:
>  	close(server_fd);
> +skel_destroy:
> +	mptcp_bpf_bytes__destroy(skel);
>  }
>  
>  static void test_default(void)
> diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c
> b/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c
> new file mode 100644
> index 000000000000..aa84b137f344
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c
> @@ -0,0 +1,36 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2024, Kylin Software */
> +
> +/* vmlinux.h, bpf_helpers.h and other 'define' */
> +#include "bpf_tracing_net.h"
> +#include "mptcp_bpf.h"
> +
> +char _license[] SEC("license") = "GPL";
> +u64 bytes_sent_1 = 0;
> +u64 bytes_sent_2 = 0;
> +int pid;
> +
> +SEC("fexit/mptcp_sched_get_send")
> +int BPF_PROG(trace_mptcp_sched_get_send, struct mptcp_sock *msk)
> +{
> +	struct mptcp_subflow_context *subflow;
> +
> +	if (bpf_get_current_pid_tgid() >> 32 != pid)
> +		return 0;

Superseded. I prefer to add this check here:

	if (!msk->pm.server_side)
		return 0;

Update in v3.

Thanks,
-Geliang

> +
> +	mptcp_for_each_subflow(msk, subflow) {
> +		struct tcp_sock *tp;
> +		struct sock *ssk;
> +
> +		subflow = bpf_core_cast(subflow, struct
> mptcp_subflow_context);
> +		ssk = mptcp_subflow_tcp_sock(subflow);
> +		tp = bpf_core_cast(ssk, struct tcp_sock);
> +
> +		if (subflow->subflow_id == 1)
> +			bytes_sent_1 = tp->bytes_sent;
> +		else if (subflow->subflow_id == 2)
> +			bytes_sent_2 = tp->bytes_sent;
> +	}
> +
> +	return 0;
> +}

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.