:p
atchew
Login
From: Geliang Tang <tanggeliang@kylinos.cn> v3: - update MAINTAINERS. - drop '-M' in _ss_search() as Matt suggested. v2: - rename pm_nl_ctl to mptcp_pm_nl_ctl. Geliang Tang (2): selftests/bpf: Add mptcp pm_nl_ctl link Squash to "selftests/bpf: Add mptcp subflow subtest" MAINTAINERS | 2 +- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 17 ++++++----------- 4 files changed, 9 insertions(+), 13 deletions(-) create mode 120000 tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c -- 2.43.0
From: Geliang Tang <tanggeliang@kylinos.cn> This patch adds a link of mptcp pm_nl_ctl tool into bpf selftests, and updates Makefile to compile it. This is useful to run mptcp bpf selftests on a system with an old version of IPRoite2 is installed. When 'ip mptcp' is not supported, this tool pm_nl_ctl can be used instead. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- MAINTAINERS | 2 +- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c diff --git a/MAINTAINERS b/MAINTAINERS index XXXXXXX..XXXXXXX 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -XXX,XX +XXX,XX @@ F: include/net/mptcp.h F: include/trace/events/mptcp.h F: include/uapi/linux/mptcp*.h F: net/mptcp/ -F: tools/testing/selftests/bpf/*/*mptcp*.c +F: tools/testing/selftests/bpf/{*/,}*mptcp*.c F: tools/testing/selftests/net/mptcp/ NETWORKING [TCP] diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -XXX,XX +XXX,XX @@ TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \ xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \ - xdp_features bpf_test_no_cfi.ko + xdp_features bpf_test_no_cfi.ko mptcp_pm_nl_ctl TEST_GEN_FILES += liburandom_read.so urandom_read sign-file uprobe_multi diff --git a/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c b/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c new file mode 120000 index XXXXXXX..XXXXXXX --- /dev/null +++ b/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c @@ -0,0 +1 @@ +../net/mptcp/pm_nl_ctl.c \ No newline at end of file -- 2.43.0
From: Geliang Tang <tanggeliang@kylinos.cn> Use pm_nl_ctl when 'ip mptcp' fails. Use SYS_NOFAIL in _ss_search() and drop 'ss -M'. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -XXX,XX +XXX,XX @@ static int endpoint_init(char *flags) SYS(fail, "ip -net %s link set dev veth1 up", NS_TEST); SYS(fail, "ip -net %s addr add %s/24 dev veth2", NS_TEST, ADDR_2); SYS(fail, "ip -net %s link set dev veth2 up", NS_TEST); - SYS(fail, "ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR_2, flags); + if (SYS_NOFAIL("ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR_2, flags)) { + SYS(fail, "ip netns exec %s ./mptcp_pm_nl_ctl add %s flags %s", + NS_TEST, ADDR_2, flags); + } return 0; fail: @@ -XXX,XX +XXX,XX @@ static int endpoint_init(char *flags) static int _ss_search(char *src, char *dst, char *port, char *keyword) { - char cmd[128]; - int n; - - n = snprintf(cmd, sizeof(cmd), - "ip netns exec %s ss -Menita src %s dst %s %s %d | grep -q '%s'", - NS_TEST, src, dst, port, PORT_1, keyword); - if (n < 0 || n >= sizeof(cmd)) - return -1; - - return system(cmd); + 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 ss_search(char *src, char *keyword) -- 2.43.0
From: Geliang Tang <tanggeliang@kylinos.cn> v6: - fix CI errors. - rebased. v5: - move checkpatch.pl fix out of this set. - update patch 2 as Matt suggested. v4: - "{*/,}" can't be used in MAINTAINERS, fix it. - fix checkpatch too. v3: - update MAINTAINERS. - drop '-M' in _ss_search() as Matt suggested. v2: - rename pm_nl_ctl to mptcp_pm_nl_ctl. Geliang Tang (2): selftests/bpf: Add mptcp pm_nl_ctl link Squash to "selftests/bpf: Add mptcp subflow subtest" MAINTAINERS | 1 + tools/testing/selftests/bpf/Makefile | 3 ++- tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 17 ++++++----------- 4 files changed, 10 insertions(+), 12 deletions(-) create mode 120000 tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c -- 2.43.0
From: Geliang Tang <tanggeliang@kylinos.cn> This patch adds a link of mptcp pm_nl_ctl tool into bpf selftests, and updates Makefile to compile it. This is useful to run mptcp bpf selftests on a system with an old version of IPRoite2 is installed. When 'ip mptcp' is not supported, this tool pm_nl_ctl can be used instead. MAINTAINERS needs to be updated since a new file is added. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- MAINTAINERS | 1 + tools/testing/selftests/bpf/Makefile | 3 ++- tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 120000 tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c diff --git a/MAINTAINERS b/MAINTAINERS index XXXXXXX..XXXXXXX 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -XXX,XX +XXX,XX @@ F: include/trace/events/mptcp.h F: include/uapi/linux/mptcp*.h F: net/mptcp/ F: tools/testing/selftests/bpf/*/*mptcp*.[ch] +F: tools/testing/selftests/bpf/*mptcp*.[ch] F: tools/testing/selftests/net/mptcp/ NETWORKING [TCP] diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -XXX,XX +XXX,XX @@ TEST_GEN_PROGS_EXTENDED = test_skb_cgroup_id_user \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \ xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \ - xdp_features bpf_test_no_cfi.ko + xdp_features bpf_test_no_cfi.ko mptcp_pm_nl_ctl TEST_GEN_FILES += liburandom_read.so urandom_read sign-file uprobe_multi @@ -XXX,XX +XXX,XX @@ TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ $(OUTPUT)/xdp_synproxy \ $(OUTPUT)/sign-file \ $(OUTPUT)/uprobe_multi \ + $(OUTPUT)/mptcp_pm_nl_ctl \ ima_setup.sh \ verify_sig_setup.sh \ $(wildcard progs/btf_dump_test_case_*.c) \ diff --git a/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c b/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c new file mode 120000 index XXXXXXX..XXXXXXX --- /dev/null +++ b/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c @@ -0,0 +1 @@ +../net/mptcp/pm_nl_ctl.c \ No newline at end of file -- 2.43.0
From: Geliang Tang <tanggeliang@kylinos.cn> Use pm_nl_ctl instead of 'ip mptcp'. Use SYS_NOFAIL in _ss_search() and drop 'ss -M'. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -XXX,XX +XXX,XX @@ static int endpoint_init(char *flags) SYS(fail, "ip -net %s link set dev veth1 up", NS_TEST); SYS(fail, "ip -net %s addr add %s/24 dev veth2", NS_TEST, ADDR_2); SYS(fail, "ip -net %s link set dev veth2 up", NS_TEST); - SYS(fail, "ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR_2, flags); + /* It would be better to use "ip -net %s mptcp endpoint add %s %s", + * but the BPF CI is using an old version of IPRoute (5.5.0). + */ + SYS(fail, "ip netns exec %s ./mptcp_pm_nl_ctl add %s flags %s", NS_TEST, ADDR_2, flags); return 0; fail: @@ -XXX,XX +XXX,XX @@ static int endpoint_init(char *flags) static int _ss_search(char *src, char *dst, char *port, char *keyword) { - char cmd[128]; - int n; - - n = snprintf(cmd, sizeof(cmd), - "ip netns exec %s ss -Menita src %s dst %s %s %d | grep -q '%s'", - NS_TEST, src, dst, port, PORT_1, keyword); - if (n < 0 || n >= sizeof(cmd)) - return -1; - - return system(cmd); + 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 ss_search(char *src, char *keyword) -- 2.43.0