monitor network traffic for flaky test cases
Subsystems (3)
v3 cover monitor network traffic for flaky test cases
Capture packets in the background for flaky test cases related to network features.
We have some flaky test cases that are difficult to debug without knowing what the traffic looks like. Capturing packets, the CI log and packet files may help developers to fix these flaky test cases.
This patch set monitors a few test cases. Recently, they have been showing flaky behavior.
IPv4 TCP packet: 127.0.0.1:48165 -> 127.0.0.1:36707, len 68, ifindex 1, SYN
IPv4 TCP packet: 127.0.0.1:36707 -> 127.0.0.1:48165, len 60, ifindex 1, SYN, ACK
IPv4 TCP packet: 127.0.0.1:48165 -> 127.0.0.1:36707, len 60, ifindex 1, ACK
IPv4 TCP packet: 127.0.0.1:36707 -> 127.0.0.1:48165, len 52, ifindex 1, ACK
IPv4 TCP packet: 127.0.0.1:48165 -> 127.0.0.1:36707, len 52, ifindex 1, FIN, ACK
IPv4 TCP packet: 127.0.0.1:36707 -> 127.0.0.1:48165, len 52, ifindex 1, RST, ACK
Packet file: packets-2172-86-select_reuseport:sockhash-test.log
#280/87 select_reuseport/sockhash IPv4/TCP LOOPBACK test_detach_bpf:OK The above block is the log of a test case. It shows every packets of a connection. The captured packets are stored in the file called packets-2172-86-select_reuseport:sockhash-test.log.
We have a set of high-level helpers and a test_progs option to simplify the process of enabling the traffic monitor. netns_new() and netns_free() are helpers used to create and delete namespaces while also enabling the traffic monitor for the namespace based on the patterns provided by the "-m" option of test_progs. The value of the "-m" option is a list of patterns used to enable the traffic monitor for a group of tests or a file containing patterns. CI can utilize this option to enable monitoring.
traffic_monitor_start() and traffic_monitor_stop() are low-level functions to start monitoring explicitly. You can have more controls, however high-level helpers are preferred.
The following block is an example that monitors the network traffic of a test case in a network namespace.
struct netns_obj *netns;
...
netns = netns_new("test", true);
if (!ASSERT_TRUE(netns, "netns_new"))
goto err;
... test ...
netns_free(netns);netns_new() will create a network namespace named "test". By passing "true" as the 2nd argument, it will set the network namespace of the current process to "test".netns_free() will destroy the namespace, and the process will leave the "test" namespace if the struct netns_obj returned by netns_new() is created with "true" as the 2nd argument. If the name of the test matches the patterns given by the "-m" option, the traffic monitor will be enabled for the "test" namespace as well.
The packet files are located in the directory "/tmp/tmon_pcap/". The directory is intended to be compressed as a file so that developers can download it from the CI.
This feature is enabled only if BPF selftests are built with TRAFFIC_MONITOR variable being defined. For example,
make TRAFFIC_MONITOR=1 -C tools/testing/selftests/bpf
This command will enable traffic monitoring for BPF selftests. That means we have to turn it on to get the log at CI.
---
Changes from v2:
- Include pcap header files conditionally.
- Move the implementation of traffic monitor to test_progs.c.
- Include test name and namespace as a part of names of packet files.
- Parse and print ICMP(v4|v6) packets.
- Add netns_new() and netns_free() to create and delete network namespaces.
- Make tc_redirect, sockmap_listen and select_reuseport test in a network namespace.
- Add the "-m" option to test_progs to enable traffic monitor for the tests matching the pattern. CI may use this option to enable monitoring for a given set of tests.
Changes from v1:
- Move to calling libpcap directly to capture packets in a background thread.
- Print parsed packet information for TCP and UDP packets.
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
Kui-Feng Lee (6):
selftests/bpf: Add traffic monitor functions. selftests/bpf: Add the traffic monitor option to test_progs. selftests/bpf: netns_new() and netns_free() helpers. selftests/bpf: Monitor traffic for tc_redirect. selftests/bpf: Monitor traffic for sockmap_listen. selftests/bpf: Monitor traffic for select_reuseport.
tools/testing/selftests/bpf/Makefile | 5 + tools/testing/selftests/bpf/network_helpers.c | 26 + tools/testing/selftests/bpf/network_helpers.h | 2 + .../bpf/prog_tests/select_reuseport.c | 39 +- .../selftests/bpf/prog_tests/sockmap_listen.c | 9 + .../selftests/bpf/prog_tests/tc_redirect.c | 48 +- tools/testing/selftests/bpf/test_progs.c | 597 +++++++++++++++++- tools/testing/selftests/bpf/test_progs.h | 22 + 8 files changed, 688 insertions(+), 60 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/6 selftests/bpf: Add traffic monitor functions.
Add functions that capture packets and print log in the background. They are supposed to be used for debugging flaky network test cases. A monitored test case should call traffic_monitor_start() to start a thread to capture packets in the background for a given namespace and call traffic_monitor_stop() to stop capturing. (Or, option '-m' implemented by the later patches.)
IPv4 TCP packet: 127.0.0.1:48165 -> 127.0.0.1:36707, len 68, ifindex 1, SYN
IPv4 TCP packet: 127.0.0.1:36707 -> 127.0.0.1:48165, len 60, ifindex 1, SYN, ACK
IPv4 TCP packet: 127.0.0.1:48165 -> 127.0.0.1:36707, len 60, ifindex 1, ACK
IPv4 TCP packet: 127.0.0.1:36707 -> 127.0.0.1:48165, len 52, ifindex 1, ACK
IPv4 TCP packet: 127.0.0.1:48165 -> 127.0.0.1:36707, len 52, ifindex 1, FIN, ACK
IPv4 TCP packet: 127.0.0.1:36707 -> 127.0.0.1:48165, len 52, ifindex 1, RST, ACK
Packet file: packets-2172-86-select_reuseport:sockhash-test.log
#280/87 select_reuseport/sockhash IPv4/TCP LOOPBACK test_detach_bpf:OKThe above is the output of an example. It shows the packets of a connection and the name of the file that contains captured packets in the directory /tmp/tmon_pcap. The file can be loaded by tcpdump or wireshark.
This feature only works if TRAFFIC_MONITOR variable has been passed to build BPF selftests. For example,
make TRAFFIC_MONITOR=1 -C tools/testing/selftests/bpf
This command will build BPF selftests with this feature enabled.
--- tools/testing/selftests/bpf/Makefile | 5 + tools/testing/selftests/bpf/test_progs.c | 432 +++++++++++++++++++++++ tools/testing/selftests/bpf/test_progs.h | 16 + 3 files changed, 453 insertions(+)
tools/testing/selftests/bpf/Makefile +5 -0
@@ -41,6 +41,11 @@ CFLAGS += -g $(OPT_FLAGS) -rdynamic \ LDFLAGS += $(SAN_LDFLAGS) LDLIBS += $(LIBELF_LIBS) -lz -lrt -lpthread +ifneq ($(TRAFFIC_MONITOR),) +LDLIBS += -lpcap +CFLAGS += -DTRAFFIC_MONITOR=1 +endif + # The following tests perform type punning and they may break strict # aliasing rules, which are exploited by both GCC and clang by default # while optimizing. This can lead to broken programs.
tools/testing/selftests/bpf/test_progs.c +432 -0
448 lines not on this page · raw message
tools/testing/selftests/bpf/test_progs.h +16 -0
@@ -474,4 +474,20 @@ extern void test_loader_fini(struct test_loader *tester);test_loader_fini (&tester); \ }) +struct tmonitor_ctx ; + +#ifdef TRAFFIC_MONITOR +struct tmonitor_ctx *traffic_monitor_start (const char *netns); +void traffic_monitor_stop (struct tmonitor_ctx *ctx); +#else +static inline struct tmonitor_ctx *traffic_monitor_start (const char *netns) +{ +return (struct tmonitor_ctx *)-1 ; +} + +static inline void traffic_monitor_stop (struct tmonitor_ctx *ctx) +{ +} +#endif +#endif /* __TEST_PROGS_H */
Signature · 1 line
2.34.1
PATCH v3 2/6 selftests/bpf: Add the traffic monitor option to test_progs.
In reply to Kui-Feng LeeAdd option '-m' to test_progs to accept names and patterns of test cases. This option will be used later to enable traffic monitor that capture network packets generated by test cases.
--- tools/testing/selftests/bpf/test_progs.c | 85 +++++++++++++++++------- tools/testing/selftests/bpf/test_progs.h | 2 + 2 files changed, 63 insertions(+), 24 deletions(-)
tools/testing/selftests/bpf/test_progs.c +61 -24
@@ -156,6 +156,7 @@ struct prog_test_def {void (*run_serial_test)(void );bool should_run;bool need_cgroup_cleanup; +bool should_tmon; };/* Override C runtime library's usleep() implementation to ensure nanosleep()
@@ -193,46 +194,59 @@ static bool should_run(struct test_selector *sel, int num, const char *name)return num < sel->num_set_len && sel->num_set[num]; } -static bool should_run_subtest (struct test_selector *sel, -struct test_selector *subtest_sel, -int subtest_num, -const char *test_name, -const char *subtest_name) +static bool match_subtest (struct test_filter_set *filter, +const char *test_name, +const char *subtest_name) {int i, j; -for (i =0 ; i < sel->blacklist.cnt; i++) { -if (glob_match (test_name, sel->blacklist.tests[i].name)) { -if (!sel->blacklist.tests[i].subtest_cnt) -return false; - -for (j =0 ; j < sel->blacklist.tests[i].subtest_cnt; j++) { -if (glob_match (subtest_name, - sel->blacklist.tests[i].subtests[j])) -return false; - } - } - } - -for (i =0 ; i < sel->whitelist.cnt; i++) { -if (glob_match (test_name, sel->whitelist.tests[i].name)) { -if (!sel->whitelist.tests[i].subtest_cnt) +for (i =0 ; i < filter->cnt; i++) { +if (glob_match (test_name, filter->tests[i].name)) { +if (!filter->tests[i].subtest_cnt)return true; -for (j =0 ; j < sel->whitelist.tests[i].subtest_cnt; j++) { +for (j =0 ; j < filter->tests[i].subtest_cnt; j++) {if (glob_match (subtest_name, - sel->whitelist.tests[i].subtests[j])) + filter->tests[i].subtests[j]))return true; } } } +return false; +} + +static bool should_run_subtest (struct test_selector *sel, +struct test_selector *subtest_sel, +int subtest_num, +const char *test_name, +const char *subtest_name) +{ +if (match_subtest (&sel->blacklist, test_name, subtest_name)) +return false; + +if (match_subtest (&sel->whitelist, test_name, subtest_name)) +return true; +if (!sel->whitelist.cnt && !subtest_sel->num_set)return true;return subtest_num < subtest_sel->num_set_len && subtest_sel->num_set[subtest_num]; } +static bool should_tmon (struct test_selector *sel,int num,const char *name) +{ +int i; + +for (i =0 ; i < sel->whitelist.cnt; i++) { +if (glob_match (name, sel->whitelist.tests[i].name) && + !sel->whitelist.tests[i].subtest_cnt) +return true; + } + +return false; +} +static char *test_result (bool failed,bool skipped) {return failed ?"FAIL" : (skipped ?"SKIP" :"OK" );
@@ -906,6 +920,10 @@ bool test__start_subtest(const char *subtest_name)return false; } + subtest_state->should_tmon =match_subtest (&env.tmon_selector.whitelist, + test->test_name, + subtest_name); + env.subtest_state = subtest_state;stdio_hijack_init (&subtest_state->log_buf, &subtest_state->log_cnt);
@@ -1085,7 +1103,8 @@ enum ARG_KEYS {ARG_TEST_NAME_GLOB_DENYLIST ='d' ,ARG_NUM_WORKERS ='j' ,ARG_DEBUG =-1 , -ARG_JSON_SUMMARY ='J' +ARG_JSON_SUMMARY ='J' , + ARG_TRAFFIC_MONITOR = 'm', }; static const struct argp_option opts[] = {
@@ -1112,6 +1131,8 @@ static const struct argp_option opts[] = { {"debug" ,ARG_DEBUG ,NULL ,0 , "print extra debug information for test_progs." }, { "json-summary", ARG_JSON_SUMMARY, "FILE", 0, "Write report in json format to this file."}, + { "traffic-monitor", ARG_TRAFFIC_MONITOR, "NAMES", 0, + "Monitor network traffic of tests with name matching the pattern (supports '*' wildcard)." }, {}, };
@@ -1323,6 +1344,18 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)break ;case ARGP_KEY_END :break ; +case ARG_TRAFFIC_MONITOR : { +if (arg[0 ] =='@' ) + err =parse_test_list_file (arg +1 , + &env->tmon_selector.whitelist, + true); +else + err =parse_test_list (arg, + &env->tmon_selector.whitelist, + true); + +break ; + }default :return ARGP_ERR_UNKNOWN ; }
@@ -2154,6 +2187,9 @@ int main(int argc, char **argv) test->test_num, test->test_name, test->test_name, test->test_name);exit (EXIT_ERR_SETUP_INFRA ); } +if (test->should_run) + test->should_tmon =should_tmon (&env.tmon_selector, + test->test_num, test->test_name); }/* ignore workers if we are just listing */
@@ -2238,6 +2274,7 @@ int main(int argc, char **argv)free_test_selector (&env.test_selector);free_test_selector (&env.subtest_selector); +free_test_selector (&env.tmon_selector);free_test_states ();if (env.succ_cnt + env.fail_cnt + env.skip_cnt ==0 )
tools/testing/selftests/bpf/test_progs.h +2 -0
@@ -74,6 +74,7 @@ struct subtest_state {int error_cnt;bool skipped;bool filtered; +bool should_tmon;FILE *stdout; };
@@ -98,6 +99,7 @@ struct test_state {struct test_env {struct test_selector test_selector;struct test_selector subtest_selector; +struct test_selector tmon_selector;bool verifier_stats;bool debug;enum verbosity verbosity;
Signature · 1 line
2.34.1
PATCH v3 3/6 selftests/bpf: netns_new() and netns_free() helpers.
In reply to Kui-Feng Leenetns_new()/netns_free() create/delete network namespaces. They support the option '-m' of test_progs to start/stop traffic monitor for the network namespace being created for matched tests.
--- tools/testing/selftests/bpf/network_helpers.c | 26 ++++++ tools/testing/selftests/bpf/network_helpers.h | 2 + tools/testing/selftests/bpf/test_progs.c | 80 +++++++++++++++++++ tools/testing/selftests/bpf/test_progs.h | 4 + 4 files changed, 112 insertions(+)
tools/testing/selftests/bpf/network_helpers.c +26 -0
@@ -448,6 +448,32 @@ char *ping_command(int family)return "ping" ; } +int make_netns (const char *name) +{ +char cmd[128 ]; +int r; + +snprintf (cmd,sizeof (cmd),"ip netns add %s" , name); + r =system (cmd); +if (r >0 ) +/* exit code */ +return -r; +return r; +} + +int remove_netns (const char *name) +{ +char cmd[128 ]; +int r; + +snprintf (cmd,sizeof (cmd),"ip netns del %s >/dev/null 2>&1" , name); + r =system (cmd); +if (r >0 ) +/* exit code */ +return -r; +return r; +} +struct nstoken {int orig_netns_fd; };
tools/testing/selftests/bpf/network_helpers.h +2 -0
@@ -92,6 +92,8 @@ 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); +int make_netns (const char *name); +int remove_netns (const char *name);static __u16 csum_fold (__u32 csum) {
tools/testing/selftests/bpf/test_progs.c +80 -0
86 lines not on this page · raw message
tools/testing/selftests/bpf/test_progs.h +4 -0
@@ -430,6 +430,10 @@ int write_sysctl(const char *sysctl, const char *value);int get_bpf_max_tramp_links_from (struct btf *btf);int get_bpf_max_tramp_links (void ); +struct netns_obj ; +struct netns_obj *netns_new (const char *name,bool open); +void netns_free (struct netns_obj *netns); +#ifdef __x86_64__#define SYS_NANOSLEEP_KPROBE_NAME "__x64_sys_nanosleep"#elif defined(__s390x__)
Signature · 1 line
2.34.1
PATCH v3 4/6 selftests/bpf: Monitor traffic for tc_redirect.
In reply to Kui-Feng LeeEnable traffic monitoring for the test case tc_redirect.
--- .../selftests/bpf/prog_tests/tc_redirect.c | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +36 -12
@@ -68,6 +68,7 @@ __FILE__, __LINE__, strerror(errno), ##__VA_ARGS__)static const char *const namespaces[] = {NS_SRC ,NS_FWD ,NS_DST ,NULL }; +static struct netns_obj *netns_objs[3 ];static int write_file (const char *path,const char *newval) {
@@ -85,29 +86,52 @@ static int write_file(const char *path, const char *newval)return 0 ; } -static int netns_setup_namespaces (const char *verb) +enum NETNS_VERB { +NETNS_ADD , +NETNS_DEL , +}; + +static int netns_setup_namespaces (enum NETNS_VERB verb) {const char *const *ns = namespaces; -char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs;while (*ns) { -snprintf (cmd,sizeof (cmd),"ip netns %s %s" , verb, *ns); -if (!ASSERT_OK (system (cmd), cmd)) -return -1 ; +if (verb ==NETNS_ADD ) { + *ns_obj =netns_new (*ns, false); +if (!*ns_obj) { +log_err ("netns_new failed" ); +return -1 ; + } + }else { +if (!*ns_obj) { +log_err ("netns_obj is NULL" ); +return -1 ; + } +netns_free (*ns_obj); + *ns_obj =NULL ; + } ns++; + ns_obj++; }return 0 ; } -static void netns_setup_namespaces_nofail (const char *verb) +static void netns_setup_namespaces_nofail (enum NETNS_VERB verb) {const char *const *ns = namespaces; -char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs;while (*ns) { -snprintf (cmd,sizeof (cmd),"ip netns %s %s > /dev/null 2>&1" , verb, *ns); -system (cmd); +if (verb ==NETNS_ADD ) { + *ns_obj =netns_new (*ns, false); + }else { +if (*ns_obj) +netns_free (*ns_obj); + *ns_obj =NULL ; + } ns++; + ns_obj++; } }
@@ -1250,17 +1274,17 @@ static void test_tc_redirect_peer_l3(struct netns_setup_result *setup_result) ({ \ struct netns_setup_result setup_result = { .dev_mode = mode, }; \ if (test__start_subtest(#name)) \ - if (ASSERT_OK(netns_setup_namespaces("add"), "setup namespaces")) { \ + if (ASSERT_OK(netns_setup_namespaces(NETNS_ADD), "setup namespaces")) { \ if (ASSERT_OK(netns_setup_links_and_routes(&setup_result), \ "setup links and routes")) \ test_ ## name(&setup_result); \ - netns_setup_namespaces("delete"); \ + netns_setup_namespaces(NETNS_DEL); \ } \ }) static void *test_tc_redirect_run_tests(void *arg) { - netns_setup_namespaces_nofail("delete"); + netns_setup_namespaces_nofail(NETNS_DEL); RUN_TEST(tc_redirect_peer, MODE_VETH); RUN_TEST(tc_redirect_peer, MODE_NETKIT);
Signature · 1 line
2.34.1
Re: [PATCH bpf-next v3 4/6] selftests/bpf: Monitor traffic for tc_redirect.
Quoted 42 lines · Kui-Feng Lee
Enable traffic monitoring for the test case
tc_redirect.Signed-off-by Kui-Feng Lee <[email protected]>---
.../selftests/bpf/prog_tests/tc_redirect.c | 48 ++++++++++++++--- --1 file changed, 36 insertions(+), 12 deletions(-)tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-0@@ -68,6 +68,7 @@ __FILE__, __LINE__, strerror(errno), ##__VA_ARGS__)
static const char * const namespaces[] = {NS_SRC,NS_FWD,NS_DST, NULL};
+static structnetns_obj*netns_objs[3];
static intwrite_file(const char *path, const char *newval){tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-0@@ -85,29 +86,52 @@ static int write_file(const char *path, const char *newval) return 0; }tools/testing/selftests/bpf/prog_tests/tc_redirect.c +6
-1-static int netns_setup_namespaces (const char *verb) +enum NETNS_VERB { +NETNS_ADD , +NETNS_DEL , +}; + +static int netns_setup_namespaces (enum NETNS_VERB verb){
const char * const *ns = namespaces;tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs;
while (*ns) {tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-1- snprintf(cmd, sizeof(cmd), "ip netns %s %s", verb,*ns);
tools/testing/selftests/bpf/prog_tests/tc_redirect.c static int write_file(const char *path, const char *newval) · line 100
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-2-if (!ASSERT_OK (system (cmd), cmd)) -return -1 ; +if (verb ==NETNS_ADD ) {
Maybe better to keep "verb" parameter as "char *", and use
if (!strcmp(verb, "add"))
here instead?
Quoted 77 lines
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +13
-0+ *ns_obj =netns_new (*ns, false); +if (!*ns_obj) { +log_err ("netns_new failed" ); +return -1 ; + } + }else { +if (!*ns_obj) { +log_err ("netns_obj is NULL" ); +return -1 ; + } +netns_free (*ns_obj); + *ns_obj =NULL ; + }ns++;
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ ns_obj++;}
return 0;
}tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-static void netns_setup_namespaces_nofail (const char *verb) +static void netns_setup_namespaces_nofail (enum NETNS_VERB verb){
const char * const *ns = namespaces;tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs;
while (*ns) {tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-1- snprintf(cmd, sizeof(cmd), "ip netns %s %s >
/dev/null2>&1", verb, *ns);tools/testing/selftests/bpf/prog_tests/tc_redirect.c +7
-1-system (cmd); +if (verb ==NETNS_ADD ) { + *ns_obj =netns_new (*ns, false); + }else { +if (*ns_obj) +netns_free (*ns_obj); + *ns_obj =NULL ; + }ns++;
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ ns_obj++;}
}tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-0@@ -1250,17 +1274,17 @@ static void test_tc_redirect_peer_l3(struct netns_setup_result *setup_result) ({ \struct
netns_setup_resultsetup_result= { .dev_mode = mode, }; \
if
(test__start_subtest(#name))
\tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-1- if (ASSERT_OK(netns_setup_namespaces("add"),"setup namespaces")) { \
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ if(
ASSERT_OK(netns_setup_namespaces(NETNS_ADD), "setup namespaces")) { \
if (ASSERT_OK(netns_setup_links_and_routes(&setup_result), \
"setup links and routes")) \
test_## name(&setup_result); \
-netns_setup_namespaces("delete"); \tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ netns_setup_namespaces(NETNS_DEL);\
}
\
})
static void *test_tc_redirect_run_tests(void *arg) {tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-netns_setup_namespaces_nofail ("delete" ); +netns_setup_namespaces_nofail (NETNS_DEL );
RUN_TEST(tc_redirect_peer, MODE_VETH);
RUN_TEST(tc_redirect_peer, MODE_NETKIT);
Re: [PATCH bpf-next v3 4/6] selftests/bpf: Monitor traffic for tc_redirect.
Quoted 49 lines · Geliang Tang
Quoted 35 lines · Kui-Feng Lee
Enable traffic monitoring for the test case
tc_redirect.Signed-off-by Kui-Feng Lee <[email protected]>--- .../selftests/bpf/prog_tests/tc_redirect.c | 48 ++++++++++++++--- -- 1 file changed, 36 insertions(+), 12 deletions(-)tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0@@ -68,6 +68,7 @@ __FILE__, __LINE__, strerror(errno), ##__VA_ARGS__) static const char * const namespaces[] = {NS_SRC, NS_FWD, NS_DST,NULL }; +static struct netns_obj *netns_objs[3 ]; static int write_file(const char *path, const char *newval){
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +6
-1@@ -85,29 +86,52 @@ static int write_file(const char *path, const char *newval) return 0; } -static int netns_setup_namespaces (const char *verb) +enum NETNS_VERB { +NETNS_ADD , +NETNS_DEL , +}; + +static int netns_setup_namespaces (enum NETNS_VERB verb) {tools/testing/selftests/bpf/prog_tests/tc_redirect.c static int write_file(const char *path, const · line 102
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +2
-4const char * const *ns = namespaces; -char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs; while (*ns) { -snprintf (cmd,sizeof (cmd),"ip netns %s %s" , verb, *ns); -if (!ASSERT_OK (system (cmd), cmd)) -return -1 ; +if (verb ==NETNS_ADD ) {Maybe better to keep "verb" parameter as "char *", and use
Quoted 3 lines
if (!strcmp(verb, "add"))here instead?
I have no strong opinion here.
May I know why you think string is better here?
Quoted 79 lines
Quoted 78 lines
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +24
-4+ *ns_obj =netns_new (*ns, false); +if (!*ns_obj) { +log_err ("netns_new failed" ); +return -1 ; + } + }else { +if (!*ns_obj) { +log_err ("netns_obj is NULL" ); +return -1 ; + } +netns_free (*ns_obj); + *ns_obj =NULL ; + } ns++; + ns_obj++; } return 0; } -static void netns_setup_namespaces_nofail (const char *verb) +static void netns_setup_namespaces_nofail (enum NETNS_VERB verb) { const char * const *ns = namespaces; -char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs; while (*ns) { - snprintf(cmd, sizeof(cmd), "ip netns %s %s > /dev/null 2>&1", verb, *ns); -system (cmd); + if (verb == NETNS_ADD) { + *ns_obj = netns_new(*ns, false); + } else { +if (*ns_obj) +netns_free (*ns_obj); + *ns_obj =NULL ; + } ns++; + ns_obj++;}
}tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1@@ -1250,17 +1274,17 @@ static void test_tc_redirect_peer_l3(struct netns_setup_result *setup_result) ({ \ struct netns_setup_result setup_result = { .dev_mode = mode, }; \ if (test__start_subtest(#name)) \ - if (ASSERT_OK(netns_setup_namespaces("add"), "setup namespaces")) { \ + if (ASSERT_OK(netns_setup_namespaces(NETNS_ADD), "setup namespaces")) { \ if (ASSERT_OK(netns_setup_links_and_routes(&setup_result), \ "setup links and routes")) \ test_ ##name(&setup_result); \
-netns_setup_namespaces("delete"); \tools/testing/selftests/bpf/prog_tests/tc_redirect.c +2
-1+netns_setup_namespaces (NETNS_DEL ); \ } \ }) static void *test_tc_redirect_run_tests(void *arg) { -netns_setup_namespaces_nofail ("delete" ); +netns_setup_namespaces_nofail (NETNS_DEL ); RUN_TEST(tc_redirect_peer, MODE_VETH); RUN_TEST(tc_redirect_peer, MODE_NETKIT);
Re: [PATCH bpf-next v3 4/6] selftests/bpf: Monitor traffic for tc_redirect.
Quoted 56 lines · Kui-Feng Lee
Quoted 53 lines · Geliang Tang
Quoted 46 lines · Kui-Feng Lee
Enable traffic monitoring for the test case
tc_redirect.Signed-off-by Kui-Feng Lee <[email protected]>---
.../selftests/bpf/prog_tests/tc_redirect.c | 48
++++++++++++++---
--1 file changed, 36 insertions(+), 12 deletions(-)tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-0@@ -68,6 +68,7 @@ __FILE__, __LINE__, strerror(errno), ##__VA_ARGS__)
static const char * const namespaces[] = {NS_SRC,NS_FWD,NS_DST,
NULL};
+static structnetns_obj*netns_objs[3];
static intwrite_file(const char *path, const char *newval){tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-0@@ -85,29 +86,52 @@ static int write_file(const char *path, const char *newval) return 0; }tools/testing/selftests/bpf/prog_tests/tc_redirect.c +6
-1-static int netns_setup_namespaces (const char *verb) +enum NETNS_VERB { +NETNS_ADD , +NETNS_DEL , +}; + +static int netns_setup_namespaces (enum NETNS_VERB verb){
const char * const *ns = namespaces;tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs;
while (*ns) {tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-1- snprintf(cmd, sizeof(cmd), "ip netns %s %s",verb,
*ns);tools/testing/selftests/bpf/prog_tests/tc_redirect.c static int write_file(const char *path, const char *newval) · line 100
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-2-if (!ASSERT_OK (system (cmd), cmd)) -return -1 ; +if (verb ==NETNS_ADD ) {Maybe better to keep "verb" parameter as "char *", and use
Quoted 6 lines
Quoted 3 lines
if (!strcmp(verb, "add"))here instead?
I have no strong opinion here.
May I know why you think string is better here?
I don't mean that string is better, I mean that "keep using strings" is better. If we continue to use string, test_tc_redirect_peer_l3 and test_tc_redirect_run_tests can remain unchanged, it at least makes this patch smaller.
Quoted 87 lines
Quoted 86 lines
Quoted 85 lines
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +13
-0+ *ns_obj =netns_new (*ns, false); +if (!*ns_obj) { +log_err ("netns_new failed" ); +return -1 ; + } + }else { +if (!*ns_obj) { +log_err ("netns_obj is NULL" ); +return -1 ; + } +netns_free (*ns_obj); + *ns_obj =NULL ; + }ns++;
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ ns_obj++;}
return 0;
}tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-static void netns_setup_namespaces_nofail (const char *verb) +static void netns_setup_namespaces_nofail (enum NETNS_VERB verb){
const char * const *ns = namespaces;tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-char cmd[128 ]; +struct netns_obj **ns_obj = netns_objs;
while (*ns) {tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-1- snprintf(cmd, sizeof(cmd), "ip netns %s %s >
/dev/null2>&1", verb, *ns);tools/testing/selftests/bpf/prog_tests/tc_redirect.c +7
-1-system (cmd); +if (verb ==NETNS_ADD ) { + *ns_obj =netns_new (*ns, false); + }else { +if (*ns_obj) +netns_free (*ns_obj); + *ns_obj =NULL ; + }ns++;
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ ns_obj++;}
}tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-0@@ -1250,17 +1274,17 @@ static void
test_tc_redirect_peer_l3(struct netns_setup_result *setup_result)
({
\
structnetns_setup_resultsetup_result= { .dev_mode
= mode, }; \
if
(test__start_subtest(#name))
\tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0
-1- if(ASSERT_OK(netns_setup_namespaces("add"),
"setup namespaces")) { \tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ if(
ASSERT_OK(netns_setup_namespaces(NETNS_ADD), "setup namespaces")) {
\
if (ASSERT_OK(netns_setup_links_and_routes(&setup_result), \
"setup links and routes")) \
test_## name(&setup_result); \
-
netns_setup_namespaces("delete")
; \tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-0+ netns_setup_namespaces(NETNS_DEL);
\
}
\
})
static void *test_tc_redirect_run_tests(void *arg) {tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1
-1-netns_setup_namespaces_nofail ("delete" ); +netns_setup_namespaces_nofail (NETNS_DEL );
RUN_TEST(tc_redirect_peer, MODE_VETH);
RUN_TEST(tc_redirect_peer, MODE_NETKIT);
PATCH v3 5/6 selftests/bpf: Monitor traffic for sockmap_listen.
In reply to Kui-Feng LeeEnable traffic monitor for each subtest of sockmap_listen.
--- tools/testing/selftests/bpf/prog_tests/sockmap_listen.c | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +9 -0
@@ -1893,14 +1893,23 @@ static void test_udp_unix_redir(struct test_sockmap_listen *skel, struct bpf_map {const char *family_name, *map_name;char s[MAX_TEST_NAME ]; +struct netns_obj *netns; family_name =family_str (family); map_name =map_type_str (map);snprintf (s,sizeof (s),"%s %s %s" , map_name, family_name, __func__);if (!test__start_subtest (s))return ; + + netns =netns_new ("test" , true); +if (!ASSERT_OK_PTR (netns,"netns_new" )) +return ; +system ("ip link set lo up" ); +inet_unix_skb_redir_to_connected (skel, map, family);unix_inet_skb_redir_to_connected (skel, map, family); + +netns_free (netns); } static void run_tests(struct test_sockmap_listen *skel, struct bpf_map *map,
Signature · 1 line
2.34.1
PATCH v3 6/6 selftests/bpf: Monitor traffic for select_reuseport.
In reply to Kui-Feng LeeEnable traffic monitoring for the subtests of select_reuseport.
--- .../bpf/prog_tests/select_reuseport.c | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-)
tools/testing/selftests/bpf/prog_tests/select_reuseport.c +15 -24
@@ -37,9 +37,7 @@ static int sk_fds[REUSEPORT_ARRAY_SIZE];static int reuseport_array =-1 , outer_map =-1 ;static enum bpf_map_type inner_map_type;static int select_by_skb_data_prog; -static int saved_tcp_syncookie =-1 ;static struct bpf_object *obj; -static int saved_tcp_fo =-1 ;static __u32 index_zero;static int epfd;
@@ -193,14 +191,6 @@ static int write_int_sysctl(const char *sysctl, int v)return 0 ; } -static void restore_sysctls (void ) -{ -if (saved_tcp_fo !=-1 ) -write_int_sysctl (TCP_FO_SYSCTL , saved_tcp_fo); -if (saved_tcp_syncookie !=-1 ) -write_int_sysctl (TCP_SYNCOOKIE_SYSCTL , saved_tcp_syncookie); -} -static int enable_fastopen (void ) {int fo;
@@ -795,6 +785,7 @@ static void test_config(int sotype, sa_family_t family, bool inany) };char s[MAX_TEST_NAME ];const struct test *t; +struct netns_obj *netns;for (t = tests; t < tests +ARRAY_SIZE (tests); t++) {if (t->need_sotype && t->need_sotype != sotype)
@@ -808,9 +799,23 @@ static void test_config(int sotype, sa_family_t family, bool inany)if (!test__start_subtest (s))continue ; + netns =netns_new ("test" , true); +if (!ASSERT_OK_PTR (netns,"netns_new" )) +continue ; + +system ("ip link set dev lo up" ); + +if (CHECK_FAIL (enable_fastopen ())) + goto out; +if (CHECK_FAIL (disable_syncookie ())) + goto out; +setup_per_test (sotype, family, inany, t->no_inner_map); t->fn (sotype, family);cleanup_per_test (t->no_inner_map); + +out: +netns_free (netns); } }
@@ -850,21 +855,7 @@ void test_map_type(enum bpf_map_type mt)void serial_test_select_reuseport (void ) { - saved_tcp_fo =read_int_sysctl (TCP_FO_SYSCTL ); -if (saved_tcp_fo <0 ) - goto out; - saved_tcp_syncookie =read_int_sysctl (TCP_SYNCOOKIE_SYSCTL ); -if (saved_tcp_syncookie <0 ) - goto out; - -if (enable_fastopen ()) - goto out; -if (disable_syncookie ()) - goto out; -test_map_type (BPF_MAP_TYPE_REUSEPORT_SOCKARRAY );test_map_type (BPF_MAP_TYPE_SOCKMAP );test_map_type (BPF_MAP_TYPE_SOCKHASH ); -out: -restore_sysctls (); }
Signature · 1 line
2.34.1