refactor mptcp bpf tests
Subsystems (4)
Geliang Tang
reviewerv7 cover refactor mptcp bpf tests
From: Geliang Tang <[email protected]>
v7:
- address Matt's comments in v6 (thanks)
- add more commit logs.
- use WITH_DATA/WITHOUT_DATA instead of 1/0.
- make patch 3 as a squash-to patch.
v6:
- drop patch 1 in v5 and rebased.
v5:
- drop patch 5 in v4:
Squash to "selftests/bpf: Add bpf scheduler test" 4 cleanup
v4:
- add set_nonblock to make BPF tests stable.
- split 'Squash to "selftests/bpf: Add bpf scheduler test"' into 4 patches.
v3:
- part 1, bpf schedulers.
v2:
- add two more helpers, send_single_byte and send_recv_data.
Refactor mptcp bpf tests using newly added macros MPTCP_BASE_TEST, RUN_MPTCP_TEST and MPTCP_SCHED_TEST macro.
Geliang Tang (9):
selftests/bpf: Add RUN_MPTCP_TEST macro
Squash to "selftests/bpf: Add bpf scheduler test" 1 verify Squash to "selftests/bpf: Add bpf scheduler test" 2 time Squash to "selftests/bpf: Add bpf scheduler test" 3 MPTCP_SCHED_TEST Squash to "selftests/bpf: Add bpf_first scheduler & test" Squash to "selftests/bpf: Add bpf_bkup scheduler & test" Squash to "selftests/bpf: Add bpf_rr scheduler & test" Squash to "selftests/bpf: Add bpf_red scheduler & test" Squash to "selftests/bpf: Add bpf_burst scheduler & test"
.../testing/selftests/bpf/prog_tests/mptcp.c | 265 +++++------------- .../selftests/bpf/progs/mptcp_bpf_bkup.c | 1 + .../selftests/bpf/progs/mptcp_bpf_burst.c | 1 + .../selftests/bpf/progs/mptcp_bpf_first.c | 1 + .../selftests/bpf/progs/mptcp_bpf_red.c | 1 + .../selftests/bpf/progs/mptcp_bpf_rr.c | 1 + 6 files changed, 77 insertions(+), 193 deletions(-)
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 1/9 selftests/bpf: Add RUN_MPTCP_TEST macro
From: Geliang Tang <[email protected]>
Each MPTCP subtest tests test__start_subtest(suffix), then invokes test_suffix(). It makes sense to add a new macro RUN_MPTCP_TEST to simpolify the code.
--- tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +8 -4
@@ -653,12 +653,16 @@ static void test_burst(void)mptcp_bpf_burst__destroy (burst_skel); } +#define RUN_MPTCP_TEST (suffix) \ +do { \ + if (test__start_subtest(#suffix)) \ + test_##suffix(); \ +} while (0) +void test_mptcp (void ) { -if (test__start_subtest ("base" )) -test_base (); -if (test__start_subtest ("mptcpify" )) -test_mptcpify (); +RUN_MPTCP_TEST (base); +RUN_MPTCP_TEST (mptcpify);if (test__start_subtest ("default" ))test_default ();if (test__start_subtest ("first" ))
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 2/9 Squash to "selftests/bpf: Add bpf scheduler test" 1 verify
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Add send_data_and_verify helper to avoid duplicated code.
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +30 -10
@@ -457,23 +457,44 @@ static int has_bytes_sent(char *addr)return system (cmd); } -static void test_default (void ) +static void send_data_and_verify (char *sched,char *addr1,char *addr2) {int server_fd, client_fd; -struct nstoken *nstoken; - nstoken =sched_init ("subflow" ,"default" ); -if (!ASSERT_OK_PTR (nstoken,"sched_init:default" )) - goto fail; server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); +if (CHECK (server_fd <0 , sched,"start_mptcp_server: %d\n" , errno)) +return ; + client_fd =connect_to_fd (server_fd,0 ); +if (CHECK (client_fd <0 , sched,"connect_to_fd: %d\n" , errno)) + goto close_server; -send_data (server_fd, client_fd,"default" ); -ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr_1" ); -ASSERT_OK (has_bytes_sent (ADDR_2 ),"has_bytes_sent addr_2" ); +send_data (server_fd, client_fd, sched); + +if (!strcmp (addr1,"WITH_DATA" )) +CHECK (has_bytes_sent (ADDR_1 ), sched,"should have bytes_sent on addr1\n" ); +else if (!strcmp (addr1,"WITHOUT_DATA" )) +CHECK (!has_bytes_sent (ADDR_1 ), sched,"shouldn't have bytes_sent on addr1\n" ); +if (!strcmp (addr2,"WITH_DATA" )) +CHECK (has_bytes_sent (ADDR_2 ), sched,"should have bytes_sent on addr2\n" ); +else if (!strcmp (addr2,"WITHOUT_DATA" )) +CHECK (!has_bytes_sent (ADDR_2 ), sched,"shouldn't have bytes_sent on addr2\n" );close (client_fd); +close_server:close (server_fd); +} + +static void test_default (void ) +{ +struct nstoken *nstoken; + + nstoken =sched_init ("subflow" ,"default" ); +if (!ASSERT_OK_PTR (nstoken,"sched_init:default" )) + goto fail; + +send_data_and_verify ("default" ,"WITH_DATA" ,"WITH_DATA" ); + fail:cleanup_netns (nstoken); }
@@ -663,8 +684,7 @@ void test_mptcp(void) {RUN_MPTCP_TEST (base);RUN_MPTCP_TEST (mptcpify); -if (test__start_subtest ("default" )) -test_default (); +RUN_MPTCP_TEST (default);if (test__start_subtest ("first" ))test_first ();if (test__start_subtest ("bkup" ))
Signature · 1 line
2.40.1
Matthieu Baerts
maintainerRe: [PATCH mptcp-next v7 2/9] Squash to "selftests/bpf: Add bpf scheduler test" 1 verify
Hi Geliang,
Quoted 30 lines · Geliang Tang
From: Geliang Tang <[email protected]>
Add
send_data_and_verifyhelper to avoid duplicated code.Signed-off-by Geliang Tang <[email protected]>--- .../testing/selftests/bpf/prog_tests/mptcp.c | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-)tools/testing/selftests/bpf/prog_tests/mptcp.c +4
-5@@ -457,23 +457,44 @@ static int has_bytes_sent(char *addr)return system (cmd); } -static void test_default (void ) +static void send_data_and_verify (char *sched,char *addr1,char *addr2) {int server_fd, client_fd; -struct nstoken *nstoken; - nstoken =sched_init ("subflow" ,"default" ); -if (!ASSERT_OK_PTR (nstoken,"sched_init:default" )) - goto fail; server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); +if (CHECK (server_fd <0 , sched,"start_mptcp_server: %d\n" , errno)) +return ; +
tools/testing/selftests/bpf/prog_tests/mptcp.c static int has_bytes_sent(char *addr) · line 474
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/mptcp.c +5
-3client_fd =connect_to_fd (server_fd,0 ); +if (CHECK (client_fd <0 , sched,"connect_to_fd: %d\n" , errno)) + goto close_server; -send_data (server_fd, client_fd,"default" ); -ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr_1" ); -ASSERT_OK (has_bytes_sent (ADDR_2 ),"has_bytes_sent addr_2" ); +send_data (server_fd, client_fd, sched); + +if (!strcmp (addr1,"WITH_DATA" ))
Out of curiosity, why did you use strings? Why not using booleans? (or a bitmask)
#define WITH_DATA true
static void send_data_and_verify(char *sched, bool addr1_with_data,
bool addr1_with_data)
send_data_and_verify("...", WITH_DATA, !WITH_DATA);I guess that's fine for the tests, just strange in C :)
Cheers,
Matt
Signature · 1 line
Sponsored by the NGI0 Core fund.
Geliang Tang
reviewerRe: [PATCH mptcp-next v7 2/9] Squash to "selftests/bpf: Add bpf scheduler test" 1 verify
Hi Matt,
Quoted 46 lines · Matthieu Baerts
Quoted 46 lines
Hi Geliang,
Quoted 43 lines · Geliang Tang
Quoted 43 lines
From: Geliang Tang <[email protected]>
Add
send_data_and_verifyhelper to avoid duplicated code.Signed-off-by Geliang Tang <[email protected]>---
.../testing/selftests/bpf/prog_tests/mptcp.c | 40
++++++++++++++-----1 file changed, 30 insertions(+), 10 deletions(-)tools/testing/selftests/bpf/prog_tests/mptcp.c +0
-0@@ -457,23 +457,44 @@ static int has_bytes_sent(char *addr) return system(cmd); }tools/testing/selftests/bpf/prog_tests/mptcp.c +1
-1-static void test_default (void ) +static void send_data_and_verify(char *sched, char *addr1,char
*addr2)
{
intserver_fd,client_fd;
- struct nstoken *nstoken;
- nstoken =sched_init("subflow", "default");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:default"))
- goto fail;
server_fd=start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
+ if (CHECK(server_fd < 0, sched, "start_mptcp_server: %d\n", errno))
+ return;
+
client_fd=connect_to_fd(server_fd, 0);
+ if (CHECK(client_fd < 0, sched, "connect_to_fd: %d\n", errno))
+ gotoclose_server;
-send_data(server_fd, client_fd, "default");
-ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1");
-ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr_2");
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
+
send_data(server_fd, client_fd, sched);
+
+ if (!strcmp(addr1, "WITH_DATA"))Out of curiosity, why did you use strings? Why not using booleans? (or a
bitmask)
Since arguments addr1 and addr2 of macro MPTCP_SCHED_TEST are strings:
#define MPTCP_SCHED_TEST(sched, addr1, addr2) \
static void test_##sched(void) \
{ \
...
send_data_and_verify(#sched, #addr1, #addr2); \...
It's sample to use string arguments for send_data_and_verify too.
Thanks,
-Geliang
Quoted 12 lines
Quoted 12 lines
#define
WITH_DATAtrue
static void send_data_and_verify(char *sched, booladdr1_with_data,
booladdr1_with_data)
send_data_and_verify("...", WITH_DATA, !WITH_DATA);I guess that's fine for the tests, just strange in C :)
Cheers,
Matt
Matthieu Baerts
maintainerRe: [PATCH mptcp-next v7 2/9] Squash to "selftests/bpf: Add bpf scheduler test" 1 verify
Hi Geliang,
Quoted 58 lines · Geliang Tang
Hi Matt,
Quoted 46 lines · Matthieu Baerts
Quoted 46 lines
Hi Geliang,
Quoted 43 lines · Geliang Tang
Quoted 43 lines
From: Geliang Tang <[email protected]>
Add
send_data_and_verifyhelper to avoid duplicated code.Signed-off-by Geliang Tang <[email protected]>---
.../testing/selftests/bpf/prog_tests/mptcp.c | 40
++++++++++++++-----1 file changed, 30 insertions(+), 10 deletions(-)tools/testing/selftests/bpf/prog_tests/mptcp.c +0
-0@@ -457,23 +457,44 @@ static int has_bytes_sent(char *addr) return system(cmd); }tools/testing/selftests/bpf/prog_tests/mptcp.c +1
-1-static void test_default (void ) +static void send_data_and_verify(char *sched, char *addr1,char
*addr2)
{
intserver_fd,client_fd;
- struct nstoken *nstoken;
- nstoken =sched_init("subflow", "default");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:default"))
- goto fail;
server_fd=start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
+ if (CHECK(server_fd < 0, sched, "start_mptcp_server: %d\n", errno))
+ return;
+
client_fd=connect_to_fd(server_fd, 0);
+ if (CHECK(client_fd < 0, sched, "connect_to_fd: %d\n", errno))
+ gotoclose_server;
-send_data(server_fd, client_fd, "default");
-ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1");
-ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr_2");Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
+
send_data(server_fd, client_fd, sched);
+
+ if (!strcmp(addr1, "WITH_DATA"))Out of curiosity, why did you use strings? Why not using booleans? (or a
bitmask)
Quoted 1 line
Since arguments addr1 and addr2 of macro
MPTCP_SCHED_TESTare strings:
They are strings because you asked the preprocessor to convert them as string ...
Quoted 5 lines
#define MPTCP_SCHED_TEST(sched, addr1, addr2) \
static void test_##sched(void) \
{ \
...
send_data_and_verify(#sched, #addr1, #addr2); \... here, by using "#addr1" and "#addr2".
Why not simply removing the "#" not to do any conversion?
e.g.
================================= 8< ================================= #include <stdio.h>
#include <stdbool.h>
static void send_data_and_verify(char *sched, bool addr1, bool addr2)
{
printf("%s: %d %d\n", sched, addr1, addr2);
}#define MPTCP_SCHED_TEST(sched, addr1, addr2) \
static void test_##sched(void) \
{ \
send_data_and_verify(#sched, addr1, addr2); \
}#define WITH_DATA trueMPTCP_SCHED_TEST(first, WITH_DATA, !WITH_DATA);
int main()
{
test_first();
}================================= 8< =================================
This prints 'first: 1 0', what you want, no?
Cheers,
Matt
Signature · 1 line
Sponsored by the NGI0 Core fund.
Geliang Tang
reviewerRe: [PATCH mptcp-next v7 2/9] Squash to "selftests/bpf: Add bpf scheduler test" 1 verify
Hi Matt,
Quoted 104 lines · Matthieu Baerts
Hi Geliang,
Quoted 63 lines · Geliang Tang
Hi Matt,
Quoted 51 lines · Matthieu Baerts
Quoted 51 lines
Hi Geliang,
Quoted 48 lines · Geliang Tang
Quoted 48 lines
From: Geliang Tang <[email protected]>
Add
send_data_and_verifyhelper to avoid duplicated code.Signed-off-by Geliang Tang <[email protected]>---
.../testing/selftests/bpf/prog_tests/mptcp.c | 40
++++++++++++++-----1 file changed, 30 insertions(+), 10 deletions(-)tools/testing/selftests/bpf/prog_tests/mptcp.c +0
-0@@ -457,23 +457,44 @@ static int has_bytes_sent(char *addr) return system(cmd); }tools/testing/selftests/bpf/prog_tests/mptcp.c +1
-1-static void test_default (void ) +static void send_data_and_verify(char *sched, char *addr1,char
*addr2)
{
intserver_fd,client_fd;
- struct nstoken *nstoken;
- nstoken =sched_init("subflow", "default");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:default"))
- goto fail;
server_fd=start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
+ if (CHECK(server_fd < 0, sched, "start_mptcp_server:
%d\n",
errno))
+ return;
+
client_fd=connect_to_fd(server_fd, 0);
+ if (CHECK(client_fd < 0, sched, "connect_to_fd: %d\n", errno))
+ gotoclose_server;
-send_data(server_fd, client_fd, "default");
-ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1");
-ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr_2");
+send_data(server_fd, client_fd, sched);Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
+
+ if (!strcmp(addr1, "WITH_DATA"))Out of curiosity, why did you use strings? Why not using booleans?
(or a
bitmask)Quoted 2 lines
Since arguments addr1 and addr2 of macro
MPTCP_SCHED_TESTare strings:They are strings because you asked the preprocessor to convert them as
string ...Quoted 5 lines
#define
MPTCP_SCHED_TEST(sched, addr1, addr2)\
static void test_##sched(void) \
{ \
...
send_data_and_verify(#sched, #addr1, #addr2); \... here, by using "#addr1" and "#addr2".
Why not simply removing the "#" not to do any conversion?
e.g.
================================= 8<
=================================
#include <stdio.h>
#include <stdbool.h>static void
send_data_and_verify(char *sched, bool addr1, bool addr2){ printf("%s: %d %d\n", sched, addr1, addr2); }#define
MPTCP_SCHED_TEST(sched, addr1, addr2)\
static void test_##sched(void) \{ \ send_data_and_verify(#sched, addr1, addr2); \ }#define
WITH_DATAtrueMPTCP_SCHED_TEST(first, WITH_DATA, !WITH_DATA);
Quoted 8 lines
int
main(){ test_first(); }================================= 8<
=================================This prints 'first: 1 0', what you want, no?
Thank you for providing such a detailed example. I have updated it to v8.
-Geliang
Quoted 3 lines
Cheers,
Matt
Geliang Tang
reviewerPATCH v7 3/9 Squash to "selftests/bpf: Add bpf scheduler test" 2 time
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Move time related code from send_data into send_data_and_verify. Then send_data can be exported into network_helpers.h as a public function, reused by mptcp.c and bpf_tcp_ca.c.
Drop duplicate '#include <time.h>', it's included in test_progs.h already.
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +11 -12
@@ -5,7 +5,6 @@#include <linux/const.h> #include <netinet/in.h> #include <test_progs.h> -#include <time.h> #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_sock.skel.h"
@@ -380,16 +379,12 @@ static void *server(void *arg)static void send_data (int lfd,int fd,char *msg) {ssize_t nr_recv =0 , bytes =0 ; -struct timespec start, end; -unsigned int delta_ms;pthread_t srv_thread;void *thread_ret;char batch[1500 ];int err;WRITE_ONCE (stop,0 ); -if (clock_gettime (CLOCK_MONOTONIC , &start) <0 ) -return ; err =pthread_create (&srv_thread,NULL , server, (void *)(long )lfd);if (CHECK (err !=0 ,"pthread_create" ,"err:%d errno:%d\n" , err, errno))
@@ -406,16 +401,9 @@ static void send_data(int lfd, int fd, char *msg) bytes += nr_recv; } -if (clock_gettime (CLOCK_MONOTONIC , &end) <0 ) -return ; - - delta_ms = (end.tv_sec - start.tv_sec) *1000 + (end.tv_nsec - start.tv_nsec) /1000000 ; -CHECK (bytes != total_bytes,"recv" ,"%zd != %u nr_recv:%zd errno:%d\n" , bytes, total_bytes, nr_recv, errno); -printf ("%s: %u ms\n" , msg, delta_ms); -WRITE_ONCE (stop,1 );pthread_join (srv_thread, &thread_ret);
@@ -459,7 +447,9 @@ static int has_bytes_sent(char *addr)static void send_data_and_verify (char *sched,char *addr1,char *addr2) { +struct timespec start, end;int server_fd, client_fd; +unsigned int delta_ms; server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 );if (CHECK (server_fd <0 , sched,"start_mptcp_server: %d\n" , errno))
@@ -469,8 +459,17 @@ static void send_data_and_verify(char *sched, char *addr1, char *addr2)if (CHECK (client_fd <0 , sched,"connect_to_fd: %d\n" , errno)) goto close_server; +if (clock_gettime (CLOCK_MONOTONIC , &start) <0 ) + goto close_server; +send_data (server_fd, client_fd, sched); +if (clock_gettime (CLOCK_MONOTONIC , &end) <0 ) + goto close_server; + + 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 (!strcmp (addr1,"WITH_DATA" ))CHECK (has_bytes_sent (ADDR_1 ), sched,"should have bytes_sent on addr1\n" );else if (!strcmp (addr1,"WITHOUT_DATA" ))
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 4/9 Squash to "selftests/bpf: Add bpf scheduler test" 3 MPTCP_SCHED_TEST
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Please append this into commit log:
'''
This patch defines MPTCP_SCHED_TEST macro, a template for all scheduler tests. Every scheduler is identified by argument name, and use sysctl to set net.mptcp.scheduler as "bpf_name" to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR2 to PM netlink. Arguments addr1/add2 means whether the data has been sent on the first/second subflow or not. Send data and check bytes_sent of 'ss' output after it using send_data_and_verify().
'''
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+)
tools/testing/selftests/bpf/prog_tests/mptcp.c +30 -0
@@ -498,6 +498,36 @@ static void test_default(void)cleanup_netns (nstoken); } +#define MPTCP_SCHED_TEST (sched, addr1, addr2) \ +static void test_##sched(void) \ +{ \ + struct mptcp_bpf_##sched *skel; \ + struct nstoken *nstoken; \ + struct bpf_link *link; \ + struct bpf_map *map; \ + \ + skel = mptcp_bpf_##sched##__open_and_load(); \ + if (!ASSERT_OK_PTR(skel, "open_and_load:" #sched)) \ + return; \ + \ + map = bpf_object__find_map_by_name(skel->obj, #sched); \ + link = bpf_map__attach_struct_ops(map); \ + if (!ASSERT_OK_PTR(link, "attach_struct_ops:" #sched)) \ + goto skel_destroy; \ + \ + nstoken = sched_init("subflow", "bpf_" #sched); \ + if (!ASSERT_OK_PTR(nstoken, "sched_init:" #sched)) \ + goto link_destroy; \ + \ + send_data_and_verify(#sched, #addr1, #addr2); \ + \ + cleanup_netns(nstoken); \ +link_destroy: \ + bpf_link__destroy(link); \ +skel_destroy: \ + mptcp_bpf_##sched##__destroy(skel); \ +} +static void test_first (void ) {struct mptcp_bpf_first *first_skel;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 5/9 Squash to "selftests/bpf: Add bpf_first scheduler & test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
After squashing into this change, the patch "selftests/bpf: Add bpf_first test" can be merged into the patch "selftests/bpf: Add bpf_first scheduler" appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_first scheduler, the arguments "1 0" means data has been only sent on the first subflow ADDR1. Run this test by RUN_MPTCP_TEST macro. '''
And update the subject to "selftests/bpf: Add bpf_first scheduler & test".
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 38 +------------------ .../selftests/bpf/progs/mptcp_bpf_first.c | 1 + 2 files changed, 3 insertions(+), 36 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +2 -36
@@ -528,40 +528,7 @@ skel_destroy: \ mptcp_bpf_##sched##__destroy(skel); \ } -static void test_first (void ) -{ -struct mptcp_bpf_first *first_skel; -int server_fd, client_fd; -struct nstoken *nstoken; -struct bpf_link *link; - - first_skel =mptcp_bpf_first__open_and_load (); -if (!ASSERT_OK_PTR (first_skel,"bpf_first__open_and_load" )) -return ; - - link =bpf_map__attach_struct_ops (first_skel->maps.first); -if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { -mptcp_bpf_first__destroy (first_skel); -return ; - } - - nstoken =sched_init ("subflow" ,"bpf_first" ); -if (!ASSERT_OK_PTR (nstoken,"sched_init:bpf_first" )) - goto fail; - server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); - client_fd =connect_to_fd (server_fd,0 ); - -send_data (server_fd, client_fd,"bpf_first" ); -ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr_1" ); -ASSERT_GT (has_bytes_sent (ADDR_2 ),0 ,"has_bytes_sent addr_2" ); - -close (client_fd); -close (server_fd); -fail: -cleanup_netns (nstoken); -bpf_link__destroy (link); -mptcp_bpf_first__destroy (first_skel); -} +MPTCP_SCHED_TEST (first,WITH_DATA ,WITHOUT_DATA );static void test_bkup (void ) {
@@ -714,8 +681,7 @@ void test_mptcp(void)RUN_MPTCP_TEST (base);RUN_MPTCP_TEST (mptcpify);RUN_MPTCP_TEST (default); -if (test__start_subtest ("first" )) -test_first (); +RUN_MPTCP_TEST (first);if (test__start_subtest ("bkup" ))test_bkup ();if (test__start_subtest ("rr" ))
tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2022, SUSE. */ +/* Copyright (c) 2024, Kylin Software */ #include <linux/bpf.h> #include "bpf_tcp_helpers.h"
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 6/9 Squash to "selftests/bpf: Add bpf_bkup scheduler & test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
After squashing into this change, the patch "selftests/bpf: Add bpf_bkup test" can be merged into the patch "selftests/bpf: Add bpf_bkup scheduler" appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_bkup scheduler, the arguments "1 0" means data has been only sent on the first subflow ADDR1. Run this test by RUN_MPTCP_TEST macro. '''
And update the subject to "selftests/bpf: Add bpf_bkup scheduler & test".
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ .../selftests/bpf/progs/mptcp_bpf_bkup.c | 1 + 2 files changed, 3 insertions(+), 37 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +2 -37
@@ -529,41 +529,7 @@ skel_destroy: \ }MPTCP_SCHED_TEST (first,WITH_DATA ,WITHOUT_DATA ); - -static void test_bkup (void ) -{ -struct mptcp_bpf_bkup *bkup_skel; -int server_fd, client_fd; -struct nstoken *nstoken; -struct bpf_link *link; - - bkup_skel =mptcp_bpf_bkup__open_and_load (); -if (!ASSERT_OK_PTR (bkup_skel,"bpf_bkup__open_and_load" )) -return ; - - link =bpf_map__attach_struct_ops (bkup_skel->maps.bkup); -if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { -mptcp_bpf_bkup__destroy (bkup_skel); -return ; - } - - nstoken =sched_init ("subflow backup" ,"bpf_bkup" ); -if (!ASSERT_OK_PTR (nstoken,"sched_init:bpf_bkup" )) - goto fail; - server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); - client_fd =connect_to_fd (server_fd,0 ); - -send_data (server_fd, client_fd,"bpf_bkup" ); -ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr_1" ); -ASSERT_GT (has_bytes_sent (ADDR_2 ),0 ,"has_bytes_sent addr_2" ); - -close (client_fd); -close (server_fd); -fail: -cleanup_netns (nstoken); -bpf_link__destroy (link); -mptcp_bpf_bkup__destroy (bkup_skel); -} +MPTCP_SCHED_TEST (bkup,WITH_DATA ,WITHOUT_DATA );static void test_rr (void ) {
@@ -682,8 +648,7 @@ void test_mptcp(void)RUN_MPTCP_TEST (mptcpify);RUN_MPTCP_TEST (default);RUN_MPTCP_TEST (first); -if (test__start_subtest ("bkup" )) -test_bkup (); +RUN_MPTCP_TEST (bkup);if (test__start_subtest ("rr" ))test_rr ();if (test__start_subtest ("red" ))
tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2022, SUSE. */ +/* Copyright (c) 2024, Kylin Software */ #include <linux/bpf.h> #include "bpf_tcp_helpers.h"
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 7/9 Squash to "selftests/bpf: Add bpf_rr scheduler & test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
After squashing into this change, the patch "selftests/bpf: Add bpf_rr test" can be merged into the patch "selftests/bpf: Add bpf_rr scheduler" appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_rr scheduler, the arguments "1 1" means data has been sent on both net devices. Run this test by RUN_MPTCP_TEST macro. '''
And update the subject to "selftests/bpf: Add bpf_rr scheduler & test".
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ .../selftests/bpf/progs/mptcp_bpf_rr.c | 1 + 2 files changed, 3 insertions(+), 37 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +2 -37
@@ -530,41 +530,7 @@ skel_destroy: \MPTCP_SCHED_TEST (first,WITH_DATA ,WITHOUT_DATA );MPTCP_SCHED_TEST (bkup,WITH_DATA ,WITHOUT_DATA ); - -static void test_rr (void ) -{ -struct mptcp_bpf_rr *rr_skel; -int server_fd, client_fd; -struct nstoken *nstoken; -struct bpf_link *link; - - rr_skel =mptcp_bpf_rr__open_and_load (); -if (!ASSERT_OK_PTR (rr_skel,"bpf_rr__open_and_load" )) -return ; - - link =bpf_map__attach_struct_ops (rr_skel->maps.rr); -if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { -mptcp_bpf_rr__destroy (rr_skel); -return ; - } - - nstoken =sched_init ("subflow" ,"bpf_rr" ); -if (!ASSERT_OK_PTR (nstoken,"sched_init:bpf_rr" )) - goto fail; - server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); - client_fd =connect_to_fd (server_fd,0 ); - -send_data (server_fd, client_fd,"bpf_rr" ); -ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr 1" ); -ASSERT_OK (has_bytes_sent (ADDR_2 ),"has_bytes_sent addr 2" ); - -close (client_fd); -close (server_fd); -fail: -cleanup_netns (nstoken); -bpf_link__destroy (link); -mptcp_bpf_rr__destroy (rr_skel); -} +MPTCP_SCHED_TEST (rr,WITH_DATA ,WITH_DATA );static void test_red (void ) {
@@ -649,8 +615,7 @@ void test_mptcp(void)RUN_MPTCP_TEST (default);RUN_MPTCP_TEST (first);RUN_MPTCP_TEST (bkup); -if (test__start_subtest ("rr" )) -test_rr (); +RUN_MPTCP_TEST (rr);if (test__start_subtest ("red" ))test_red ();if (test__start_subtest ("burst" ))
tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2022, SUSE. */ +/* Copyright (c) 2024, Kylin Software */ #include <linux/bpf.h> #include "bpf_tcp_helpers.h"
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 8/9 Squash to "selftests/bpf: Add bpf_red scheduler & test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
After squashing into this change, the patch "selftests/bpf: Add bpf_red test" can be merged into the patch "selftests/bpf: Add bpf_red scheduler" appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_red scheduler, the arguments "1 1" means data has been sent on both net devices. Run this test by RUN_MPTCP_TEST macro. '''
And update the subject to "selftests/bpf: Add bpf_red scheduler & test".
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ .../selftests/bpf/progs/mptcp_bpf_red.c | 1 + 2 files changed, 3 insertions(+), 37 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +2 -37
@@ -531,41 +531,7 @@ skel_destroy: \MPTCP_SCHED_TEST (first,WITH_DATA ,WITHOUT_DATA );MPTCP_SCHED_TEST (bkup,WITH_DATA ,WITHOUT_DATA );MPTCP_SCHED_TEST (rr,WITH_DATA ,WITH_DATA ); - -static void test_red (void ) -{ -struct mptcp_bpf_red *red_skel; -int server_fd, client_fd; -struct nstoken *nstoken; -struct bpf_link *link; - - red_skel =mptcp_bpf_red__open_and_load (); -if (!ASSERT_OK_PTR (red_skel,"bpf_red__open_and_load" )) -return ; - - link =bpf_map__attach_struct_ops (red_skel->maps.red); -if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { -mptcp_bpf_red__destroy (red_skel); -return ; - } - - nstoken =sched_init ("subflow" ,"bpf_red" ); -if (!ASSERT_OK_PTR (nstoken,"sched_init:bpf_red" )) - goto fail; - server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); - client_fd =connect_to_fd (server_fd,0 ); - -send_data (server_fd, client_fd,"bpf_red" ); -ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr 1" ); -ASSERT_OK (has_bytes_sent (ADDR_2 ),"has_bytes_sent addr 2" ); - -close (client_fd); -close (server_fd); -fail: -cleanup_netns (nstoken); -bpf_link__destroy (link); -mptcp_bpf_red__destroy (red_skel); -} +MPTCP_SCHED_TEST (red,WITH_DATA ,WITH_DATA );static void test_burst (void ) {
@@ -616,8 +582,7 @@ void test_mptcp(void)RUN_MPTCP_TEST (first);RUN_MPTCP_TEST (bkup);RUN_MPTCP_TEST (rr); -if (test__start_subtest ("red" )) -test_red (); +RUN_MPTCP_TEST (red);if (test__start_subtest ("burst" ))test_burst (); }
tools/testing/selftests/bpf/progs/mptcp_bpf_red.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2022, SUSE. */ +/* Copyright (c) 2024, Kylin Software */ #include <linux/bpf.h> #include "bpf_tcp_helpers.h"
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v7 9/9 Squash to "selftests/bpf: Add bpf_burst scheduler & test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
After squashing into this change, the patch "selftests/bpf: Add bpf_burst test" can be merged into the patch "selftests/bpf: Add bpf_burst scheduler" appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_burst scheduler, the arguments "1 1" means data has been sent on both net devices. Run this test by RUN_MPTCP_TEST macro.
'''
And update the subject to "selftests/bpf: Add bpf_burst scheduler & test".
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ .../selftests/bpf/progs/mptcp_bpf_burst.c | 1 + 2 files changed, 3 insertions(+), 37 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +2 -37
@@ -532,41 +532,7 @@ MPTCP_SCHED_TEST(first, WITH_DATA, WITHOUT_DATA);MPTCP_SCHED_TEST (bkup,WITH_DATA ,WITHOUT_DATA );MPTCP_SCHED_TEST (rr,WITH_DATA ,WITH_DATA );MPTCP_SCHED_TEST (red,WITH_DATA ,WITH_DATA ); - -static void test_burst (void ) -{ -struct mptcp_bpf_burst *burst_skel; -int server_fd, client_fd; -struct nstoken *nstoken; -struct bpf_link *link; - - burst_skel =mptcp_bpf_burst__open_and_load (); -if (!ASSERT_OK_PTR (burst_skel,"bpf_burst__open_and_load" )) -return ; - - link =bpf_map__attach_struct_ops (burst_skel->maps.burst); -if (!ASSERT_OK_PTR (link,"bpf_map__attach_struct_ops" )) { -mptcp_bpf_burst__destroy (burst_skel); -return ; - } - - nstoken =sched_init ("subflow" ,"bpf_burst" ); -if (!ASSERT_OK_PTR (nstoken,"sched_init:bpf_burst" )) - goto fail; - server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); - client_fd =connect_to_fd (server_fd,0 ); - -send_data (server_fd, client_fd,"bpf_burst" ); -ASSERT_OK (has_bytes_sent (ADDR_1 ),"has_bytes_sent addr 1" ); -ASSERT_OK (has_bytes_sent (ADDR_2 ),"has_bytes_sent addr 2" ); - -close (client_fd); -close (server_fd); -fail: -cleanup_netns (nstoken); -bpf_link__destroy (link); -mptcp_bpf_burst__destroy (burst_skel); -} +MPTCP_SCHED_TEST (burst,WITH_DATA ,WITH_DATA );#define RUN_MPTCP_TEST (suffix) \ do { \
@@ -583,6 +549,5 @@ void test_mptcp(void)RUN_MPTCP_TEST (bkup);RUN_MPTCP_TEST (rr);RUN_MPTCP_TEST (red); -if (test__start_subtest ("burst" )) -test_burst (); +RUN_MPTCP_TEST (burst); }
tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2023, SUSE. */ +/* Copyright (c) 2024, Kylin Software */ #include <linux/bpf.h> #include <limits.h>
Signature · 1 line
2.40.1
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Unstable: 1 failed test(s): packetdrill_dss 🔴
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/8594046045
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/b4cc30b99d13
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=842249
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-normalFor 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 (NGI0 Core)