Message ID | d5598209aecfc8fe58f9a93dc802817b041785a9.1725680751.git.tanggeliang@kylinos.cn (mailing list archive) |
---|---|
State | Superseded, archived |
Delegated to: | Geliang Tang |
Headers | show |
Series | [mptcp-next] Squash to "selftests/bpf: Add mptcp subflow subtest" | expand |
Context | Check | Description |
---|---|---|
matttbe/build | success | Build and static analysis OK |
matttbe/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 21 lines checked |
matttbe/shellcheck | success | MPTCP selftests files have not been modified |
matttbe/KVM_Validation__normal | success | Success! ✅ |
matttbe/KVM_Validation__debug | success | Success! ✅ |
matttbe/KVM_Validation__btf__only_bpftest_all_ | success | Success! ✅ |
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: Success! ✅ - KVM Validation: btf (only bpftest_all): Success! ✅ - Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/10748445039 Initiator: Patchew Applier Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/0145299d2c69 Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=887967 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-normal 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 (NGI0 Core)
Superseded. Move into "cleanups for bpf schedulers" set v2. Thanks, -Geliang On Sat, 2024-09-07 at 11:45 +0800, Geliang Tang wrote: > From: Geliang Tang <tanggeliang@kylinos.cn> > > Should use dedicated ASSERT_OK_FD() to check the fds. > > Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> > --- > tools/testing/selftests/bpf/prog_tests/mptcp.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c > b/tools/testing/selftests/bpf/prog_tests/mptcp.c > index 93869c873cad..987692863fde 100644 > --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c > +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c > @@ -394,11 +394,11 @@ static void run_subflow(void) > socklen_t len; > > server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); > - if (!ASSERT_GE(server_fd, 0, "start_mptcp_server")) > + if (!ASSERT_OK_FD(server_fd, "start_mptcp_server")) > return; > > client_fd = connect_to_fd(server_fd, 0); > - if (!ASSERT_GE(client_fd, 0, "connect to fd")) > + if (!ASSERT_OK_FD(client_fd, "connect_to_fd")) > goto close_server; > > send_byte(client_fd); > @@ -429,7 +429,7 @@ static void test_subflow(void) > struct bpf_link *link; > > cgroup_fd = test__join_cgroup("/mptcp_subflow"); > - if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow")) > + if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: mptcp_subflow")) > return; > > skel = mptcp_subflow__open_and_load();
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index 93869c873cad..987692863fde 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -394,11 +394,11 @@ static void run_subflow(void) socklen_t len; server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - if (!ASSERT_GE(server_fd, 0, "start_mptcp_server")) + if (!ASSERT_OK_FD(server_fd, "start_mptcp_server")) return; client_fd = connect_to_fd(server_fd, 0); - if (!ASSERT_GE(client_fd, 0, "connect to fd")) + if (!ASSERT_OK_FD(client_fd, "connect_to_fd")) goto close_server; send_byte(client_fd); @@ -429,7 +429,7 @@ static void test_subflow(void) struct bpf_link *link; cgroup_fd = test__join_cgroup("/mptcp_subflow"); - if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow")) + if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: mptcp_subflow")) return; skel = mptcp_subflow__open_and_load();