From nobody Sat May 18 15:49:34 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 1E7B86FCA for ; Wed, 24 Apr 2024 01:14:04 +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=1713921245; cv=none; b=YyFrcDCrmjvuOFYvLFZ6b1v8seQLLzyrgVcJ6IND7LXchiLRPzkTFlM89fUAhhcPydroqxe7gByv8AZWwAdoD1l8gJ22zHV67opt4weYON6swRkXEXz2iXk2VTkDdtwFt7a6uh5/a+W0sAWygBDht17tySPanV2ixEXQeaNvI2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713921245; c=relaxed/simple; bh=7P7QJPWTeWLAxseSS0mBucNx7SkCqdF5PIlnB7gMfYI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ntcMFLwm6iYWRYw5tKuuppLg7Owo0u3eUPafjLJhMHRtONN/MQa3pYP187j9clSLu4IDXNFYLbeBVwKaiG3/3d/KoirF/cky+lxHv+v/usUQFaTEm0KRrHrl/NfUIg40lZK+HLB+3lbIdyMiGuPf2NE2dkRJT+50UQwFhrHIQI4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c68zhbXM; 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="c68zhbXM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC9CCC4AF0A; Wed, 24 Apr 2024 01:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713921244; bh=7P7QJPWTeWLAxseSS0mBucNx7SkCqdF5PIlnB7gMfYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c68zhbXMsq+wmkY7REw5+V90pL4L94OGrKP7JUA8cjPehy896LB4KEqcyJ9Co9ip1 jwIF1L2WSBqAy4bZN+Wr9DGQqq5ZHqNRNVhRln3vYbj4r6GRGuS39wvFL8sLC6ST5N aV2+wLz05ezYa3PacX5xbRzKBMzbUyMldb906DewPsuM1F1rYczAjj/Y0qt163+J7/ jZ31EQD99yU8U0kfzybiTro3uZP57rOpWdJuWi4CWwPIxlRthESge9RDfK4m4x01ei JsZzwX3yY/z8dgYwl4qWaPzy968+dM8pYf+eUshpHhjE5R3EUpwBcWSXC3lNGz4SQ7 ev0l/dPCcNvhg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Nicolas Rybowski , Geliang Tang Subject: [PATCH mptcp-next v9 1/4] selftests/bpf: Add mptcp subflow example Date: Wed, 24 Apr 2024 09:13:51 +0800 Message-Id: <8f31e2ee253f2325e622048eca243c011e758501.1713920939.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: Nicolas Rybowski 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". The code comes from commit 4d120186e4d6 ("bpf:examples: update mptcp_set_mark_kern.c") in MPTCP repo https://github.com/multipath-tcp/mptcp_net-next (the "scripts" branch). Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/76 Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Nicolas Rybowski Reviewed-by: Mat Martineau --- .../selftests/bpf/progs/mptcp_subflow.c | 70 +++++++++++++++++++ 1 file changed, 70 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..de9dbba37133 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_subflow.c @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2020, Tessares SA. */ +/* Copyright (c) 2024, Kylin Software */ + +#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 subf= low */ + bpf_map_update_elem(&mptcp_sf, &key, &init, BPF_ANY); + mark =3D init; + } + + /* Set the mark of the subflow's socket based on appearance 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 Sat May 18 15:49:34 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 ED56B6FDC for ; Wed, 24 Apr 2024 01:14:06 +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=1713921247; cv=none; b=oYemebpfwl+zImSfeJSZq1VosEnn6MomaCWCSwePeNnMGbY7pv4sON2xOT/L6qqU09cE92OujIlNZa/1WgyCn8iyWsaZjMIzeYf7L1wuElGMJZJb0+TQt3Vxuwv0DMan1BGRz43e9EWAeBPKLvU3n7B3iOxtJLAh5nwivQnWUDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713921247; c=relaxed/simple; bh=saPuEURRKX6o7kpCmjg8tsSaVbulFLCfiDCi4m2z9RM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nDZT1E6Q6EXvVkGoUZY6uce0oVmJzv0AHaaRugONqiaB2ejGmmdnrY2NhKke9jSl3JNrP/QosNqJT+RT2XHTpUVFByI3Np/8TfZjLf+ZvORocSOyWEe6/Nak+FQTS8yt+VpkmsTyHS9G2y1SybpmUuqlKG+OVD29pBza3uFp0cY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uh7wpQ1J; 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="uh7wpQ1J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45312C32783; Wed, 24 Apr 2024 01:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713921246; bh=saPuEURRKX6o7kpCmjg8tsSaVbulFLCfiDCi4m2z9RM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uh7wpQ1JCPC8SRw9ZT94cLjVNH0UhEesAiM/6KZJgFBNDm0oiOM9xFGvV6lPQR52N Uj+JyZ7E5f2Ya/ESsHVAqxQ9iWHdHFVOW5lzsi8k8P+nezY0PPwiF9GBVTz2WuEMyy UXTVsQtB7hqZwL4IkPN/pBl1ZJ+lOPI2fiU9YXjUenPq6kxbuR1NRdUAVFCgGpzyoC OsKdpUboyeJNnGxyRF7/23PvPkZ4ROzypBUeDTkrAwjClJ2dmtJzOPitWLTgGQpwth cIIx8+7zre2yoYDydsdN2FHKubwLBM4VDbOk4qg4/PZ2QaY7PVdaPrj2fIXVOtL7J6 njh+QngLIbp5Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 2/4] selftests/bpf: Add mptcp subflow subtest Date: Wed, 24 Apr 2024 09:13: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 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 Reviewed-by: Mat Martineau --- .../testing/selftests/bpf/prog_tests/mptcp.c | 118 +++++++++++++++++- 1 file changed, 112 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index d3cc3541dd4f..6d94cda6b97a 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -9,6 +9,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" @@ -16,6 +17,9 @@ #include "mptcp_bpf_burst.skel.h" =20 #define NS_TEST "mptcp_ns" +#define ADDR_1 "10.0.1.1" +#define ADDR_2 "10.0.1.2" +#define PORT_1 10001 #define WITH_DATA true #define WITHOUT_DATA false =20 @@ -41,6 +45,9 @@ #endif #define MPTCP_SCHED_NAME_MAX 16 =20 +static const unsigned int total_bytes =3D 10 * 1024 * 1024; +static int duration; + struct __mptcp_info { __u8 mptcpi_subflows; __u8 mptcpi_add_addr_signal; @@ -332,8 +339,110 @@ static void test_mptcpify(void) close(cgroup_fd); } =20 -static const unsigned int total_bytes =3D 10 * 1024 * 1024; -static int stop, duration; +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, 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); + + return 0; +fail: + return -1; +} + +static int _ss_search(char *src, char *dst, char *port, char *keyword) +{ + char cmd[128]; + int n; + + n =3D 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 >=3D sizeof(cmd)) + return -1; + + return system(cmd); +} + +static int ss_search(char *src, char *keyword) +{ + return _ss_search(src, ADDR_1, "dport", keyword); +} + +static void run_subflow(char *new) +{ + int server_fd, client_fd, err; + char cc[TCP_CA_NAME_MAX]; + socklen_t len =3D sizeof(cc); + + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 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 fail; + + err =3D getsockopt(server_fd, SOL_TCP, TCP_CONGESTION, cc, &len); + if (!ASSERT_OK(err, "getsockopt(srv_fd, TCP_CONGESTION)")) + goto fail; + + send_byte(client_fd); + + ASSERT_OK(ss_search(ADDR_1, "fwmark:0x1"), "ss_search fwmark:0x1"); + ASSERT_OK(ss_search(ADDR_2, "fwmark:0x2"), "ss_search fwmark:0x2"); + ASSERT_OK(ss_search(ADDR_1, new), "ss_search new cc"); + ASSERT_OK(ss_search(ADDR_2, cc), "ss_search default cc"); + + close(client_fd); +fail: + close(server_fd); +} + +static void test_subflow(void) +{ + int cgroup_fd, prog_fd, err; + struct mptcp_subflow *skel; + struct nstoken *nstoken; + + cgroup_fd =3D test__join_cgroup("/mptcp_subflow"); + if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow")) + return; + + skel =3D mptcp_subflow__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_open_load: mptcp_subflow")) + goto close_cgroup; + + err =3D mptcp_subflow__attach(skel); + if (!ASSERT_OK(err, "skel_attach: mptcp_subflow")) + goto skel_destroy; + + 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")) + goto skel_destroy; + + nstoken =3D create_netns(); + if (!ASSERT_OK_PTR(nstoken, "create_netns: mptcp_subflow")) + goto skel_destroy; + + if (!ASSERT_OK(endpoint_init("subflow"), "endpoint_init")) + goto close_netns; + + run_subflow(skel->data->cc); + +close_netns: + cleanup_netns(nstoken); +skel_destroy: + mptcp_subflow__destroy(skel); +close_cgroup: + close(cgroup_fd); +} + +static int stop; =20 static void *server(void *arg) { @@ -414,10 +523,6 @@ static void send_data(int lfd, int fd, char *msg) PTR_ERR(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; @@ -558,6 +663,7 @@ void test_mptcp(void) { RUN_MPTCP_TEST(base); RUN_MPTCP_TEST(mptcpify); + RUN_MPTCP_TEST(subflow); RUN_MPTCP_TEST(default); RUN_MPTCP_TEST(first); RUN_MPTCP_TEST(bkup); --=20 2.40.1 From nobody Sat May 18 15:49:34 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 3D4A35221 for ; Wed, 24 Apr 2024 01:14:08 +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=1713921248; cv=none; b=pAizgasEJR+GRvxAPrmDw8xYEmvEa+t1hTLZSeBgYjDUzVCMZ5MA6dOJ7Rn7YF7JS7Bb8AKukdJPBzaGaoVcMItRDLpANqRz9zpOyPfYO41Y4LC4L22e99jM6KhIAnWJzEST9SKj3l/Xl7fVxBE4i3Ly7UNBjDt5OrlSO/HWIww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713921248; c=relaxed/simple; bh=8tMH3z1r6GffVZ0M3gpuR6SnnvWzB3EU1bkp9G4fla4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mZqEXHirHkJO3+Zm8RPBdQOAjyJGizkv+0GeVvUEPwhk/FGwwUm7pxRkl/lPVRtiyzu4Geo5ugij+ip5+xPcfSIupOW+qSXcMdP5EqZ5OOSFZK9T/4MtytkPqTD4sIB/QxLhWTebBnso6FNzNQ+CojNE1CVTBhPCQ+cw2tUcrmI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B9fpz4IC; 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="B9fpz4IC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14957C4AF09; Wed, 24 Apr 2024 01:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713921248; bh=8tMH3z1r6GffVZ0M3gpuR6SnnvWzB3EU1bkp9G4fla4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B9fpz4ICV5cEOJYNtfGIzPEoCkyUc28MkeyTlnqxgUrqLjT4uvtKf6CiUN1j8Chya 3NEnpAkE3M1WY0dZ55fgFHoyHTLV93pkPyjE9qUup9taqKEzCp10JdQES1CB74L70k tSEoCYTGJghcuMHDNU2ngOR/QFTrXM2+7HUZQD9s+HqAqADIqA4RdNsmYHf7KT8vj2 MjeWs2iCoPyxySh0O8FrQ1zV415piYIs3Pu/bhQQ9p2lzvVtIEZ7Icfa4g67Mm9ABh W4vtv6tGo02UHPGXSPS8D0UyiEvdYY3JpcefFiN78yMFjoxQG2uej8SmL1IBDRpx0A saa/rm1a8x1Tw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 3/4] selftests/bpf: Handle SIGINT when creating netns Date: Wed, 24 Apr 2024 09:13:53 +0800 Message-Id: <08ce28802953e76b337107f1efd978737c913cc0.1713920939.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 It's necessary to delete netns during the MPTCP bpf tests interrupt, otherwise the next tests run will fail due to unable to create netns. This patch adds a new SIGINT handle sig_int, and deletes NS_TEST in it. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 6d94cda6b97a..7409f7c8b1f6 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -79,11 +79,18 @@ struct mptcp_storage { char ca_name[TCP_CA_NAME_MAX]; }; =20 +static void sig_int(int sig) +{ + signal(sig, SIG_IGN); + SYS_NOFAIL("ip netns del %s", NS_TEST); +} + static struct nstoken *create_netns(void) { SYS(fail, "ip netns add %s", NS_TEST); SYS(fail, "ip -net %s link set dev lo up", NS_TEST); =20 + signal(SIGINT, sig_int); return open_netns(NS_TEST); fail: return NULL; --=20 2.40.1 From nobody Sat May 18 15:49:34 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 35EA879CD for ; Wed, 24 Apr 2024 01:14:09 +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=1713921250; cv=none; b=K40qiT2HpwdyG78yWbsrB7ymXWGr4CjajtgjZNC82iTv1pz7USsQDo2W+RYKIwZKQ6herAsmRS2chhvNRMfhNiPMd0tWC0pbNMb6JLgUQE0UVFWqnn1QE0dDnxnSy0oiZoQEFombHdInKiH0LHY+4JFc68v/cnLIBbO9RIfhJ/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713921250; c=relaxed/simple; bh=t7QELByV4/Sgz3JpQX5FCeugXehCOTqo4curzopiHDY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fUV2fWr9KJyaqPbTvXGBPG8EcKKuulAZ2RTmUyeGbe6g6xlcdPyJKo8bKJa2m2R29SXNObvB+1BTfw2RE/VPtPPqW/Z+uMXK2NEWPD1Djnrm2agGUibh7V31z/UgcBRClbeN8GtxR5WZzaU93B/071SJL342FeJZJy/olHySHng= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T8Zrk3t7; 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="T8Zrk3t7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6506C32781; Wed, 24 Apr 2024 01:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713921249; bh=t7QELByV4/Sgz3JpQX5FCeugXehCOTqo4curzopiHDY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T8Zrk3t7yr+wcC2XnNk9GBNUyY74e5ENKq15xs4zx8JGuoupLFPCZWrDTuLJV/Dmj aYZBjFNVjZ7/FNjVJ/I9EZs4vhWUkmPWOmGIGktzY4g1Fs4tC9nP0vVXYJAjsvdNrJ 2S3f51RoKPzUZBRJDv80QlLD3i7+1Y3+bqWXyx+To4UoeMA2513p+SPc1iq2Qw/oAx ZzuUZK/SqODkIQvQPEBHwCRj2J4CDIRy1iFWMGeVaZk5vjoJI7Dk5ltbAf/0oBgOuv H+oSpvw6kduhTVyrIFcvOXuNuyEtneUYcypPE1rtyvKXl5GwtBdQGhxC3dGDEK+4Aj Vab4w0HDpIYvQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 4/4] Squash to "selftests/bpf: Add bpf scheduler test" Date: Wed, 24 Apr 2024 09:13:54 +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 endpoint_init in sched_init and use _ss_search in has_bytes_sent. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 7409f7c8b1f6..f84c74b87d23 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -536,28 +536,22 @@ 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]; - - 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); + return _ss_search(ADDR_1, dst, "sport", "bytes_sent:"); } =20 static void send_data_and_verify(char *sched, bool addr1, bool addr2) --=20 2.40.1