:p
atchew
Login
From: Geliang Tang <tanggeliang@kylinos.cn> Skip the test with test__skip() for systems that do not support "ip mptcp", so that CI can also pass. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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); - /* 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); + if (SYS_NOFAIL("ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR_2, flags)) { + /* "ip mptcp" not support, skip this test. */ + test__skip(); + goto fail; + } return 0; fail: @@ -XXX,XX +XXX,XX @@ static void test_subflow(void) if (!ASSERT_OK_PTR(nstoken, "create_netns: mptcp_subflow")) goto skel_destroy; - if (!ASSERT_OK(endpoint_init("subflow"), "endpoint_init")) + if (endpoint_init("subflow")) goto close_netns; run_subflow(skel->data->cc); -- 2.43.0
From: Geliang Tang <tanggeliang@kylinos.cn> Close client_fd as Martin suggested. Please update my email address of this patch squashed to as: From: Geliang Tang <tanggeliang@kylinos.cn> since BPF CI complained about it: WARNING: From:/Signed-off-by: email address mismatch: 'From: Geliang Tang <geliang@kernel.org>' != 'Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>' Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> --- v2: - use close_client/close_server. --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 void run_subflow(char *new) { int server_fd, client_fd, err; char cc[TCP_CA_NAME_MAX]; - socklen_t len = sizeof(cc); + socklen_t len; server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); if (!ASSERT_GE(server_fd, 0, "start_mptcp_server")) @@ -XXX,XX +XXX,XX @@ static void run_subflow(char *new) client_fd = connect_to_fd(server_fd, 0); if (!ASSERT_GE(client_fd, 0, "connect to fd")) - goto fail; + goto close_server; + len = sizeof(cc); err = getsockopt(server_fd, SOL_TCP, TCP_CONGESTION, cc, &len); - if (!ASSERT_OK(err, "getsockopt(srv_fd, TCP_CONGESTION)")) - goto fail; + if (!ASSERT_OK(err, "getsockopt(server_fd, TCP_CONGESTION)")) + goto close_client; send_byte(client_fd); @@ -XXX,XX +XXX,XX @@ static void run_subflow(char *new) ASSERT_OK(ss_search(ADDR_1, new), "ss_search new cc"); ASSERT_OK(ss_search(ADDR_2, cc), "ss_search default cc"); +close_client: close(client_fd); -fail: +close_server: close(server_fd); } -- 2.43.0