From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB55D54BC4 for ; Thu, 28 Mar 2024 08:05:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613118; cv=none; b=VTpJLj90GNg1kYkPaEsyh6iRtiUkUeJFw7elqV2LsW0V8dmBeUPT6dOrPxVTadmPkAskBNZgg+o6GAYC3Xcag8uTHh7RQMMUZINSK+sksDyp96p6ebokcPP5HyaIDfBaUt9CkEi/ssB8D6u8TZvVn6Wi7HC5q4zNX/IXKLzz0qE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613118; c=relaxed/simple; bh=nYOWAU7sfzIVHuhCPmcHon1XQI6uRYZDP32k3/YsPdQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pe1lKXTNCvNb43hhGzVBEYUs5IGL+ieQSZyhvYIRyAa3FPw3DQeADXRoHIEJgeYg/NT/cNHPSuUUqb1BgemSy73GOjWcIfd+gGQMZJWCH+eOvcIJ6vOO8B93ZWpYFGDtfQ72Rjyay0GSx7eOXZ24350CjlqfjKFnqcFEN0394Sc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZFvXz9Ce; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZFvXz9Ce" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83043C43394; Thu, 28 Mar 2024 08:05:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613118; bh=nYOWAU7sfzIVHuhCPmcHon1XQI6uRYZDP32k3/YsPdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFvXz9CegqZ3aZn9tJho+8VwHv2NMiDnVFn7YtI6DMSO3HFNIkxK6M+NwGDxYyjlu pqXUlFKCK4t9zaM0UjyPpREbjGgJCxua546UEeNqb3Vf4kFxvWx01CKxl4xiNoVgz+ Rqb/hc++h0Js8vZf7ALslEPCwgu/8bhs+2TPyEW9iEUaPOLSAgsLFZ8moXAWDaV3bM 0LjkGEImhcXX3cm80InKLTdYGno7JuDRTjsxCVFZywMthnBBlpF6nyc3K8ukAegW// yvrVtyzEIFK6JclLceuSZ+32U2R2VKEvlVHGqBLPK5PwCYZXklG7NbNlD7Blni2kW8 RWCr2DVdhP1pA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 01/14] Squash to "selftests/bpf: Add bpf scheduler test" - fix Date: Thu, 28 Mar 2024 16:04:48 +0800 Message-Id: <0e49cdf987fe33ca8e6f1531da34874c3a750851.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang BPF tests fail sometimes with "bytes !=3D total_bytes" errors: # test_default:PASS:sched_init:default 0 nsec # send_data:PASS:pthread_create 0 nsec # send_data:FAIL:recv 936000 !=3D 10485760 nr_recv:-1 errno:11 # default: 3041 ms # server:FAIL:send 7579500 !=3D 10485760 nr_sent:-1 errno:11 # send_data:FAIL:pthread_join thread_ret:-11 \ test_default:PASS:has_bytes_sent addr_1 0 nsec # test_default:PASS:has_bytes_sent addr_2 0 nsec # close_netns:PASS:setns 0 nsec Here errno 11 is EAGAIN, sending should continue in this case, not break. This patch makes BPF tests stable. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 6e28215d7404..7fec91ab19cf 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -353,7 +353,7 @@ static void *server(void *arg) while (bytes < total_bytes && !READ_ONCE(stop)) { nr_sent =3D send(fd, &batch, MIN(total_bytes - bytes, sizeof(batch)), 0); - if (nr_sent =3D=3D -1 && errno =3D=3D EINTR) + if (nr_sent =3D=3D -1 && (errno =3D=3D EINTR || errno =3D=3D EAGAIN)) continue; if (nr_sent =3D=3D -1) { err =3D -errno; @@ -397,7 +397,7 @@ static void send_data(int lfd, int fd, char *msg) while (bytes < total_bytes && !READ_ONCE(stop)) { nr_recv =3D recv(fd, &batch, MIN(total_bytes - bytes, sizeof(batch)), 0); - if (nr_recv =3D=3D -1 && errno =3D=3D EINTR) + if (nr_recv =3D=3D -1 && (errno =3D=3D EINTR || errno =3D=3D EAGAIN)) continue; if (nr_recv =3D=3D -1) break; --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0855755769 for ; Thu, 28 Mar 2024 08:05:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613120; cv=none; b=HPF5tji29+zxAO9DvyQQrpJbTHNf6718U/Vo/Wa69wPBRu7sj/Xq6zBFpuJ+st3PGs2grNqUSlREo15lqnE0aYQb1q73PodtB5WZfH7ggS8pFv1EcXhudPe657MW7W6OBYJQA9odsgoS8lQ3djEy28Fe4UR+XmeAkZJ3nvy2bk8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613120; c=relaxed/simple; bh=Ldx8b7uioUsnpz0/+V32TDj4PFd4BVShxlyRkW85jW8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=n+62nUTvL6JLTGrpp6tYNvD04a4FWuo8U2yifTyEZmxx0W0UDAni1UyF+unaurjPi+jhiquAUGYtFpSQZGRXMdjA1DPf7LtCSCCVfdh39uSGecXpQScJ8lvJ+oIJ/H/EqAVuEIAYFtTl65C6dXzXVGkPku34VQUJg/5BrR71bqk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EtYS5kyo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EtYS5kyo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D24FCC433C7; Thu, 28 Mar 2024 08:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613119; bh=Ldx8b7uioUsnpz0/+V32TDj4PFd4BVShxlyRkW85jW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EtYS5kyo0B3vhRgSiJYXC631MT4U1vhDYxNin/CMJWoM19EHLhakfRrQBFkJXgCzd 7hZBbuvsws6ST8mwrhLMuoRS0mW2IUB3duYnzGHl9nVpOtRKDJPzb30KSZfAuJQY7K gV3G2vKQub1kRR+qeVv9wwqYKRJeAjrXUTNU1rXSH1NEKvYBEwggwJQaVzG3iE8tQx N3fA8kOiPruaHYamKwk4zrW7RB2+9Ap/LDKlIEK35p0z/xdz3pyP9R9byIHpa8Mi03 fYG5z8bXwIYLU9aqC2cGfTiyzoEa2kQH0WqaOiPxDb9zOFTVbdZOpiQ4dGkIjdinZr Tx2NC8wqTS1wg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 02/14] selftests/bpf: Refactor mptcp_sock test Date: Thu, 28 Mar 2024 16:04:49 +0800 Message-Id: <52ce31b9d8db385f6629a18532132ae8a2535ead.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch refactors mptcp_sock test, renames "base" to "mptcp_sock", extracts a new helper run_mptcp_sock() to start servers and run tests, moves all test skeleton operations, __open_and_load, __attach and __destroy from run_test() into test_mptcp_sock(). This prepares for the later unification of all MPTCP tests using a macro. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 63 +++++++++++-------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 7fec91ab19cf..4f0bcaf39886 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -159,18 +159,10 @@ static int verify_msk(int map_fd, int client_fd, __u3= 2 token) return err; } =20 -static int run_test(int cgroup_fd, int server_fd, bool is_mptcp) +static int run_test(int cgroup_fd, int server_fd, + struct mptcp_sock *sock_skel, bool is_mptcp) { int client_fd, prog_fd, map_fd, err; - struct mptcp_sock *sock_skel; - - sock_skel =3D mptcp_sock__open_and_load(); - if (!ASSERT_OK_PTR(sock_skel, "skel_open_load")) - return libbpf_get_error(sock_skel); - - err =3D mptcp_sock__attach(sock_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; =20 prog_fd =3D bpf_program__fd(sock_skel->progs._sockops); map_fd =3D bpf_map__fd(sock_skel->maps.socket_storage_map); @@ -190,29 +182,19 @@ static int run_test(int cgroup_fd, int server_fd, boo= l is_mptcp) close(client_fd); =20 out: - mptcp_sock__destroy(sock_skel); return err; } =20 -static void test_base(void) +static void run_mptcp_sock(int cgroup_fd, struct mptcp_sock *skel) { - struct nstoken *nstoken =3D NULL; - int server_fd, cgroup_fd; - - cgroup_fd =3D test__join_cgroup("/mptcp"); - if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) - return; - - nstoken =3D create_netns(); - if (!ASSERT_OK_PTR(nstoken, "create_netns")) - goto fail; + int server_fd; =20 /* without MPTCP */ server_fd =3D start_server(AF_INET, SOCK_STREAM, NULL, 0, 0); if (!ASSERT_GE(server_fd, 0, "start_server")) goto with_mptcp; =20 - ASSERT_OK(run_test(cgroup_fd, server_fd, false), "run_test tcp"); + ASSERT_OK(run_test(cgroup_fd, server_fd, skel, false), "run_test tcp"); =20 close(server_fd); =20 @@ -220,14 +202,41 @@ static void test_base(void) /* with MPTCP */ server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); if (!ASSERT_GE(server_fd, 0, "start_mptcp_server")) - goto fail; + return; =20 - ASSERT_OK(run_test(cgroup_fd, server_fd, true), "run_test mptcp"); + ASSERT_OK(run_test(cgroup_fd, server_fd, skel, true), "run_test mptcp"); =20 close(server_fd); +} + +static void test_mptcp_sock(void) +{ + struct nstoken *nstoken =3D NULL; + struct mptcp_sock *sock_skel; + int cgroup_fd, err; + + cgroup_fd =3D test__join_cgroup("/mptcp"); + if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) + return; + + sock_skel =3D mptcp_sock__open_and_load(); + if (!ASSERT_OK_PTR(sock_skel, "skel_open_load")) + goto out; + + err =3D mptcp_sock__attach(sock_skel); + if (!ASSERT_OK(err, "skel_attach")) + goto out; + + nstoken =3D create_netns(); + if (!ASSERT_OK_PTR(nstoken, "create_netns")) + goto fail; + + run_mptcp_sock(cgroup_fd, sock_skel); =20 fail: cleanup_netns(nstoken); + mptcp_sock__destroy(sock_skel); +out: close(cgroup_fd); } =20 @@ -653,8 +662,8 @@ static void test_burst(void) =20 void test_mptcp(void) { - if (test__start_subtest("base")) - test_base(); + if (test__start_subtest("mptcp_sock")) + test_mptcp_sock(); if (test__start_subtest("mptcpify")) test_mptcpify(); if (test__start_subtest("default")) --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A98B548FC for ; Thu, 28 Mar 2024 08:05:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613121; cv=none; b=ZhtbhsPRrOUn80mOEsdxJ3ZYwzcpFkswHV7hIclQFm9x8wxx4wTixPrMXE7Y/wn82D9SzdPeI0wdZqDzZASiYrznTjAAcg66kXqx5ceq61s3qp7ud0vepBYKTQF4i4/6d2615xdTKR77CmwqD/txVbsLIPYv+yhtVMmYnNUtZOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613121; c=relaxed/simple; bh=D2/dUDwilVlONZOzEIq3iHFXfvbYTJY6JtkMNKB6g/s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PTO38uAOeyOmutXIX3kswO66pdx0pfwd6q0SCDPWkvh/ZcRxNamzDMWY4zpDIK/niCHocvKcAroBlJ+3/7zViZdKH1brV0MpAVdJxRbCCaaXeIOrHfQK55hyREdEv8X/b3jNHaMOEcpzENBsNSJjU4JJ8NiXfCpPSCcm/EAdtJU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gT2/4rgj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gT2/4rgj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E29CC433F1; Thu, 28 Mar 2024 08:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613121; bh=D2/dUDwilVlONZOzEIq3iHFXfvbYTJY6JtkMNKB6g/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gT2/4rgjDLZXzuQobyLTXmwTPOcHkSoK+Nzg8Uz5me3zIBD1LtKei0gPQFgCucbnu ikS0d9zK07BQj0lDl88ZK5C9uDlKBvVp2E2s7UXVGvLqyc2kCaK0FsnFmJUI1Q0lwF eEiVIfv+s5xicZAJyQw2kpxPTqU8f70jLECfNnf2eyFlQpZ6DLXpG3MyMCAR5g8ePJ pacyrHIBozbHiLM1vzjzOJfoRa6PKG00E80hj5U+8ph2XldffVbmrtcKvByXsUFZ6Z +r4t7++siwh9oijbrSgEuZUNgvVAhKEufEpH6qXpAQkAuJPOXCLrOZrfiiTauRB0Fg 4bhwVrFzY2mfg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 03/14] selftests/bpf: Refactor mptcpify test Date: Thu, 28 Mar 2024 16:04:50 +0800 Message-Id: <6a192440f81845f7f8a42914a260e8df0c6b45b7.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch refactors mptcpify test, moves all test skeleton operations, __open_and_load, __attach and __destroy from run_mptcpify() into test_mptcpify(). This prepares for the later unification of all MPTCP tests using a macro. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 4f0bcaf39886..cc91acfa3e52 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -279,61 +279,58 @@ static int verify_mptcpify(int server_fd, int client_= fd) return err; } =20 -static int run_mptcpify(int cgroup_fd) +static void run_mptcpify(int cgroup_fd, struct mptcpify *skel) { int server_fd, client_fd, err =3D 0; - struct mptcpify *mptcpify_skel; - - mptcpify_skel =3D mptcpify__open_and_load(); - if (!ASSERT_OK_PTR(mptcpify_skel, "skel_open_load")) - return libbpf_get_error(mptcpify_skel); - - err =3D mptcpify__attach(mptcpify_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; =20 /* without MPTCP */ server_fd =3D start_server(AF_INET, SOCK_STREAM, NULL, 0, 0); - if (!ASSERT_GE(server_fd, 0, "start_server")) { - err =3D -EIO; - goto out; - } + if (!ASSERT_GE(server_fd, 0, "start_server")) + return; =20 client_fd =3D connect_to_fd(server_fd, 0); - if (!ASSERT_GE(client_fd, 0, "connect to fd")) { - err =3D -EIO; + if (!ASSERT_GE(client_fd, 0, "connect to fd")) goto close_server; - } =20 send_byte(client_fd); =20 err =3D verify_mptcpify(server_fd, client_fd); + ASSERT_OK(err, "verify_mptcpify"); =20 close(client_fd); close_server: close(server_fd); -out: - mptcpify__destroy(mptcpify_skel); - return err; } =20 static void test_mptcpify(void) { struct nstoken *nstoken =3D NULL; + struct mptcpify *mptcpify_skel; int cgroup_fd; + int err; =20 cgroup_fd =3D test__join_cgroup("/mptcpify"); if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) return; =20 + mptcpify_skel =3D mptcpify__open_and_load(); + if (!ASSERT_OK_PTR(mptcpify_skel, "skel_open_load")) + goto out; + + err =3D mptcpify__attach(mptcpify_skel); + if (!ASSERT_OK(err, "skel_attach")) + goto out; + nstoken =3D create_netns(); if (!ASSERT_OK_PTR(nstoken, "create_netns")) goto fail; =20 - ASSERT_OK(run_mptcpify(cgroup_fd), "run_mptcpify"); + run_mptcpify(cgroup_fd, mptcpify_skel); =20 fail: cleanup_netns(nstoken); + mptcpify__destroy(mptcpify_skel); +out: close(cgroup_fd); } =20 --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6F2452F86 for ; Thu, 28 Mar 2024 08:05:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613122; cv=none; b=YrQ+3OYkFu4eRzsYbSNmmOpzlTKGtTFh6EkNqe5rImTiP0eYgkwhxv/VOdMmby7+q5Ev315l5bJEqKc5Gx/WSDKq3Jzwj0rJJtjiH359FxArlaxBFh3pRvSjUrlM6u2LE9bwpHbMqd/AFcqTWdRPEjQsqZ/qGAEUOCIm/tEeej4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613122; c=relaxed/simple; bh=mMydanxeS5cvc1mWabkhJdwudCcA5dQTfN9DAPHrNRE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=d4xw9xwfbT4mJimbVLZ1gN4rS2zg/hab1lXG++ExYzA1Fzd216DmH3eVulL8cvqgAI4sZ/xYqpyTqiFA1Oc7/LEgI293Sml8tn0vNVEBvzlHUEB4eyDnjBCRgI4vzJZEJcwMqz9uAaJ/yzVY0nit61/6Twq0IxDvWf0ElePZbuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OJGGbEJN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OJGGbEJN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E095C433C7; Thu, 28 Mar 2024 08:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613122; bh=mMydanxeS5cvc1mWabkhJdwudCcA5dQTfN9DAPHrNRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OJGGbEJNj8k3RtQKsP/XqWhu0B17eZyAtaxdutFOx/sUq2zQhqBMS7Sl/d3Bae+/Z IbVxZUj3qP4Oko+IxHvfOnWzcxYYnF+ZinSNWXVrr5eXadW+5MRQdRiO60omH2B48Y 23L6ueV4Z9OxaasFKcqkLxzsXn8h1FU2lCzfPUn9ESUzxZanCXESKt8m1aSImCUvjB 2Tw4T3JdxaR8QJtu++Or4msHHzZXxpYc04Upi6IVqL1MSzJ+q2hUxe2ajPXCisumRz IUABw86vKt9CW5/xcfj4ue3gvPFn2j6s1AiHZk1J7xvbbPQ7VG5+yCyykTNSeRRO4R VyVrVm2RZvcoA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 04/14] selftests/bpf: Add MPTCP_BASE_TEST macro Date: Thu, 28 Mar 2024 16:04:51 +0800 Message-Id: <0826f58a9667fa2a317345eaf7f60fd8fc8fa733.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch adds a macro MPTCP_BASE_TEST to unify all MPTCP tests. test_mptcp_sock() can be replaced by MPTCP_BASE_TEST(mptcp_sock), and test_mptcpify() can be replaced by MPTCP_BASE_TEST(mptcpify). Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 93 +++++++------------ 1 file changed, 33 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index cc91acfa3e52..ac3886983ce1 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -209,37 +209,40 @@ static void run_mptcp_sock(int cgroup_fd, struct mptc= p_sock *skel) close(server_fd); } =20 -static void test_mptcp_sock(void) -{ - struct nstoken *nstoken =3D NULL; - struct mptcp_sock *sock_skel; - int cgroup_fd, err; - - cgroup_fd =3D test__join_cgroup("/mptcp"); - if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) - return; - - sock_skel =3D mptcp_sock__open_and_load(); - if (!ASSERT_OK_PTR(sock_skel, "skel_open_load")) - goto out; - - err =3D mptcp_sock__attach(sock_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; - - nstoken =3D create_netns(); - if (!ASSERT_OK_PTR(nstoken, "create_netns")) - goto fail; - - run_mptcp_sock(cgroup_fd, sock_skel); - -fail: - cleanup_netns(nstoken); - mptcp_sock__destroy(sock_skel); -out: - close(cgroup_fd); +#define MPTCP_BASE_TEST(name) \ +static void test_##name(void) \ +{ \ + struct nstoken *nstoken; \ + struct name *skel; \ + int cgroup_fd, err; \ + \ + cgroup_fd =3D test__join_cgroup("/" #name); \ + if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) \ + return; \ + \ + skel =3D name##__open_and_load(); \ + if (!ASSERT_OK_PTR(skel, "skel_open_load")) \ + goto out; \ + \ + err =3D name##__attach(skel); \ + if (!ASSERT_OK(err, "skel_attach")) \ + goto out; \ + \ + nstoken =3D create_netns(); \ + if (!ASSERT_OK_PTR(nstoken, "create_netns")) \ + goto fail; \ + \ + run_##name(cgroup_fd, skel); \ + \ +fail: \ + cleanup_netns(nstoken); \ + name##__destroy(skel); \ +out: \ + close(cgroup_fd); \ } =20 +MPTCP_BASE_TEST(mptcp_sock); + static void send_byte(int fd) { char b =3D 0x55; @@ -302,37 +305,7 @@ static void run_mptcpify(int cgroup_fd, struct mptcpif= y *skel) close(server_fd); } =20 -static void test_mptcpify(void) -{ - struct nstoken *nstoken =3D NULL; - struct mptcpify *mptcpify_skel; - int cgroup_fd; - int err; - - cgroup_fd =3D test__join_cgroup("/mptcpify"); - if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) - return; - - mptcpify_skel =3D mptcpify__open_and_load(); - if (!ASSERT_OK_PTR(mptcpify_skel, "skel_open_load")) - goto out; - - err =3D mptcpify__attach(mptcpify_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; - - nstoken =3D create_netns(); - if (!ASSERT_OK_PTR(nstoken, "create_netns")) - goto fail; - - run_mptcpify(cgroup_fd, mptcpify_skel); - -fail: - cleanup_netns(nstoken); - mptcpify__destroy(mptcpify_skel); -out: - close(cgroup_fd); -} +MPTCP_BASE_TEST(mptcpify); =20 static const unsigned int total_bytes =3D 10 * 1024 * 1024; static int stop, duration; --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDE2752F86 for ; Thu, 28 Mar 2024 08:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613123; cv=none; b=NE6mXws9j6KiDnXbRYX4ICduF0BrJ+YhpfGhG/dpKqIyXWTVAuWYBYjyGWxYdDDnLzjKJWs8H0lt7spLEd5+t2yFwNJhx8xo7uMTztAyOFO94DLBb9GzbwjdXPMhrkvazpNzB414+Yvp7z4wtKflTyAbKEoS2mE1MUOvrxjJRoY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613123; c=relaxed/simple; bh=lO5T7jQBf77tRMLk10kImWMMAYko8dY+8VN+xCxnawQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N7T0G5Nfx/3rU43Wk7yBtgKhL/ImGpSlbS4u/KwIwEpky8FE8A656GOon5VhiwT+ItyQ/anniTw1WxtjMF/ENn/2dR/brl1Zy81W9Z7DUOBxahE8BQMD9lerRNG+RoDY5q+ikNrEy/ffOTJ0KYfz1OtfYkRUwMVWgW1JPEqZuqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OF49mF+f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OF49mF+f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCDD7C433F1; Thu, 28 Mar 2024 08:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613123; bh=lO5T7jQBf77tRMLk10kImWMMAYko8dY+8VN+xCxnawQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OF49mF+fIWBfxngpz7609IYmoAhQ8VHFoW9lSVxsEIgl1x2MvJXbaDpfY9hAzOVCH wu2wpxAhyOMVYJHLr2IgnGfidspmCCMGhGr39QsBAlPJ3RddMfrVjBJ3Wr85y4qvFm +6vmTbKbGneDyGIJd32zolVxIHyPTw4tkeu7o7mwWIXgUrkBlQPxpyH32J/sAJPrp+ JQKYdjWCfvKTMZdjC3BwZnQiZZQY0j37gx1Z+wQi0fK2r1sYSFaHm/dj8AlyLL5DOb bpBdIk+29N9+BA3ZfopEZM2CNLA8zpWYFgx/EkViPKHnCmMZhKhwpKXEHx2DsYp5+j VhTsmo1PlbkKw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 05/14] selftests/bpf: Add RUN_MPTCP_TEST macro Date: Thu, 28 Mar 2024 16:04:52 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang 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. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index ac3886983ce1..b8ec11552e2c 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -630,12 +630,16 @@ static void test_burst(void) mptcp_bpf_burst__destroy(burst_skel); } =20 +#define RUN_MPTCP_TEST(suffix) \ +do { \ + if (test__start_subtest(#suffix)) \ + test_##suffix(); \ +} while (0) + void test_mptcp(void) { - if (test__start_subtest("mptcp_sock")) - test_mptcp_sock(); - if (test__start_subtest("mptcpify")) - test_mptcpify(); + RUN_MPTCP_TEST(mptcp_sock); + RUN_MPTCP_TEST(mptcpify); if (test__start_subtest("default")) test_default(); if (test__start_subtest("first")) --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68F7E52F86 for ; Thu, 28 Mar 2024 08:05:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613125; cv=none; b=hz9D7uu54vRm6rnVkzrV6I6SMnp84hLVPfXVg0tlbCPmAb8JFZRvtdNxOyWBMoRBQ0qFHKdZuafY3fXkoLkWzaB+Pidoi1ugJl90/HIKcyB/nRHpKOi5lQPnkqZso5461nQ43cLh/4HiCO3MdsoTslmSmdEmwIa3Q3i3UxnwD0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613125; c=relaxed/simple; bh=S0+kctrHQgktXLmfRi63oj2s6hctBrghW6AsPgATIqs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BpNMrs2/ma3K5MWr3lUF3sJ+38phy5C6gBEZQRx/xBYAYwgGur1WJomISeCXuW0MVAHy+z1vZ24kebT8qzQF2DF2ZLobvBcTGPvFQ96iL0WMfwEoVVypdLYnztbIz+kTfzhZhTqGmlq4mEe4G7M1C36ojtnYwvFgGrDl44vqK4Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Jjul46tf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Jjul46tf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27EBBC433C7; Thu, 28 Mar 2024 08:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613125; bh=S0+kctrHQgktXLmfRi63oj2s6hctBrghW6AsPgATIqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jjul46tf/9Gg3qldFBOuD5bxFWuWrUUYVxFBqeyGK2bTE4y2/Qbnko3REYQlZyfNY oEaQPvoACau+FIChonR7OUW2NQ6YgOCgGwhVx6+KWYW9HtJxLvmygpMIJBltyKiC0D qZvl8dQ+i11o8Q6Msztm4KnU9kY+Re8JzhlCmoIqE68vDwrci1lmuy5WHLd8SZjwX/ dzcznksbaHvyFixg4faihlqhUpDeSVkVJC4GanIsMH8LHuFK0lLXr6QDrdl1qIe1hD YFkMzq02HMEMdqwKKLQDi1w7WMdz+XQ9mIkeJb0UWmJSE4/cMg+jjbazVDKf6+1dED nN2MraBGW8vbQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 06/14] selftests/bpf: Add mptcp subflow example Date: Thu, 28 Mar 2024 16:04:53 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Move Nicolas's patch into bpf selftests directory. This example added a test that was adding a different mark (SO_MARK) on each subflow, and changing the TCP CC only on the first subflow. This example shows how it is possible to: Identify the parent msk of an MPTCP subflow. Put different sockopt for each subflow of a same MPTCP connection. Here especially, we implemented two different behaviours: A socket mark (SOL_SOCKET SO_MARK) is put on each subflow of a same MPTCP connection. The order of creation of the current subflow defines its mark. The TCP CC algorithm of the very first subflow of an MPTCP connection is set to "reno". Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/76 Signed-off-by: Geliang Tang --- .../selftests/bpf/progs/mptcp_subflow.c | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_subflow.c diff --git a/tools/testing/selftests/bpf/progs/mptcp_subflow.c b/tools/test= ing/selftests/bpf/progs/mptcp_subflow.c new file mode 100644 index 000000000000..9553099ffd5f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_subflow.c @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2020, Tessares SA. */ +/* Copyright (c) 2024, Kylin Software */ +/* Author: Nicolas Rybowski */ + +#include // SOL_SOCKET, SO_MARK, ... +#include // TCP_CONGESTION +#include +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +#ifndef SOL_TCP +#define SOL_TCP 6 +#endif + +#ifndef TCP_CA_NAME_MAX +#define TCP_CA_NAME_MAX 16 +#endif + +char cc[TCP_CA_NAME_MAX] =3D "reno"; + +/* Associate a subflow counter to each token */ +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(__u32)); + __uint(max_entries, 100); +} mptcp_sf SEC(".maps"); + +SEC("sockops") +int mptcp_subflow(struct bpf_sock_ops *skops) +{ + __u32 init =3D 1, key, mark, *cnt; + struct mptcp_sock *msk; + struct bpf_sock *sk; + int err; + + if (skops->op !=3D BPF_SOCK_OPS_TCP_CONNECT_CB) + return 1; + + sk =3D skops->sk; + if (!sk) + return 1; + + msk =3D bpf_skc_to_mptcp_sock(sk); + if (!msk) + return 1; + + key =3D msk->token; + cnt =3D bpf_map_lookup_elem(&mptcp_sf, &key); + if (cnt) { + /* A new subflow is added to an existing MPTCP connection */ + __sync_fetch_and_add(cnt, 1); + mark =3D *cnt; + } else { + /* A new MPTCP connection is just initiated and this is its primary + * subflow + */ + bpf_map_update_elem(&mptcp_sf, &key, &init, BPF_ANY); + mark =3D init; + } + + /* Set the mark of the subflow's socket to its apparition order */ + err =3D bpf_setsockopt(skops, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)); + if (err < 0) + return 1; + if (mark =3D=3D 1) + err =3D bpf_setsockopt(skops, SOL_TCP, TCP_CONGESTION, cc, TCP_CA_NAME_M= AX); + + return 1; +} --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1C1554BC4 for ; Thu, 28 Mar 2024 08:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613126; cv=none; b=gviZS0VobRl4Yut8T5fvdR00/0c4gCGx9IhDthYtquYDjQMFRCI8qA4+T7h7b5i1/iH678/IVc5CX1J1guUAKzutERSI0P1O7gF6ooT4VK6kVc7yeY73JfmGoA3ZILs87wWSYH/yb+/+ZOBS/dg4MTT4vr7F4uym7IK4jR4UkyQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613126; c=relaxed/simple; bh=IrYIryteqhObj4kwCXdNWFssvAgd3yhcb+/DLz9cGyI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GKG8UpIBHo+/N9tS7KBi7Z07SpM6r6ByubusxTdAn9XeQFE+q/+zsp/66FVdjMhnJOoPUoOmkJmrfZGDsdVGNELkEQmoAmZrLBWeE5w5jduP94Xm6VLo2clofu5oIMKQLSrUdlG6iGTRFCyTiHlZjPh0M+1akI6MFg69OiP14I0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g7X+du/2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="g7X+du/2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77007C43390; Thu, 28 Mar 2024 08:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613126; bh=IrYIryteqhObj4kwCXdNWFssvAgd3yhcb+/DLz9cGyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g7X+du/2S5Giax0/Sj1zAf6wdhUFnzUzB/xb1Xr1wcCB28bXG1JgqpjuBoN1Hoekb oVrczFWFCW2O3QysUlvujRwIZpFVqoOgj8iQgpnvrne+z82+rHqX5+uL7+9BItAR/l H9HVPgSkAJdnwoZvvqFqZSruCxr7YzrWht7IfncEDzG8JedbBxHRbYdFxh7uX+28FM KW6M3waJOXOFbsTr1g0S2M1rxPLiNK+5lxwBefFfJMBLGhNVzUkY3GOOdcsoKnpJmw 1wFLPPrz51ZwLIMZfEcf2MOKBvehmrGltKHhfTesukudnz1X8cXThpJKGlg4liZbyV 5VVyrPPmo3Sfw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 07/14] selftests/bpf: Add mptcp subflow subtest Date: Thu, 28 Mar 2024 16:04:54 +0800 Message-Id: <6728386f2f446f15826a039d174763b8e2270ef1.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch adds a subtest named test_subflow to load and verify the newly added mptcp subflow example in test_mptcp. Add a helper endpoint_init() to add a new subflow endpoint. Add another helper ss_search() to verify the fwmark and congestion values set by mptcp_subflow prog using setsockopts. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/76 Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index b8ec11552e2c..69f989e6d930 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -10,6 +10,7 @@ #include "network_helpers.h" #include "mptcp_sock.skel.h" #include "mptcpify.skel.h" +#include "mptcp_subflow.skel.h" #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" @@ -307,6 +308,77 @@ static void run_mptcpify(int cgroup_fd, struct mptcpif= y *skel) =20 MPTCP_BASE_TEST(mptcpify); =20 +#define ADDR1 "10.0.1.1" +#define ADDR2 "10.0.1.2" +#define PORT1 10001 + +static int endpoint_init(char *flags) +{ + SYS(fail, "ip -net %s link add veth1 type veth peer name veth2", NS_TEST); + SYS(fail, "ip -net %s addr add %s/24 dev veth1", NS_TEST, ADDR1); + 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, ADDR2); + SYS(fail, "ip -net %s link set dev veth2 up", NS_TEST); + SYS(fail, "ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR2, flags); + + return 0; +fail: + return -1; +} + +static int _ss_search(char *src, char *dst, char *port, char *keyword) +{ + char cmd[128]; + + snprintf(cmd, sizeof(cmd), + "ip netns exec %s ss -Menita src %s dst %s %s %d | grep -q '%s'", + NS_TEST, src, dst, port, PORT1, keyword); + return system(cmd); +} + +static int ss_search(char *src, char *keyword) +{ + return _ss_search(src, ADDR1, "dport", keyword); +} + +static void run_mptcp_subflow(int cgroup_fd, struct mptcp_subflow *skel) +{ + int server_fd, client_fd, prog_fd, err; + + if (!ASSERT_OK(endpoint_init("subflow"), "endpoint_init")) + return; + + err =3D mptcp_subflow__attach(skel); + if (!ASSERT_OK(err, "skel_attach")) + return; + + prog_fd =3D bpf_program__fd(skel->progs.mptcp_subflow); + err =3D bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_SOCK_OPS, 0); + if (!ASSERT_OK(err, "prog_attach")) + return; + + server_fd =3D start_mptcp_server(AF_INET, ADDR1, PORT1, 0); + if (!ASSERT_GE(server_fd, 0, "start_mptcp_server")) + return; + + client_fd =3D connect_to_fd(server_fd, 0); + if (!ASSERT_GE(client_fd, 0, "connect to fd")) + goto close_server; + + send_byte(client_fd); + + ASSERT_OK(ss_search(ADDR1, "fwmark:0x1"), "ss_search fwmark:0x1"); + ASSERT_OK(ss_search(ADDR2, "fwmark:0x2"), "ss_search fwmark:0x2"); + ASSERT_OK(ss_search(ADDR1, "reno"), "ss_search reno"); + ASSERT_OK(ss_search(ADDR2, "cubic"), "ss_search cubic"); + + close(client_fd); +close_server: + close(server_fd); +} + +MPTCP_BASE_TEST(mptcp_subflow); + static const unsigned int total_bytes =3D 10 * 1024 * 1024; static int stop, duration; =20 @@ -640,6 +712,7 @@ void test_mptcp(void) { RUN_MPTCP_TEST(mptcp_sock); RUN_MPTCP_TEST(mptcpify); + RUN_MPTCP_TEST(mptcp_subflow); if (test__start_subtest("default")) test_default(); if (test__start_subtest("first")) --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E78B54BC4 for ; Thu, 28 Mar 2024 08:05:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613128; cv=none; b=U3JYv4sV7oEOPoOAURi8o5d3Jurl6JRzA5dIgePI/Eu9t70KLwhePXvABHyS/UUBzK+J0R/t3Ns1mFadzRi+DLfZWgfUk34fciiUX1yCL0vaBHlSW+Y+P3sQGYLuIPGPo/fEwXXer6qRz2ZqwMsVP0wkzqXVsWnzkEASD5nXNP4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613128; c=relaxed/simple; bh=e8njyXUUWS/L8WHy0VCHW1+ftqfMAsx5RVQqE94R6JM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TgqEEf1jL5zbI+10MebQEvj20U+F0zYwqPDHXnXmMoytKE6t9t/twFgsjQ6UBFyjA2KY0UK5/o2i1nvCzD0ReiIuORyjox2F+aypdpl3pOLMKO7NwF/pYii2MzQgZU2sT/LKY5iyff4xUVoi5UT+sJRTP7LPCLO18680KX6kO/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TuYWfOu1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TuYWfOu1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6F7FC433C7; Thu, 28 Mar 2024 08:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613127; bh=e8njyXUUWS/L8WHy0VCHW1+ftqfMAsx5RVQqE94R6JM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TuYWfOu1uioYOKhtqlYtzjULsXw0JLzr39/+/8xx8FqbjBIAOMNRDPkB8WDdTy7PP 1Rk7tLNa/MxGDWujk/VpbJsPerkOwjXszceuDaOz/JuDpGyHze6C8S2gZv0vaLk1C4 UOem0kGTm4qwGU9F5gYHR1oWGESMzLlf1/0naTrKnt4jZBoXpK9toBOUfrNHKB1S3b VwSmOdBxykFMAw6OIRZLsNi5a8YtGxWFrGzMXz4I0zsRyX7NbRJQpJLzziVbjQvP9C uIG3nPmdEqibnt9EvqVsYQhG7ek6uUEfKV5N2e/JCJYH9Aaw7ajtm4HqQ6fRWrFeO2 iK6oj22xC1VjA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 08/14] Squash to "selftests/bpf: Add bpf scheduler test" - cleanups Date: Thu, 28 Mar 2024 16:04:55 +0800 Message-Id: <532bd8367396a76c3b2c280240dfa50b7b677263.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Some cleanups. Use ASSERT_EQ and ASSERT_OK like below commit: selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bpf_tcp_ca Use newly added endpoint_init and _ss_search helpers. Add send_data_and_verify helper. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 75 +++++++++++-------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 69f989e6d930..7f2e7a419330 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -5,7 +5,6 @@ #include #include #include -#include #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_sock.skel.h" @@ -380,7 +379,7 @@ static void run_mptcp_subflow(int cgroup_fd, struct mpt= cp_subflow *skel) MPTCP_BASE_TEST(mptcp_subflow); =20 static const unsigned int total_bytes =3D 10 * 1024 * 1024; -static int stop, duration; +static int stop; =20 static void *server(void *arg) { @@ -413,8 +412,7 @@ static void *server(void *arg) bytes +=3D nr_sent; } =20 - CHECK(bytes !=3D total_bytes, "send", "%zd !=3D %u nr_sent:%zd errno:%d\n= ", - bytes, total_bytes, nr_sent, errno); + ASSERT_EQ(bytes, total_bytes, "send"); =20 done: if (fd >=3D 0) @@ -437,11 +435,12 @@ static void send_data(int lfd, int fd, char *msg) int err; =20 WRITE_ONCE(stop, 0); + if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) return; =20 err =3D pthread_create(&srv_thread, NULL, server, (void *)(long)lfd); - if (CHECK(err !=3D 0, "pthread_create", "err:%d errno:%d\n", err, errno)) + if (!ASSERT_OK(err, "pthread_create")) return; =20 /* recv total_bytes */ @@ -459,17 +458,13 @@ static void send_data(int lfd, int fd, char *msg) return; =20 delta_ms =3D (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec - start.tv= _nsec) / 1000000; - - CHECK(bytes !=3D total_bytes, "recv", "%zd !=3D %u nr_recv:%zd errno:%d\n= ", - bytes, total_bytes, nr_recv, errno); - printf("%s: %u ms\n", msg, delta_ms); =20 - WRITE_ONCE(stop, 1); + ASSERT_EQ(bytes, total_bytes, "recv"); =20 + WRITE_ONCE(stop, 1); pthread_join(srv_thread, &thread_ret); - CHECK(IS_ERR(thread_ret), "pthread_join", "thread_ret:%ld", - PTR_ERR(thread_ret)); + ASSERT_OK(IS_ERR(thread_ret), "thread_ret"); } =20 #define ADDR_1 "10.0.1.1" @@ -482,47 +477,62 @@ static struct nstoken *sched_init(char *flags, char *= sched) =20 nstoken =3D create_netns(); if (!ASSERT_OK_PTR(nstoken, "create_netns")) + return NULL; + + if (!ASSERT_OK(endpoint_init("subflow"), "endpoint_init")) goto fail; =20 - SYS(fail, "ip -net %s link add veth1 type veth peer name veth2", NS_TEST); - SYS(fail, "ip -net %s addr add %s/24 dev veth1", NS_TEST, ADDR_1); - 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); SYS(fail, "ip netns exec %s sysctl -qw net.mptcp.scheduler=3D%s", NS_TEST= , sched); =20 return nstoken; fail: + cleanup_netns(nstoken); return NULL; } =20 -static int has_bytes_sent(char *addr) +static int has_bytes_sent(char *dst) { - char cmd[128]; + return _ss_search(ADDR1, dst, "sport", "bytes_sent:"); +} =20 - snprintf(cmd, sizeof(cmd), "ip netns exec %s ss -it src %s sport %d dst %= s | %s", - NS_TEST, ADDR_1, PORT_1, addr, "grep -q bytes_sent:"); - return system(cmd); +static void send_data_and_verify(char *msg, int addr1, int addr2) +{ + int server_fd, client_fd; + + server_fd =3D start_mptcp_server(AF_INET, ADDR1, PORT1, 0); + if (!ASSERT_NEQ(server_fd, -1, "start_mptcp_server")) + return; + + client_fd =3D connect_to_fd(server_fd, 0); + if (!ASSERT_NEQ(client_fd, -1, "connect_to_fd")) { + close(server_fd); + return; + } + + send_data(server_fd, client_fd, msg); + if (addr1) + ASSERT_OK(has_bytes_sent(ADDR1), "Should have bytes_sent on addr1"); + else + ASSERT_GT(has_bytes_sent(ADDR1), 0, "Shouldn't have bytes_sent on addr1"= ); + if (addr2) + ASSERT_OK(has_bytes_sent(ADDR2), "Should have bytes_sent on addr2"); + else + ASSERT_GT(has_bytes_sent(ADDR2), 0, "Shouldn't have bytes_sent on addr2"= ); + + close(client_fd); + close(server_fd); } =20 static void test_default(void) { - int server_fd, client_fd; struct nstoken *nstoken; =20 nstoken =3D sched_init("subflow", "default"); if (!ASSERT_OK_PTR(nstoken, "sched_init:default")) goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - client_fd =3D connect_to_fd(server_fd, 0); =20 - 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_and_verify("default", 1, 1); =20 - close(client_fd); - close(server_fd); fail: cleanup_netns(nstoken); } @@ -713,8 +723,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(mptcp_sock); RUN_MPTCP_TEST(mptcpify); RUN_MPTCP_TEST(mptcp_subflow); - if (test__start_subtest("default")) - test_default(); + RUN_MPTCP_TEST(default); if (test__start_subtest("first")) test_first(); if (test__start_subtest("bkup")) --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12C7454BC4 for ; Thu, 28 Mar 2024 08:05:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613129; cv=none; b=EwOXE1PkudGR8Swj4jOaggigzPl3B14uazT1gaewrEgHcY/7IL3NBcVZQ2m2ntOylsGNkN9znRRIJ+qFU2Mr2EYOeDzFlv/+jTpF+sxRIGJ+UsEVd/stVlOAh5ZNA6X79cUrrnvlWKy5Q/7wzRx+DaH84IySns/HDSVIflN0ucY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613129; c=relaxed/simple; bh=4leD43EY9gHl08Xu1r9sga7RVY/uKyOAyqGFS9/tWl8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=o5eERdBZVzIlew+M+O0G9zoS4tnnGIQjgbJCXjYkFQIH5qn2r7Z+C4jQCSdtYs59T4hC6wDhXImykNSmM7cRKkkrAx77Q4AmguGpA3C7iLn2NjklDKsaIntfkTYcO8bud0iSMTbCEneXpB1J3DZK3ZzW6vZ4uxa6vG4oAp65CVs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=it8ei5MX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="it8ei5MX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22484C433F1; Thu, 28 Mar 2024 08:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613128; bh=4leD43EY9gHl08Xu1r9sga7RVY/uKyOAyqGFS9/tWl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=it8ei5MXQnzhlQDsPe5kgUw6Lz5EZI/kN5RY4sPZOg6dNOMTAvowxzzhWmlTw4sMN yEsYXQRvfMtKHBhFXO6HogxHIbMy7v/MM1eoMAaDLckLLWq06hWkMIA2gDrhNQJmVt owMCgN/Qy8b9Nd699rW0mhRoQx3AthJptoqOEowKCaJX1d5PuwTXhhn1kPscrx3Vg1 QmZ4iajtPoWBLOTmC6WY8+xoPu9B1O3t4/mikVJ+WRNA/9QvcHMVEw20TSNNFTeONc e9fsQwuPCNXMgkiBap9rWbTvMaMaoKU1lj9e2H2+M9d/Z9A/RCPubSv9t/novfEg8E +bRN9fvwassIA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 09/14] Squash to "selftests/bpf: Add bpf_first test" Date: Thu, 28 Mar 2024 16:04:56 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add MPTCP_SCHED_TEST macro. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 7f2e7a419330..b334ab0d1df3 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -537,41 +537,38 @@ static void test_default(void) cleanup_netns(nstoken); } =20 -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 =3D mptcp_bpf_first__open_and_load(); - if (!ASSERT_OK_PTR(first_skel, "bpf_first__open_and_load")) - return; - - link =3D 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 =3D sched_init("subflow", "bpf_first"); - if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_first")) - goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - client_fd =3D 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); +#define MPTCP_SCHED_TEST(name, addr1, addr2) \ +static void test_##name(void) \ +{ \ + struct mptcp_bpf_##name *skel; \ + struct nstoken *nstoken; \ + struct bpf_link *link; \ + struct bpf_map *map; \ + \ + skel =3D mptcp_bpf_##name##__open_and_load(); \ + if (!ASSERT_OK_PTR(skel, "open_and_load:" #name)) \ + return; \ + \ + map =3D bpf_object__find_map_by_name(skel->obj, #name); \ + link =3D bpf_map__attach_struct_ops(map); \ + if (!ASSERT_OK_PTR(link, "attach_struct_ops:" #name)) \ + goto fail; \ + \ + nstoken =3D sched_init("subflow", "bpf_" #name); \ + if (!ASSERT_OK_PTR(nstoken, "sched_init:" #name)) \ + goto out; \ + \ + send_data_and_verify(#name, atoi(#addr1), atoi(#addr2));\ + \ + cleanup_netns(nstoken); \ +out: \ + bpf_link__destroy(link); \ +fail: \ + mptcp_bpf_##name##__destroy(skel); \ } =20 +MPTCP_SCHED_TEST(first, 1, 0); + static void test_bkup(void) { struct mptcp_bpf_bkup *bkup_skel; @@ -724,8 +721,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(mptcpify); RUN_MPTCP_TEST(mptcp_subflow); 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")) --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEAF053E37 for ; Thu, 28 Mar 2024 08:05:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613130; cv=none; b=S7cboxS+UgV2dM9DHQqbGK1blzTOe0Rfmr7GoS93UDo3TahwhgA02DPyxnsFUsFKrAinKDE+VG1DPhSS8ivzu6Gp92N4RTc0SkVf2NMrpW8yRiPmcpdKN7T8oMm6F1yDyFq9fELW89LA9QIYNv1/errCjCSlpAwf5IBEzgw+4Ds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613130; c=relaxed/simple; bh=tLpLm2ZbkG/3QZx7e4STtT97asgYfpmcf/BM9Ip6fjE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=grjNCG+uEFXipAkouFUnFaDlEpZFfndQus1lh+SLYoOmDMK+9k+JGVzP5xCWbxotX8awB3BeRVTiTk9SmEiMWMF2NkzMG6ECXz89JJdOZ+HefiQnSpqXe+9srZF5idGnMmOP9TnfbrYttxF4uodwg7B4z999zu+824Fax6MsOf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tGJH4l3u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tGJH4l3u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7039CC43390; Thu, 28 Mar 2024 08:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613130; bh=tLpLm2ZbkG/3QZx7e4STtT97asgYfpmcf/BM9Ip6fjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tGJH4l3ueL0ndLAg1KuoVa61l3xfL9WKkVm7wdgx1bOZ9lFjn0JA0IOl/m2LKu7oY hOod6juworYAyhE65/nDMc5gkXmiSiv7T09uwMMhTRd0OpJsxNWXeSbn2U6Lni9DXn bAs8/CPdpqnort6Fpu3DUzBvt0hArfC7qTfEM0FSNuvHx3ymImGJupoj13aWg0q60U 1reWxroDdOjIf9BtK7Qz5JYh4JeSwPHCA906hrlLMH/A1MetiolLXLdNG912Vepy6L VpuInKLY9+TSb3DNfucNm6wfFwbY+Df8V28tNIVBB0Yn4ApJ1ao8CBCgo76zgNcAgF bWD3Q1+Qb62YA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 10/14] Squash to "selftests/bpf: Add bpf_bkup test" Date: Thu, 28 Mar 2024 16:04:57 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use MPTCP_SCHED_TEST and RUN_MPTCP_TEST. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index b334ab0d1df3..b990f91d59a5 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -568,41 +568,7 @@ fail: \ } =20 MPTCP_SCHED_TEST(first, 1, 0); - -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 =3D mptcp_bpf_bkup__open_and_load(); - if (!ASSERT_OK_PTR(bkup_skel, "bpf_bkup__open_and_load")) - return; - - link =3D 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 =3D sched_init("subflow backup", "bpf_bkup"); - if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_bkup")) - goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - client_fd =3D 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, 1, 0); =20 static void test_rr(void) { @@ -722,8 +688,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(mptcp_subflow); 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")) --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B975F53E37 for ; Thu, 28 Mar 2024 08:05:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613131; cv=none; b=b8j5T+nHUHOwlY+nLzJlocD0svQD8sC+FYgY8ISYYzFWmwmK35YmJt7vib+PLykLobBqqJbndvt+POHB6mk3DCDrMQI52otPRueSTf0w4WTlom6KQXNMlmvaxSTXkjhNcxi2ZhWhlECWDyh1FXfCJAds4zNnE/TxhemW1yu8JDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613131; c=relaxed/simple; bh=X7V//ZjV04kqtHmyLRknbqQD61t22w4r94GATaxCIi4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UJ3M7d4rV4WB0xi+e2sX2pnFVtOkmR1I5zNfaW7dBOaIp0koDM3QnPbHVOisFGCutaqVyuKYh3g6ACuB2lGhsankQ44uvn6tY4KJ9ZDk3nPFcyYMcEdty8JZpL15R4Csb5bnrgtvXp3ueyijDCGRIy9ADc6cSO6aRBwAshBry+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GZCspaz/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GZCspaz/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C007CC433C7; Thu, 28 Mar 2024 08:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613131; bh=X7V//ZjV04kqtHmyLRknbqQD61t22w4r94GATaxCIi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GZCspaz/Lf7UmxPDWQepEiGqNSa6npa8DgjtTmbxwAxOyJKSngOTpWbqFo6O52rk1 PTBnibSP/NOPogeChkOCNXTKpuuaF/2RA6yuQ62+T+lDGjx+Lghz56ZgqLrsE7sADc YgB8SBj7e3O3aKl5TcGpIk6p1hOFJCzWs6YC+fK52NHzjOn1er8GF8BQANwVkIPROM jNcoowiz2qc4Ha3Z/tc/ylREgDGeUkoR3I5+SnSPQkQ81zRpclonQQwWZtCFpAU02C VD08Hsi01EV/ZrNexDXx4vWut6j4egTDO1K14TbyZg8RNOzcHiHtrx0DVexJnosAPV QZovm0oPs9rZQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 11/14] Squash to "selftests/bpf: Add bpf_rr test" Date: Thu, 28 Mar 2024 16:04:58 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use MPTCP_SCHED_TEST and RUN_MPTCP_TEST. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index b990f91d59a5..fbbd7993b0e9 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -569,41 +569,7 @@ fail: \ =20 MPTCP_SCHED_TEST(first, 1, 0); MPTCP_SCHED_TEST(bkup, 1, 0); - -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 =3D mptcp_bpf_rr__open_and_load(); - if (!ASSERT_OK_PTR(rr_skel, "bpf_rr__open_and_load")) - return; - - link =3D 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 =3D sched_init("subflow", "bpf_rr"); - if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_rr")) - goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - client_fd =3D 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, 1, 1); =20 static void test_red(void) { @@ -689,8 +655,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")) --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6676453E37 for ; Thu, 28 Mar 2024 08:05:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613133; cv=none; b=mNfrwYomdJUpWQ1vHXd5M7ZnI67TtggcDk5nyh9iQ6+2zZS+anVZjonn1z52znXrwL7aZCkvTEPUF9rjH8+MXDavt//gE6+a6TOKz9bhIX7bcIaI34rVSR9X+V+mUMd6zLQp0NQ/e7FB2+UIt4APknVq+2AYiVFtgmHlS6uDS6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613133; c=relaxed/simple; bh=1IxsHAu9vi+do4+Oz7mLos6ifcsCHn7fikAKHeBeBLk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ODt/oGXr2koKZdVspCsBldFFM8xICf81OlQNHE5PceLonJ+Qvt5IqUV8E4OfV49Nk1b7KD7xg1Q30k9vnoyX/qV/5jrCwizSSDhRJJgHby1KojW3alD4Ojq9Ojd0F2kC0duEO22lR0dcgx5eCzUeajUdrUke8csjjQl3fYFG0jc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FZ72NRT2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FZ72NRT2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19F8DC43390; Thu, 28 Mar 2024 08:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613132; bh=1IxsHAu9vi+do4+Oz7mLos6ifcsCHn7fikAKHeBeBLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZ72NRT2wgRESIAPHlhKMjW7yK1IlgFsUGyRhqKVN8yEQ52fel73vkM0HKkaCjq0k qfIVNusa/rXMz53fURQmgtSLSWS06sUMyefy0QaUTDGW0cJ5Vg8S+V2/2TnrPWYlSO BvCTj4puVU8hvmaVJ2RovYO9cUfeK4yTUOQzQd0Xyi2t+P/Xo4IG22XNPaYK5ujO9o YlhJA6ho0Qo1kWw3M7gVFhzazWkmzXwEARSywE+Tt7c/HLORvIkgqFhzpwUjuAydXY i9xx1eMy0J8rze6G9OeEiU5wVY8eWOIAMcZWxsyq5rCmdA/AaLAaHmiI1KKE5KTiL8 pexXNExYP/LVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 12/14] Squash to "selftests/bpf: Add bpf_red test" Date: Thu, 28 Mar 2024 16:04:59 +0800 Message-Id: <343fc2231c384cb5e0315c894cdc589157a94b16.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use MPTCP_SCHED_TEST and RUN_MPTCP_TEST. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index fbbd7993b0e9..fd160fa04fb4 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -570,41 +570,7 @@ fail: \ MPTCP_SCHED_TEST(first, 1, 0); MPTCP_SCHED_TEST(bkup, 1, 0); MPTCP_SCHED_TEST(rr, 1, 1); - -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 =3D mptcp_bpf_red__open_and_load(); - if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load")) - return; - - link =3D 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 =3D sched_init("subflow", "bpf_red"); - if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_red")) - goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - client_fd =3D 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, 1, 1); =20 static void test_burst(void) { @@ -656,8 +622,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(); } --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0CC357334 for ; Thu, 28 Mar 2024 08:05:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613134; cv=none; b=aJl61dxlTaGRoUvnkKEmUrErFxEnx+7z6m94mrgO+J1RmdAz1L3JhNEWCHgO6/y3Fj41+mDfjn4jt7LoZ2gjX2FEAz2ALnCjsmAFSMLtw65GcFLuklrM/C/+iMS2nIyzUXogj+fdplHTAoIjfZZ2rGTTfxKhRNEd0Ca/fWy3r/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613134; c=relaxed/simple; bh=pidRC0xSgPxpd7bzm6/Hb4EpOW6rELybZ8iRljbpRq8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V8bqbet8ovPKvkZqGsjRLHo7dF07xXhH/YYKb7uEzmDMXX1RqpU4hMShPhSQgRLehROyHnRZ6FxQj1Y8hDTS3WPlbtgmrXiLHu+i8PqgKwvc7fdHv9gHdRQzc6fK+V2hYi2JEcPcHbZp6By604J1YBVxr5qoxeGVFNN4NgR6bwk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DZZplpAQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DZZplpAQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 692CEC433C7; Thu, 28 Mar 2024 08:05:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613134; bh=pidRC0xSgPxpd7bzm6/Hb4EpOW6rELybZ8iRljbpRq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DZZplpAQ44eY2Xo87b1yNgAlTNgGIB+6U6CvD9Gx8z5OORWz8DQXeW3mp1pStt3y+ c0wRew0GQHNmvpyWqVFF6jGeily3I9XrU23340FlsmQTFRJV2Ipyc2Dl9kuC74ZRP0 rGrTGRTcKp0giUELIzw1142ZJKKys++n9bI/Q9hkJkmvp/nFK62pIcU2hlJeYcS175 SfvpAUuqKUwCBR3TNtP7Q6dj9BDx5Qea3K6BZT8q5YPGfkm1M3sG7OuvFUkV2JvEk3 WSz2oOuhSzRe/ZCURMfX8JEcGMrhXvXcf6iun4DGqXMepSbF6I88j2WOgxYfnnslhV 08YP1eHRE82wQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 13/14] Squash to "selftests/bpf: Add bpf_burst test" Date: Thu, 28 Mar 2024 16:05:00 +0800 Message-Id: <7c3c0b349fbfbaa808e4d31bcec55e89a494e5db.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Now all ADDR_1, ADDR_2 and PORT_1 are replaced by ADDR1, ADDR2 and PORT1, drop the definations of ADDR_1, ADDR_2, PORT_1. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index fd160fa04fb4..118b4698e1f7 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -571,41 +571,7 @@ MPTCP_SCHED_TEST(first, 1, 0); MPTCP_SCHED_TEST(bkup, 1, 0); MPTCP_SCHED_TEST(rr, 1, 1); MPTCP_SCHED_TEST(red, 1, 1); - -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 =3D mptcp_bpf_burst__open_and_load(); - if (!ASSERT_OK_PTR(burst_skel, "bpf_burst__open_and_load")) - return; - - link =3D 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 =3D sched_init("subflow", "bpf_burst"); - if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_burst")) - goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); - client_fd =3D 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, 1, 1); =20 #define RUN_MPTCP_TEST(suffix) \ do { \ @@ -623,6 +589,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); } --=20 2.40.1 From nobody Wed May 15 02:19:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1B8B57334 for ; Thu, 28 Mar 2024 08:05:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613136; cv=none; b=RXojKiVfGP4/bUrZz1NeKhYbhkWGENWfHKL1a4vco89QS4a2AlAZa+gg+KYRQCBBnlCVpk173noSf5N6wl3ofTUUr8+4Q8nwbi9xI0G8ehKHg7Ey0uV4X6cww/xlqljtiaQADQNocwS6idAdK/gMA4HLp3rghgp4Wd1vEaAp8lo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711613136; c=relaxed/simple; bh=Gn7fBcuGTiTV+o6VdKj0oMVrHvrg3D4b9BIki/KefXU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QARswxN1ztX5Lw/TyV0Adpq0bAuMVo3On+7+4aWrcreL40QqOqWJPeZNjS6/UCerWnCr/F0fb3KPP5HxaDvMHBQxMoXzrvt3wNiRW0U9PXevu+ohShfn3mR0wm//G/qY88tmmFnB9wwJVqkHKUGjKKeiNTeKjO8veEBjJ+2bg+w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jzPS+UjA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jzPS+UjA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6961C433F1; Thu, 28 Mar 2024 08:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711613135; bh=Gn7fBcuGTiTV+o6VdKj0oMVrHvrg3D4b9BIki/KefXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jzPS+UjATCCICYlquYaFVe+Dtg2+wKPoyaf70HI2k1xG3voAVlJvfC55ugI5QP/kz PRiUVEu09DibIkuROgHWAkSypCxQxr4LsNM6sUzh70FY2tFhbmiaZffNJFPZmQXnr9 lWx5oiiG0Wa45OxX0yQziCUzHvTNQYdstZ3fw59zDobjeywD7+CtPh0ZRrxritzvD6 F4iyFuwpFG5m65k17vwSlvlNVE/Q6iwt8/rKSN4PZQIA+NIlnQk0bMUyRamfOIZWe9 IAw7HQ0IQfuj+k3hHPyj4h0jIKa0gykyDLABUiyyCudWgJgJVvzRUPfiMcYiIWqeIQ fC23DFQ6r7bNg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 14/14] Squash to "selftests/bpf: Add bpf scheduler test" Date: Thu, 28 Mar 2024 16:05:01 +0800 Message-Id: <57bb3890826a2d90d5e7028a7fbc555e8adbd070.1711612876.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 118b4698e1f7..a950a69b9491 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -467,10 +467,6 @@ static void send_data(int lfd, int fd, char *msg) ASSERT_OK(IS_ERR(thread_ret), "thread_ret"); } =20 -#define ADDR_1 "10.0.1.1" -#define ADDR_2 "10.0.1.2" -#define PORT_1 10001 - static struct nstoken *sched_init(char *flags, char *sched) { struct nstoken *nstoken; --=20 2.40.1