From nobody Fri Nov 22 13:19:36 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 678391DAC5B for ; Tue, 3 Sep 2024 08:05:13 +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=1725350713; cv=none; b=uRZwEy0Es4GplhV3w4H4szVWfWGsZWaQXx7Pt7UxuujEFkeNBWFOJoMPgfJ5ZrgweyOjeGrWWraq53IVBSihVqxLMGeLqQBq3FpDqMt/i55AUFCEioMMdrKcygZfk6MCn/nc1XYgn1xyzq0Yrezsuy6yTOinX3Dv960uCooPYHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725350713; c=relaxed/simple; bh=WQUOivnus5pQDSF5A5ALacDHfB37HG9FZxBZIj4lPdE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OsoWZVDkBJHJP3qjxmEE2MUIAbS7llHJj6E/cAD1mRNVWZlusbRZUmvKOCu8JKeH44z4l7Ini/AyODf6OzlmDbyJU9sbwPWQMdAdzxCzErgjg9cH91OBtHpni5RhAecMDkk/cXimWa+yKIIjvIU9DQ6OZa4Bzdap2PWAx2RH7w0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mmW508OW; 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="mmW508OW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4757C4CEC6; Tue, 3 Sep 2024 08:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725350712; bh=WQUOivnus5pQDSF5A5ALacDHfB37HG9FZxBZIj4lPdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mmW508OWj4YElltg5RxWWnTUTB05GwXKWQWbDr4aS3XhRevUZaX2s3Kpp6iq2Siq7 eLrSCjo0GFumoWrmqjokVAbpjYH5oSqMXJb5ibwbEdDOy8JBgBsYXX2jQWLLF+MSJr nHCVqp8pBvszsJsAJbreXbm1IFQ/tek9wYTQzxHw75wVKNdS44ajcw35xCZOFDFxGo n2XH3aR0LYxbbqcLveFZXimMBhY9wtHcd8TxeQiHcq07Ux3AKPfsXNxHY2vjkRfx+M KYast168Nkuej5IUoQVvBkjLyiuAwUwZ1VsqnhFXZuOXrv3wseUJU5h+S4arFPmmoL HqJXXLp119RaA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 3/4] Squash to "selftests/bpf: Add mptcp subflow subtest" Date: Tue, 3 Sep 2024 16:04:59 +0800 Message-ID: <3d2de951717c03cdadf6bcc7fb2ed9fe6f5dd83d.1725350462.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