From nobody Fri Nov 22 00:57:48 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 6394814D2B5 for ; Fri, 30 Aug 2024 06:55:41 +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=1725000941; cv=none; b=pQgl6i/zrrleDCv0hepa6gcNs5IOU3QSO59unkIpreNPAj/YUTvLDNQz2yS7reGTZYlAR9AeZlSV1vrNHjbHDwgFGW+JHoe81IEE7ogFQszrHwBLwmxgX83Qc66qsPQjTq5487Gansq9NSmvY81ZZvu0ORMUHCEsLQ3MQlOEEnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725000941; c=relaxed/simple; bh=vTfiggft06llAFuz4f3D8JufNjpczNfklpupNrDDF5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IU1mlmd5B1Q4YRm1i9/ASNZ1LBuWLlyAJ/vfOnB5T8lS3JUUGo0UyMLXk8zexA8A2oUB5v67drjuKvoBxA65ZOYZG8vdCW087bzk3S04J/KeB6yhTI9VA6stqZ4ysoJAPXl8mytkmkY2/IaWlDj0yW+282/eVGIAwByhrYUgdYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T20Bdf6u; 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="T20Bdf6u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB370C4CEC4; Fri, 30 Aug 2024 06:55:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725000941; bh=vTfiggft06llAFuz4f3D8JufNjpczNfklpupNrDDF5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T20Bdf6uN0PhEvt3ZxBpmfGCR4NWQSlc+th8cKW37ujBj32IPCCxel63+l0089XVj yttnzET9hHFXBDy98auiE5pD79u2T1wBY/W/b8Xivmx2vjwg89hwMuog6+FpDpYeJ5 2klM6L1izuZZeoOoOCKDVRsJ77DeWEbkZqwWG0bh3c5Fg3imD0DCTIh2o0jGbFvNDi 11mOh+TEGJnuxYmniVW3AVCXEIcxsrm3PkhRx+uCTEs23RAaHZQ0iIf3ojlX6zWrXU 78PgdvCO4pN2IVTyoqjIrycut0haUaX4MYJwYPtC1Rx3UM4Fde3N+ld61O0vYDZDAK WIv5pqpgLmYhw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 1/4] Squash to "selftests/bpf: Add mptcp subflow example" Date: Fri, 30 Aug 2024 14:55:30 +0800 Message-ID: <06de9b47ddc1e46527f42111a29b97ca01452ba4.1725000687.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 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 For easier verification of cc, set cc of the second subflow as "reno", instead of the first one. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_subflow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_subflow.c b/tools/test= ing/selftests/bpf/progs/mptcp_subflow.c index bc572e1d6df8..2e28f4a215b5 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_subflow.c +++ b/tools/testing/selftests/bpf/progs/mptcp_subflow.c @@ -52,7 +52,7 @@ int mptcp_subflow(struct bpf_sock_ops *skops) err =3D bpf_setsockopt(skops, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)); if (err < 0) return 1; - if (mark =3D=3D 1) + if (mark =3D=3D 2) err =3D bpf_setsockopt(skops, SOL_TCP, TCP_CONGESTION, cc, TCP_CA_NAME_M= AX); =20 return 1; --=20 2.43.0 From nobody Fri Nov 22 00:57:48 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 A2B686CDBA for ; Fri, 30 Aug 2024 06:55:43 +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=1725000943; cv=none; b=h4crlPuzTAenQqdFlbubWUw+efbNXWjNuBAYedn/vLdTumN61Gc4wwizKoyLbhr+PUkKYLWC9eruARlqaP3hh1US/9Z6bslebKByxWxwhX8P3ancFb1sj8FDAN9NycKQXhsGhGTdX0bYiCBBp2RuTLujXLaWQi3R6m12u3rCb8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725000943; c=relaxed/simple; bh=ohfygqKuUjv01EKnOdYA/2vX33PebEzUPnYPyIZi5qs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hE2YD6y1Fgo1o4MBX6JXfPtyPheAuE0EKjc6apWnJhJSGdoyls1HLJU2SX1br20mG3LahFPbbhhKMHMd/DIlLdqSQPl/8x7It67DofAxAMcE/Ar+xjkttyPdrLsvFAdcrdoStE3OFQe04kvBtzt58Mbk8ZpH2m9+hosXBOZDiBI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MO3Wa8MV; 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="MO3Wa8MV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEC47C4CEC6; Fri, 30 Aug 2024 06:55:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725000943; bh=ohfygqKuUjv01EKnOdYA/2vX33PebEzUPnYPyIZi5qs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MO3Wa8MVCzCi+0dRSYg3uAku0KywTiAe2R/an6/1oVLn4AeIMY+LwbjU02M4VJu/j f+rihX3EexwsgKs5ZTVGdjHxlNQlWqYqspW67GUTJQZIkBUsVmC3ljicC8kO9hI9++ KbOBGj4TIoEpdBBwLYHpON9Spr78kij4C19kIy4nLn0yBCXAwpnw7FBkxdHM3BJlEe n/gmTfylaYya32ZwW+WWFHe72ec3bFCqCQwnXcV9Z5cZrnaQwDTxPp0Pa2ldTfZLcQ Du8ArEFTvoo8pwddk+iLVKFI1WY592UsQAn9sfExmTOaGflkTemr/sY0h1jaA5mg5r G6/weoLBjz0ww== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Martin KaFai Lau Subject: [PATCH mptcp-next v6 2/4] selftests/bpf: Add getsockopt to inspect mptcp subflow Date: Fri, 30 Aug 2024 14:55:31 +0800 Message-ID: <0ce049060df256e7376516e4d94af71264a69da0.1725000687.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 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 "cgroup/getsockopt" way to inspect the subflows of a mptcp socket. mptcp_for_each_stubflow() and other helpers related to list_dentry are added into progs/mptcp_bpf.h. Add an extra "cgroup/getsockopt" prog to walk the msk->conn_list and use bpf_core_cast to cast a pointer to tcp_sock for readonly. It will allow to inspect all the fields in a tcp_sock. Suggested-by: Martin KaFai Lau Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf.h | 35 ++++++++++ .../selftests/bpf/progs/mptcp_subflow.c | 69 +++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf.h b/tools/testing/= selftests/bpf/progs/mptcp_bpf.h index 782f36ed027e..d60e3c8f85a1 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf.h +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf.h @@ -4,9 +4,44 @@ =20 #include #include +#include "bpf_experimental.h" =20 #define MPTCP_SUBFLOWS_MAX 8 =20 +static inline int list_is_head(const struct list_head *list, + const struct list_head *head) +{ + return list =3D=3D head; +} + +#define list_entry(ptr, type, member) \ + container_of(ptr, type, member) + +#define list_first_entry(ptr, type, member) \ + list_entry((ptr)->next, type, member) + +#define list_next_entry(pos, member) \ + list_entry((pos)->member.next, typeof(*(pos)), member) + +#define list_entry_is_head(pos, head, member) \ + list_is_head(&pos->member, (head)) + +#define list_for_each_entry(pos, head, member) \ + for (pos =3D list_first_entry(head, typeof(*pos), member); \ + cond_break, !list_entry_is_head(pos, head, member); \ + pos =3D list_next_entry(pos, member)) + +#define list_for_each_entry_safe(pos, n, head, member) \ + for (pos =3D list_first_entry(head, typeof(*pos), member), \ + n =3D list_next_entry(pos, member); \ + cond_break, !list_entry_is_head(pos, head, member); \ + pos =3D n, n =3D list_next_entry(n, member)) + +#define mptcp_for_each_subflow(__msk, __subflow) \ + list_for_each_entry(__subflow, &((__msk)->conn_list), node) +#define mptcp_for_each_subflow_safe(__msk, __subflow, __tmp) \ + list_for_each_entry_safe(__subflow, __tmp, &((__msk)->conn_list), node) + extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subf= low, bool scheduled) __ksym; =20 diff --git a/tools/testing/selftests/bpf/progs/mptcp_subflow.c b/tools/test= ing/selftests/bpf/progs/mptcp_subflow.c index 2e28f4a215b5..18396532f016 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_subflow.c +++ b/tools/testing/selftests/bpf/progs/mptcp_subflow.c @@ -4,6 +4,7 @@ =20 /* vmlinux.h, bpf_helpers.h and other 'define' */ #include "bpf_tracing_net.h" +#include "mptcp_bpf.h" =20 char _license[] SEC("license") =3D "GPL"; =20 @@ -57,3 +58,71 @@ int mptcp_subflow(struct bpf_sock_ops *skops) =20 return 1; } + +static int _check_getsockopt_subflow_mark(struct mptcp_sock *msk, struct b= pf_sockopt *ctx) +{ + struct mptcp_subflow_context *subflow; + int i =3D 0; + + if (msk->pm.subflows !=3D 1) { + bpf_printk("subflows=3D%u", msk->pm.subflows); + ctx->retval =3D -1; + } + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk; + + ssk =3D mptcp_subflow_tcp_sock(bpf_core_cast(subflow, + struct mptcp_subflow_context)); + + if (ssk->sk_mark !=3D ++i) + ctx->retval =3D -1; + } + + return 1; +} + +static int _check_getsockopt_subflow_cc(struct mptcp_sock *msk, struct bpf= _sockopt *ctx) +{ + struct mptcp_subflow_context *subflow; + + if (msk->pm.subflows !=3D 1) { + bpf_printk("subflows=3D%u", msk->pm.subflows); + ctx->retval =3D -1; + } + + mptcp_for_each_subflow(msk, subflow) { + struct inet_connection_sock *icsk; + struct sock *ssk; + + ssk =3D mptcp_subflow_tcp_sock(bpf_core_cast(subflow, + struct mptcp_subflow_context)); + icsk =3D bpf_core_cast(ssk, struct inet_connection_sock); + + if (ssk->sk_mark =3D=3D 2 && + __builtin_memcmp(icsk->icsk_ca_ops->name, cc, TCP_CA_NAME_MAX)) + ctx->retval =3D -1; + } + + return 1; +} + +SEC("cgroup/getsockopt") +int _getsockopt_subflow(struct bpf_sockopt *ctx) +{ + struct bpf_sock *sk =3D ctx->sk; + struct mptcp_sock *msk; + + if (!sk || sk->protocol !=3D IPPROTO_MPTCP) { + ctx->retval =3D -1; + return 1; + } + + msk =3D bpf_core_cast(sk, struct mptcp_sock); + if (ctx->level =3D=3D SOL_SOCKET && ctx->optname =3D=3D SO_MARK) + return _check_getsockopt_subflow_mark(msk, ctx); + if (ctx->level =3D=3D SOL_TCP && ctx->optname =3D=3D TCP_CONGESTION) + return _check_getsockopt_subflow_cc(msk, ctx); + + return 1; +} --=20 2.43.0 From nobody Fri Nov 22 00:57:48 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 70CAE374D1 for ; Fri, 30 Aug 2024 06:55:45 +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=1725000945; cv=none; b=st10j06DNwnwXIs9BIrB/pfdGhl/+U5vFo0Pkx/VgOH/xrgF7CwL88zZOF7JIjtvbI+LN+VDSl/YoZtGk/FGhBjLizrKvzx9oHvcGcY004Lq8TtVei+0NyR1nkDY4fDT1uFVUywrGZ67/2GTfTBcwjYXmZYkY5CNkmiP3/ceLQk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725000945; c=relaxed/simple; bh=WQUOivnus5pQDSF5A5ALacDHfB37HG9FZxBZIj4lPdE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F+i01aV4Rm72xjV7ubB6bmiflpTzfm/vajCUOE+lYkzlfWzSz4GRWYD0Afv+G4gTVWUBBs2hBiG3TER+r8Qz2m+rj/NZBsyJmrecsyymG/TaFPDkQPU727mkOkyDXCRmcwRTtIpP/h6yWlZ5u7nuKuX1eQ33nLhz662KrIxXTKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dRon3fvG; 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="dRon3fvG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2598C4CEC2; Fri, 30 Aug 2024 06:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725000945; bh=WQUOivnus5pQDSF5A5ALacDHfB37HG9FZxBZIj4lPdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dRon3fvGVbd9A/KzKSM4a0xJrxnp//RkgGWNo1B+kAYnuHIxy9/YfI50/u9Z9bTfl msi894eOxHGa8D8zAShtJW6mXQz/GdEQTz9wMt4pVVV54K5yBXz2sjLmAaK4Ln2f/1 N7cCTgiNchA1j0w20e6ljAfkRiKKUNKSNElOQNpVMNLPY4nz+lU2Z9AmlfHMlhG9jy zolTMXc4GNjFCyfoZcOyEltv0HemwC0oEDTgHnwhs+o+24vJJcdfGtZCvsBhZzDKdO WTEJnvNHF1dAqUfy0JNOCU1CH8AvOjiogtzEKjrWF0LaQ+BA3Slx2mjd3AeubHOGY7 TYcyHDR6lfqHw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 3/4] Squash to "selftests/bpf: Add mptcp subflow subtest" Date: Fri, 30 Aug 2024 14:55:32 +0800 Message-ID: <3ddd55ba936f0fa4872cdf4044d0f5ff58a48052.1725000687.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 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 Drop ss_search() from run_subflow(). Use the "cgroup/getsockopt" way to inspect the subflows. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 57 ++++++++++++------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 73adc58cd776..6085aaf61b27 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -368,21 +368,29 @@ static int endpoint_init(char *flags) return -1; } =20 -static int _ss_search(char *src, char *dst, char *port, char *keyword) +static void wait_for_new_subflows(int fd) { - return SYS_NOFAIL("ip netns exec %s ss -enita src %s dst %s %s %d | grep = -q '%s'", - NS_TEST, src, dst, port, PORT_1, keyword); -} + socklen_t len; + u8 subflows; + int err, i; =20 -static int ss_search(char *src, char *keyword) -{ - return _ss_search(src, ADDR_1, "dport", keyword); + len =3D sizeof(subflows); + /* Wait max 1 sec for new subflows to be created */ + for (i =3D 0; i < 10; i++) { + err =3D getsockopt(fd, SOL_MPTCP, MPTCP_INFO, &subflows, &len); + if (!err && subflows > 0) + break; + + sleep(0.1); + } } =20 -static void run_subflow(char *new) +static void run_subflow(void) { int server_fd, client_fd, err; + char new[TCP_CA_NAME_MAX]; char cc[TCP_CA_NAME_MAX]; + unsigned int mark; socklen_t len; =20 server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); @@ -393,19 +401,21 @@ static void run_subflow(char *new) if (!ASSERT_GE(client_fd, 0, "connect to fd")) goto close_server; =20 - len =3D sizeof(cc); - err =3D getsockopt(server_fd, SOL_TCP, TCP_CONGESTION, cc, &len); - if (!ASSERT_OK(err, "getsockopt(server_fd, TCP_CONGESTION)")) - goto close_client; - send_byte(client_fd); + wait_for_new_subflows(client_fd); + + len =3D sizeof(mark); + err =3D getsockopt(client_fd, SOL_SOCKET, SO_MARK, &mark, &len); + if (ASSERT_OK(err, "getsockopt(client_fd, SO_MARK)")) + ASSERT_EQ(mark, 0, "mark"); + + len =3D sizeof(new); + err =3D getsockopt(client_fd, SOL_TCP, TCP_CONGESTION, new, &len); + if (ASSERT_OK(err, "getsockopt(client_fd, TCP_CONGESTION)")) { + get_msk_ca_name(cc); + ASSERT_STREQ(new, cc, "cc"); + } =20 - 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: close(client_fd); close_server: close(server_fd); @@ -416,6 +426,7 @@ static void test_subflow(void) int cgroup_fd, prog_fd, err; struct mptcp_subflow *skel; struct nstoken *nstoken; + struct bpf_link *link; =20 cgroup_fd =3D test__join_cgroup("/mptcp_subflow"); if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow")) @@ -441,8 +452,14 @@ static void test_subflow(void) if (endpoint_init("subflow") < 0) goto close_netns; =20 - run_subflow(skel->data->cc); + link =3D bpf_program__attach_cgroup(skel->progs._getsockopt_subflow, + cgroup_fd); + if (!ASSERT_OK_PTR(link, "getsockopt prog")) + goto close_netns; + + run_subflow(); =20 + bpf_link__destroy(link); close_netns: cleanup_netns(nstoken); skel_destroy: --=20 2.43.0 From nobody Fri Nov 22 00:57:48 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 61E5A374D1 for ; Fri, 30 Aug 2024 06:55:47 +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=1725000947; cv=none; b=aQ0/qfCG/MA7qRyue9UNrWy4EYpaWBCoY3VysbwTrDETJuaS1khSAMeCPzUps0m59e4WFoNQkwPOwZGpc4GfFoWC3Ax5LdHLZLJClrjFGwuCSzN/V3a/sg+bvKwRkPWkSo12sUfhocwdlR7pgrJ6wwPvvnQXrwnKV+a39ROnkIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725000947; c=relaxed/simple; bh=oX7Z8PFHcoibNtviiQrL8NrQS08lqeHBu56Z79Hddbw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hCVsThN5+sj2UHYunxEDg1/FZvKAytQlkjHvC8qwHZjhqh1slWxOdit1aV/4WugCi6LputACnVFhoSYuY00/+yOTvjXKJELxGSqy1jWCzzV7w/MHRkiVrxANRs0EW6saSCxKt9Q+JVp+X9HJDWPveWRQoFD6GP4QRglalw0SQwA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l1/aMsbn; 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="l1/aMsbn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC4B3C4CEC4; Fri, 30 Aug 2024 06:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725000946; bh=oX7Z8PFHcoibNtviiQrL8NrQS08lqeHBu56Z79Hddbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l1/aMsbnG7jBNdcTNaVM58ESNkvdMDG6krJK1uuklJ5+fT7YxQH32d+WvgCvIdJz/ heNo0bSZG2NROL588A3C0vsHyczJb24YBo5E+kvEaokom1ghy2SKs9g3kuXwodJQuy aSVQJpAJYNq9Q0v6oZSmGujs+aEhdm96nMpCq7vu4+N+yMtzbYvuPtlemad4ZyOZv5 cHeWxTyFNZVSRxJnl0VZLRj7h21bAT8vSqWvKbCJWmGkpZbZOpz48k2zMsNAhvl3g8 baKlNYlpy0aRvhQgKvfQLblw6vCUv99sFzUtirVws2VUPuAiPjosg4seaagBEcDAUw 6QaoICbvRQD7Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 4/4] Squash to "selftests/bpf: Add bpf scheduler test" Date: Fri, 30 Aug 2024 14:55:33 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 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 ss_search() are only used by bpf_sched tests. It will be dropped in next step. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 6085aaf61b27..8f22416e00fb 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -487,9 +487,15 @@ static struct nstoken *sched_init(char *flags, char *s= ched) return NULL; } =20 +static int ss_search(char *src, char *dst, char *port, char *keyword) +{ + return SYS_NOFAIL("ip netns exec %s ss -enita src %s dst %s %s %d | grep = -q '%s'", + NS_TEST, src, dst, port, PORT_1, keyword); +} + static int has_bytes_sent(char *dst) { - return _ss_search(ADDR_1, dst, "sport", "bytes_sent:"); + return ss_search(ADDR_1, dst, "sport", "bytes_sent:"); } =20 static void send_data_and_verify(char *sched, bool addr1, bool addr2) --=20 2.43.0