mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
* [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test"
@ 2022-06-09  5:23 Geliang Tang
  2022-06-09  6:46 ` Squash to "selftests/bpf: Add bpf_first test": Tests Results MPTCP CI
  2022-06-09 15:27 ` [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test" Mat Martineau
  0 siblings, 2 replies; 5+ messages in thread
From: Geliang Tang @ 2022-06-09  5:23 UTC (permalink / raw)
  To: mptcp; +Cc: Geliang Tang

A small cleanup, separate the code of base subtest and sched subtest, do
not mix them together.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 9f3242c7920a..8426a5aba721 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -15,9 +15,6 @@
 #define TCP_CA_NAME_MAX	16
 #endif
 
-#define ADDR_1	"10.0.1.1"
-#define ADDR_2	"10.0.1.2"
-
 struct mptcp_storage {
 	__u32 invoked;
 	__u32 is_mptcp;
@@ -27,9 +24,6 @@ struct mptcp_storage {
 	char ca_name[TCP_CA_NAME_MAX];
 };
 
-static const unsigned int total_bytes = 10 * 1024 * 1024;
-static int stop, duration;
-
 static int verify_tsk(int map_fd, int client_fd)
 {
 	int err, cfd = client_fd;
@@ -177,6 +171,9 @@ static void test_base(void)
 	close(cgroup_fd);
 }
 
+static const unsigned int total_bytes = 10 * 1024 * 1024;
+static int stop, duration;
+
 static void *server(void *arg)
 {
 	int lfd = (int)(long)arg, err = 0, fd;
@@ -256,6 +253,9 @@ static void send_data(int lfd, int fd)
 	      PTR_ERR(thread_ret));
 }
 
+#define ADDR_1	"10.0.1.1"
+#define ADDR_2	"10.0.1.2"
+
 static void sched_init(char *flags, char *sched)
 {
 	char cmd[64];
-- 
2.35.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: Squash to "selftests/bpf: Add bpf_first test": Tests Results
  2022-06-09  5:23 [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test" Geliang Tang
@ 2022-06-09  6:46 ` MPTCP CI
  2022-06-09 15:27 ` [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test" Mat Martineau
  1 sibling, 0 replies; 5+ messages in thread
From: MPTCP CI @ 2022-06-09  6:46 UTC (permalink / raw)
  To: Geliang Tang; +Cc: mptcp

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal:
  - Unstable: 1 failed test(s): selftest_mptcp_join 🔴:
  - Task: https://cirrus-ci.com/task/6029641566650368
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6029641566650368/summary/summary.txt

- KVM Validation: debug:
  - Unstable: 2 failed test(s): selftest_diag selftest_mptcp_connect 🔴:
  - Task: https://cirrus-ci.com/task/5466691613229056
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5466691613229056/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/9303f35b0fca


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-debug

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test"
  2022-06-09  5:23 [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test" Geliang Tang
  2022-06-09  6:46 ` Squash to "selftests/bpf: Add bpf_first test": Tests Results MPTCP CI
@ 2022-06-09 15:27 ` Mat Martineau
  2022-06-09 16:28   ` Matthieu Baerts
  1 sibling, 1 reply; 5+ messages in thread
From: Mat Martineau @ 2022-06-09 15:27 UTC (permalink / raw)
  To: Geliang Tang; +Cc: mptcp

On Thu, 9 Jun 2022, Geliang Tang wrote:

> A small cleanup, separate the code of base subtest and sched subtest, do
> not mix them together.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
> tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>

Fine with me to rearrange this test code and squash this, thanks Geliang.


- Mat


> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index 9f3242c7920a..8426a5aba721 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -15,9 +15,6 @@
> #define TCP_CA_NAME_MAX	16
> #endif
>
> -#define ADDR_1	"10.0.1.1"
> -#define ADDR_2	"10.0.1.2"
> -
> struct mptcp_storage {
> 	__u32 invoked;
> 	__u32 is_mptcp;
> @@ -27,9 +24,6 @@ struct mptcp_storage {
> 	char ca_name[TCP_CA_NAME_MAX];
> };
>
> -static const unsigned int total_bytes = 10 * 1024 * 1024;
> -static int stop, duration;
> -
> static int verify_tsk(int map_fd, int client_fd)
> {
> 	int err, cfd = client_fd;
> @@ -177,6 +171,9 @@ static void test_base(void)
> 	close(cgroup_fd);
> }
>
> +static const unsigned int total_bytes = 10 * 1024 * 1024;
> +static int stop, duration;
> +
> static void *server(void *arg)
> {
> 	int lfd = (int)(long)arg, err = 0, fd;
> @@ -256,6 +253,9 @@ static void send_data(int lfd, int fd)
> 	      PTR_ERR(thread_ret));
> }
>
> +#define ADDR_1	"10.0.1.1"
> +#define ADDR_2	"10.0.1.2"
> +
> static void sched_init(char *flags, char *sched)
> {
> 	char cmd[64];
> -- 
> 2.35.3
>
>
>

--
Mat Martineau
Intel

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test"
  2022-06-09 15:27 ` [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test" Mat Martineau
@ 2022-06-09 16:28   ` Matthieu Baerts
  0 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2022-06-09 16:28 UTC (permalink / raw)
  To: Mat Martineau, Geliang Tang; +Cc: mptcp

Hi Geliang, Mat,

On 09/06/2022 17:27, Mat Martineau wrote:
> On Thu, 9 Jun 2022, Geliang Tang wrote:
> 
>> A small cleanup, separate the code of base subtest and sched subtest, do
>> not mix them together.
>>
>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>> ---
>> tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
> 
> Fine with me to rearrange this test code and squash this, thanks Geliang.

Thank you for the patch and the review!

- 0729c68393d5: "squashed" in "selftests/bpf: Add bpf_first test"
- Results: 19fb763aac71..a9fc640fbfb4 (export)

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220609T162747
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH mptcp-next] Squash to "selftests/bpf: add bpf_first test"
  2022-05-17  7:43 [PATCH mptcp-next] Squash to "bpf: add bpf_skc_to_mptcp_sock_proto" Geliang Tang
@ 2022-05-17  7:43 ` Geliang Tang
  0 siblings, 0 replies; 5+ messages in thread
From: Geliang Tang @ 2022-05-17  7:43 UTC (permalink / raw)
  To: mptcp; +Cc: Geliang Tang

Drop connect_to_mptcp_fd

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index d9e6dec32bfe..fd42e22d5e7d 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -315,7 +315,7 @@ static void test_first(void)
 
 	system("sysctl -qw net.mptcp.scheduler=bpf_first");
 	server_fd = start_mptcp_server(AF_INET, NULL, 0, 0);
-	client_fd = connect_to_mptcp_fd(server_fd, 0);
+	client_fd = connect_to_fd(server_fd, 0);
 
 	send_data(server_fd, client_fd);
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-09 16:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-09  5:23 [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test" Geliang Tang
2022-06-09  6:46 ` Squash to "selftests/bpf: Add bpf_first test": Tests Results MPTCP CI
2022-06-09 15:27 ` [PATCH mptcp-next] Squash to "selftests/bpf: Add bpf_first test" Mat Martineau
2022-06-09 16:28   ` Matthieu Baerts
  -- strict thread matches above, loose matches on Subject: below --
2022-05-17  7:43 [PATCH mptcp-next] Squash to "bpf: add bpf_skc_to_mptcp_sock_proto" Geliang Tang
2022-05-17  7:43 ` [PATCH mptcp-next] Squash to "selftests/bpf: add bpf_first test" Geliang Tang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).