From nobody Thu Nov 21 11:32:31 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 95F10BA2D for ; Thu, 7 Nov 2024 04:29: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=1730953761; cv=none; b=Db7FBEOaJUowJNRxvGk2eV3WgDQ9QG5whJtHgsRmXtpXjYsL5ZGw66I9ArVzJEJquK3Drk6I2J/86ZtNB04RYPIF3HfMTZswZBBty9ViSb7a3ogSrkbEeg6KPFiODou2ebQtotcSagEsefbyKUKm1uTcVA3adJD2NsmH4MOfpOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730953761; c=relaxed/simple; bh=09RdaCTiv49TW2GFGfzTktARHICJTs4jmSlv0PoS7Ck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q6CpvSqZv6N3iYaQJggp3Kn78PG515ZIDzXo0kQQgwh4oYra2glzi8Mb5iLObSVY3FBiJfaN9HI7/VHYeg9X71yh2+9BXGJiA26WjEGWTwpXV7iYWtfomrX4gJfGNpfEEZtqaCwYODg3kdy8slWU9DJgfb2iJf28hmBUTFqnShM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YTts4nqF; 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="YTts4nqF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5A91C4CED2; Thu, 7 Nov 2024 04:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730953761; bh=09RdaCTiv49TW2GFGfzTktARHICJTs4jmSlv0PoS7Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTts4nqFTMg9TnAgfaEs3q1SL86Ujg7MEzHzMGx2ft5UnL03PIJa/ROTpbIygLjCy z1cxm0eS0Ho9BU8u/uCeypv9uWl5FhsRgfuS4G2IaunYsvU3Ycue4tBrLBmm7uTQ9c 4DBF5oyYhVVlybls/KXsWcGw+ylQBCiCWulTe19ge1FE3O9nOyp9C6it3uhO5f7eqw OurlbQ198hSTSObO1Y9jhaQFrYDa10a1r4zkL4ZeZ6exF90nuAduSRLtzrRK0I1LwC XjxA1bGJN/WGRE6xCgrsAwVuMo0IFgCYn3SVZ1d+yPD0w2pJp3vnnUM148ErnjRCyI BHiCUhUbyVCdw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v3 1/5] selftests/bpf: Add mptcp pm_nl_ctl link Date: Thu, 7 Nov 2024 12:29:06 +0800 Message-ID: <2aee2d298df0e490293d8940017bbba0dd2b799e.1730953242.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.45.2 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 symlink to MPTCP's pm_nl_ctl tool into bpf selftests, and updates Makefile to compile it. This is useful to run MPTCP BPF selftests on systems with an old version of IPRoute2. This tool can be used as an alternative to 'ip mptcp'. In addition, this tool is used as userspace path manager. "csf" and "dsf" commands of pm_nl_ctl for creating and destroying subflows, and "ann" and "rem" commands for signaling ADD_ADDR and RM_ADDR. These commands are not currently supported in 'ip mptcp' yet. MAINTAINERS needs to be updated since a new file is added in a non covered place. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- MAINTAINERS | 1 + tools/testing/selftests/bpf/Makefile | 4 +++- tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 120000 tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c diff --git a/MAINTAINERS b/MAINTAINERS index 58b49ad6657f..89ce2a480a41 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16211,6 +16211,7 @@ F: include/trace/events/mptcp.h F: include/uapi/linux/mptcp*.h F: net/mptcp/ F: tools/testing/selftests/bpf/*/*mptcp*.[ch] +F: tools/testing/selftests/bpf/*mptcp*.[ch] F: tools/testing/selftests/net/mptcp/ =20 NETWORKING [TCP] diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests= /bpf/Makefile index 5c1fba253b72..a963c298f034 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -168,7 +168,8 @@ TEST_GEN_PROGS_EXTENDED =3D \ xdp_redirect_multi \ xdp_synproxy \ xdping \ - xskxceiver + xskxceiver \ + mptcp_pm_nl_ctl =20 TEST_GEN_FILES +=3D liburandom_read.so urandom_read sign-file uprobe_multi =20 @@ -752,6 +753,7 @@ TRUNNER_EXTRA_FILES :=3D $(OUTPUT)/urandom_read $(OUTPU= T)/bpf_testmod.ko \ $(OUTPUT)/xdp_synproxy \ $(OUTPUT)/sign-file \ $(OUTPUT)/uprobe_multi \ + $(OUTPUT)/mptcp_pm_nl_ctl \ ima_setup.sh \ verify_sig_setup.sh \ $(wildcard progs/btf_dump_test_case_*.c) \ diff --git a/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c b/tools/testing/= selftests/bpf/mptcp_pm_nl_ctl.c new file mode 120000 index 000000000000..5a08c255b278 --- /dev/null +++ b/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c @@ -0,0 +1 @@ +../net/mptcp/pm_nl_ctl.c \ No newline at end of file --=20 2.45.2 From nobody Thu Nov 21 11:32:31 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 73979BA2D for ; Thu, 7 Nov 2024 04:29: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=1730953763; cv=none; b=TEICQgsLFbI3Dj5JrpcT/XrMXayczDFet7w/VTLSiVG3rmZHBoqT3REYQ+Yli/WpvCoqEMO75iYtIyyOmwJpHlgyDt+l4jncKqnJ2Jp2N0zuVu8zsiybAaww2ADcypQ2ikY7cK9MyPYReJF51UrXTkLQraU1jeiU2IXYUwjzWO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730953763; c=relaxed/simple; bh=/IpI9bjtVlyNNHO3Xl0lk1calaP06NTHNx+iQQg6dfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CxwhryBB+B6hdB81uevmfn377bT5JuPxp6wGcMmRnsH2o6lP0eJR9R2N04oZc7a/LcgsX4iNr5qHLmtkT2jNmL5Q8d83UxcO+wiSWKKmceW/WCdgga47uTPVSoV2L2tiSYsgT8J/ONzE9RezolfWqFURzarQnylmdGPcwRNOn7I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=awxAO1/7; 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="awxAO1/7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9223C4CECE; Thu, 7 Nov 2024 04:29:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730953763; bh=/IpI9bjtVlyNNHO3Xl0lk1calaP06NTHNx+iQQg6dfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=awxAO1/7hPhFIWLPD5CZ1stJce8dcuIldTHuidJAiCWf/hWsBTX71QppGyXH7iZ2s XLWZ8Lh8w6QEFxPR+Ammax/+CF/JJB5azayGAyheRFbJ9/9nQ+Jgnxzhq66ifdRKjC wU2IVwNaRMnmZdBnjOewVQ3E29NfWpgFpDU+YRmKy1bwglz7p/xSH16RHj2uwSYjp+ zDVKewSBIfeTgIxaRwFS/n5TQ1L7E6/7/QwOY4M32dAtWOtAm1qJ/kJUglxzme9IFr ggLdgNkm8hzYDwSYd9/lGZCHIZcuHXAaW+ARFnBY7+i2NrVpPbaWUwNrY+bjJizOGg yvD3lMBLda46A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 2/5] selftests/bpf: Use pm_nl_ctl if ip mptcp not supported Date: Thu, 7 Nov 2024 12:29:07 +0800 Message-ID: <90dc7eabbdd25625b44c08a97684ab576ad99514.1730953242.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.45.2 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 If running MPTCP BPF selftests on systems with an old version of IPRoute2, 'ip mptcp' command is not supported. In this case, instead of skipping the test, falling back to using 'pm_nl_ctl' tool is a better option. This patch adds an 'ip_mptcp' argument for endpoint_add() to control whether to use 'ip mptcp' or 'pm_nl_ctl' to add an endpoint. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 1d68bbda3370..5cab0aa8fb27 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -28,6 +28,7 @@ #define ADDR6_3 "dead:beef:3::1" #define ADDR6_4 "dead:beef:4::1" #define PORT_1 10001 +#define PM_CTL "./mptcp_pm_nl_ctl" #define WITH_DATA true #define WITHOUT_DATA false =20 @@ -366,13 +367,18 @@ static int address_init(void) return -1; } =20 -static int endpoint_add(char *addr, char *flags) +static int endpoint_add(char *addr, char *flags, bool ip_mptcp) { - return SYS_NOFAIL("ip -net %s mptcp endpoint add %s %s", NS_TEST, addr, f= lags); + if (ip_mptcp) + return SYS_NOFAIL("ip -net %s mptcp endpoint add %s %s", + NS_TEST, addr, flags); + return SYS_NOFAIL("ip netns exec %s %s add %s flags %s", + NS_TEST, PM_CTL, addr, flags); } =20 static int endpoint_init(char *flags, u8 endpoints) { + bool ip_mptcp =3D true; int ret =3D -1; =20 if (!endpoints || endpoints > 4) @@ -383,17 +389,16 @@ static int endpoint_init(char *flags, u8 endpoints) =20 if (SYS_NOFAIL("ip -net %s mptcp limits set add_addr_accepted 4 subflows = 4", NS_TEST)) { - printf("'ip mptcp' not supported, skip this test.\n"); - test__skip(); - goto fail; + SYS(fail, "ip netns exec %s %s limits 4 4", NS_TEST, PM_CTL); + ip_mptcp =3D false; } =20 if (endpoints > 1) - ret =3D endpoint_add(ADDR_2, flags); + ret =3D endpoint_add(ADDR_2, flags, ip_mptcp); if (endpoints > 2) - ret =3D ret ?: endpoint_add(ADDR_3, flags); + ret =3D ret ?: endpoint_add(ADDR_3, flags, ip_mptcp); if (endpoints > 3) - ret =3D ret ?: endpoint_add(ADDR_4, flags); + ret =3D ret ?: endpoint_add(ADDR_4, flags, ip_mptcp); =20 fail: return ret; --=20 2.45.2 From nobody Thu Nov 21 11:32:31 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 4A124BA2D for ; Thu, 7 Nov 2024 04:29:24 +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=1730953765; cv=none; b=F1DCsNM3qP61xHbjfS9fgSG+G4T3/hr+reJoUhiW3Pfl3XJydaU8arpH91wFGVdU/g8PGS1P1tu8VqKWJqHEf4ul7wci02IRdOrdDWxImRb0XyYaIfH67sw9WJfnvK3Mamlk/IQlFLcP5olTmn93jjJtr4Vj+s5+NQXaHUJdwqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730953765; c=relaxed/simple; bh=6jAeo9bgsyZFFUGuANsZ6laBPC4E8CX/YQCdXEnYE4w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C6ZlIVa1SObR4NHSq9cZ0xsvGJ1PxaxG99f1vJ+1Lg8gnw2vV+Xo+JjpEZJ0+EUdKNbIkthpOQITpx5dV7eEOYR6vMYT5EFRCTMHOOB4EodPLK7iUaSU0a3txXJBcIB+QRhStREk2xCEuKe69UoV3K/wDoykgRcgu2POeY13esE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rieIypk/; 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="rieIypk/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3AA6C4CECC; Thu, 7 Nov 2024 04:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730953764; bh=6jAeo9bgsyZFFUGuANsZ6laBPC4E8CX/YQCdXEnYE4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rieIypk/vMgh9tsvVMfLveYS1mFSJIzd7lDzEIAEvVS6K1IWfw8kVBkk4I8bOLG9o huUVtkdKb4g+Afr+TVlsYCp/5VH/t1o7k6Dn3hQiQLxCwVID1JPuWfCwe5N6XiuMRx hOAlvg/WNPGOoYaa1NacroLa4wgXgywvOsOmfL883oqSWHtDsmSAtO08xhJsKUTXtx zGKErftEAkjYYBagYzZcKK4lHXG2CiDkkM+1cA1m1A6ymaHiJvuPxsSSR9s2LEac6I 0QGjwNVxs32TgC7IzeCAWJT92rAtFu0ZrUApMsK1iykpekcbfggDPi606cGTegXhYA AGpg3eKTJyKFQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 3/5] bpf: Add mptcp_userspace_pm_addr bpf_iter Date: Thu, 7 Nov 2024 12:29:08 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 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 Just like the mptcp_subflow bpf_iter used to implement the MPTCP BPF packet scheduler, another bpf_iter is also needed, named mptcp_userspace_pm_addr, to traverse all address entries on userspace_pm_local_addr_list of an MPTCP socket for implementing the MPTCP BPF path manager. In kernel space, we walk this list like this: mptcp_for_each_userspace_pm_addr(msk, entry) kfunc(entry); With the mptcp_userspace_pm_addr bpf_iter, bpf_for_each() can be used to do the same thing in BPF program: bpf_for_each(mptcp_userspace_pm_addr, entry, msk) kfunc(entry); This bpf_iter should be invoked under holding the msk pm lock, so use lockdep_assert_held() to assert the lock is holding. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index e9db856972cb..2c0701f5b0c9 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -214,6 +214,15 @@ struct bpf_iter_mptcp_subflow_kern { struct list_head *pos; } __aligned(8); =20 +struct bpf_iter_mptcp_userspace_pm_addr { + __u64 __opaque[2]; +} __aligned(8); + +struct bpf_iter_mptcp_userspace_pm_addr_kern { + struct mptcp_sock *msk; + struct list_head *pos; +} __aligned(8); + __bpf_kfunc_start_defs(); =20 __bpf_kfunc static struct mptcp_sock *bpf_mptcp_sk(struct sock *sk) @@ -266,6 +275,40 @@ bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_s= ubflow *it) { } =20 +__bpf_kfunc static int +bpf_iter_mptcp_userspace_pm_addr_new(struct bpf_iter_mptcp_userspace_pm_ad= dr *it, + struct mptcp_sock *msk) +{ + struct bpf_iter_mptcp_userspace_pm_addr_kern *kit =3D (void *)it; + + kit->msk =3D msk; + if (!msk) + return -EINVAL; + + lockdep_assert_held(&msk->pm.lock); + + kit->pos =3D &msk->pm.userspace_pm_local_addr_list; + return 0; +} + +__bpf_kfunc static struct mptcp_pm_addr_entry * +bpf_iter_mptcp_userspace_pm_addr_next(struct bpf_iter_mptcp_userspace_pm_a= ddr *it) +{ + struct bpf_iter_mptcp_userspace_pm_addr_kern *kit =3D (void *)it; + + if (!kit->msk || list_is_last(kit->pos, + &kit->msk->pm.userspace_pm_local_addr_list)) + return NULL; + + kit->pos =3D kit->pos->next; + return list_entry(kit->pos, struct mptcp_pm_addr_entry, list); +} + +__bpf_kfunc static void +bpf_iter_mptcp_userspace_pm_addr_destroy(struct bpf_iter_mptcp_userspace_p= m_addr *it) +{ +} + __bpf_kfunc static struct mptcp_sock *bpf_mptcp_sock_acquire(struct mptcp_sock *msk) { @@ -305,6 +348,9 @@ BTF_ID_FLAGS(func, bpf_mptcp_subflow_tcp_sock) BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_new, KF_ITER_NEW | KF_TRUSTED_AR= GS) BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_next, KF_ITER_NEXT | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_destroy, KF_ITER_DESTROY) +BTF_ID_FLAGS(func, bpf_iter_mptcp_userspace_pm_addr_new, KF_ITER_NEW | KF_= TRUSTED_ARGS) +BTF_ID_FLAGS(func, bpf_iter_mptcp_userspace_pm_addr_next, KF_ITER_NEXT | K= F_RET_NULL) +BTF_ID_FLAGS(func, bpf_iter_mptcp_userspace_pm_addr_destroy, KF_ITER_DESTR= OY) BTF_ID_FLAGS(func, bpf_mptcp_sock_acquire, KF_ACQUIRE | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_mptcp_sock_release, KF_RELEASE) BTF_KFUNCS_END(bpf_mptcp_common_kfunc_ids) --=20 2.45.2 From nobody Thu Nov 21 11:32:31 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 CF096BA2D for ; Thu, 7 Nov 2024 04:29: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=1730953766; cv=none; b=ZgJ8cv+9K8dLQdnGbqAGyKDu8q9ZSq8rKdL17zjctiQv1/9b1MFZYZwNhx2ajFaIX+86zA8/ZDsqkoWF4YBAW/MPNeNmMznc2YBCfYahTuqxXr/2fpZtiCfdmScC6FBYbHxhXq/5BAft4jjRWD54KQIvcPJOfuwUHZu4tCvhKwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730953766; c=relaxed/simple; bh=0qNYKKGrTWHlM2l3gNRxl1Dta1+AqGADYbaq8jEftvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AM0DhXonVfIYxUekVWDH8cXKRwjyBemPMa8Z332jO5fvhYpugp1t0NeFO5FBotOHgCqVhE13Bg5/clTJE7biSK95qaI049MmYebeCv7KHfgvSe/3PWXHYH9ROcWzE1NPScO6JQgfTwvRZZsrHjctqNXSsha5blLphdhMghk6Nq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XBW5Etsm; 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="XBW5Etsm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DF26C4CECC; Thu, 7 Nov 2024 04:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730953766; bh=0qNYKKGrTWHlM2l3gNRxl1Dta1+AqGADYbaq8jEftvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XBW5EtsmyiHWrGWNaUPWbq2BonsvXH9EfA8ovJHitrJUhZTTW/46CqPe6ef+5iNuh eAALBmC7lqMc+PJH1lMWUeoj9Zr1+N6vaedd6Om5alWst2CseMS1wbMaR26iikIGu9 l6VIIa+IA/efARzC1IWv5gQd6Ih4HcdwVe0VfqnexI6JDlUBah29y8EiHBLbSLofkR 4RN5NwfADkJpvj2PFEfYHfKNHSHH59x+CetkUkD9NtJbMxKsqYRmpSfZo01kVnPLOi cxdjBEGVn7R/PY3ZoYVV+3sf7zweT4he9/a7P2IrGbNC3jpPPjbhPweTjN1R0wp9vE dzsQovwbO4JBA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 4/5] bpf: Export more helpers for mptcp_userspace_pm_addr test Date: Thu, 7 Nov 2024 12:29:09 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 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 The mptcp_userspace_pm_addr bpf_iter should be invoked under holding the msk pm lock, so spin_lock_bh() and spin_unlock_bh() are needed in BPF program to hold or release the msk pm lock. And bpf_ipv6_addr_v4mapped() helper is also needed by the mptcp_userspace_pm_addr bpf_iter selftest program. This patch adds the corresponding BPF wrappers for these helpers and adds them to the mptcp common kfunc_set. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 2c0701f5b0c9..6352b2b4f505 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -326,6 +326,24 @@ __bpf_kfunc static void bpf_mptcp_sock_release(struct = mptcp_sock *msk) WARN_ON_ONCE(!sk || !refcount_dec_not_one(&sk->sk_refcnt)); } =20 +__bpf_kfunc static void bpf_spin_lock_bh(spinlock_t *lock) +{ + spin_lock_bh(lock); +} + +__bpf_kfunc static void bpf_spin_unlock_bh(spinlock_t *lock) +{ + spin_unlock_bh(lock); +} + +__bpf_kfunc static bool bpf_ipv6_addr_v4mapped(const struct mptcp_addr_inf= o *a) +{ +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + return ipv6_addr_v4mapped(&a->addr6); +#endif + return false; +} + __bpf_kfunc struct mptcp_subflow_context * bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned= int pos) { @@ -353,6 +371,9 @@ BTF_ID_FLAGS(func, bpf_iter_mptcp_userspace_pm_addr_nex= t, KF_ITER_NEXT | KF_RET_ BTF_ID_FLAGS(func, bpf_iter_mptcp_userspace_pm_addr_destroy, KF_ITER_DESTR= OY) BTF_ID_FLAGS(func, bpf_mptcp_sock_acquire, KF_ACQUIRE | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_mptcp_sock_release, KF_RELEASE) +BTF_ID_FLAGS(func, bpf_spin_lock_bh) +BTF_ID_FLAGS(func, bpf_spin_unlock_bh) +BTF_ID_FLAGS(func, bpf_ipv6_addr_v4mapped) BTF_KFUNCS_END(bpf_mptcp_common_kfunc_ids) =20 static const struct btf_kfunc_id_set bpf_mptcp_common_kfunc_set =3D { --=20 2.45.2 From nobody Thu Nov 21 11:32:31 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 D0596BA2D for ; Thu, 7 Nov 2024 04:29:28 +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=1730953768; cv=none; b=oiPGi36/LHtKfFhtkSj6z2NNlUOxLSONvpxVwq+L3LXzPMeQiCn1vIUsAutGFASDFSVR1Ez9FtSO5+CaIvOMZy5dik6tuewbkjfuL2PqmHgFPupzZlT6Im7kIiBhdZUAs1P0aJP7SXSi+I3MXKnwbtxaaNJGMRPkS53Mr0AG360= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730953768; c=relaxed/simple; bh=OkfOcIb3bTjV6XfpqwH1xOOM0bVvW01KPjBrTa6niSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DKY5AQze5uFaS9lFeAtZqEr3LF7NANdw2ecWoGwaslVSox78sQ9oB/9ml+HutaR5v1zXXAHtA3EHJx0WWPwEZdqaZAzXRrz9HpHypa9PacujwNwVwudOxsvJUpY38TdraG12odWI9rnNcJiTeU4ledO55bm/j8i/YqvedIbHRGs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ChwcJdB3; 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="ChwcJdB3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5715BC4CECE; Thu, 7 Nov 2024 04:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730953768; bh=OkfOcIb3bTjV6XfpqwH1xOOM0bVvW01KPjBrTa6niSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ChwcJdB31YoSCjir+2Smm+Ihq53N3nGwd5kZLQCioDgxhACnhlzn/8yqtS1c0ZCTU Nj5hbzuWwq915gi7NxidAZwQnLP1/1xVJQMWN20lkniy7VIMXZbWMyqaFBwPZdt2fm tbqxCIGfFD6kXWOMD3eSn39yiBkxOA1RXgc+ef6RcUZ+BSiweuM0LIT30kiCcVvSAk BPKAOly6gJZAxRtRWBeU6ZmZ+eA2MK+89J+VXwt/sUBWToJ1in/sey5EULr4wtvuky nEEn11H2Y1z7TDqpNopknn/xNdx+xYOvLVpBmeoQ09TRFWtnYCs8SvHlHdT8lu5BEV zf2cl8oBBGOkg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 5/5] selftests/bpf: Add mptcp_userspace_pm_addr bpf_iter subtest Date: Thu, 7 Nov 2024 12:29:10 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 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 test program for the newly added mptcp_userspace_pm_addr bpf_iter in SEC "cgroup/getsockopt". This test iterates over all address entries on the local address list of userspace PM and check whether each one is an IPv4mapped address. Export mptcp_userspace_pm_addr helpers _new/_next/_destroy into bpf_experimental.h. Use bpf_mptcp_sock_acquire() to acquire the msk, then lock the msk pm lock and use bpf_for_each(mptcp_userspace_pm_addr) to walk the local address list of this msk. Invoke bpf_ipv6_addr_v4mapped() in the loop to check whether the address is an IPv4mapped one. Then Add the address ID of each entry to local veriable local_ids. Out of the loop, unlock the msk pm lock and use bpf_mptcp_sock_release() to release the msk. Finally, assign local_ids to global variable ids so that the application can obtain this value. Add a subtest named test_iters_address to load and verify the newly added mptcp_userspace_pm_addr type bpf_iter example in test_mptcp. Since mptcp_userspace_pm_addr bpf_iter iterates over all address entries on the local address list of userspace PM. A set of userspace PM helpers are added. Set pm_type and start "pm_nl_ctl events" command to save pm events into the log file /tmp/bpf_userspace_pm_events in userspace_pm_init(). Kill "pm_nl_ctl" command and remove the log file in userspace_pm_cleanup(). Parse the log file in userspace_pm_add_subflow() to get the token, sport and dport values, then use "pm_nl_ctl csf" command to create a subflow. Use the helper userspace_pm_add_subflow() to add 3 new subflow endpoints. Send a byte of message to start the mptcp connection, and receive the message. getsockopt() is invoked to trigger the "cgroup/getsockopt" test program. Check if skel->bss->ids equals 60 to verify whether the program loops three times as expected. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/bpf_experimental.h | 8 + .../testing/selftests/bpf/prog_tests/mptcp.c | 214 ++++++++++++++++++ tools/testing/selftests/bpf/progs/mptcp_bpf.h | 5 + .../selftests/bpf/progs/mptcp_bpf_iters.c | 39 ++++ 4 files changed, 266 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing= /selftests/bpf/bpf_experimental.h index 08eaa431aafd..b4ccb58a0577 100644 --- a/tools/testing/selftests/bpf/bpf_experimental.h +++ b/tools/testing/selftests/bpf/bpf_experimental.h @@ -583,6 +583,14 @@ bpf_iter_mptcp_subflow_next(struct bpf_iter_mptcp_subf= low *it) __weak __ksym; extern void bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_subflow *it) __weak _= _ksym; =20 +struct bpf_iter_mptcp_userspace_pm_addr; +extern int bpf_iter_mptcp_userspace_pm_addr_new(struct bpf_iter_mptcp_user= space_pm_addr *it, + struct mptcp_sock *msk) __weak __ksym; +extern struct mptcp_pm_addr_entry * +bpf_iter_mptcp_userspace_pm_addr_next(struct bpf_iter_mptcp_userspace_pm_a= ddr *it) __weak __ksym; +extern void +bpf_iter_mptcp_userspace_pm_addr_destroy(struct bpf_iter_mptcp_userspace_p= m_addr *it) __weak __ksym; + extern int bpf_wq_init(struct bpf_wq *wq, void *p__map, unsigned int flags= ) __weak __ksym; extern int bpf_wq_start(struct bpf_wq *wq, unsigned int flags) __weak __ks= ym; extern int bpf_wq_set_callback_impl(struct bpf_wq *wq, diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 5cab0aa8fb27..151fe31a9473 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -29,6 +29,7 @@ #define ADDR6_4 "dead:beef:4::1" #define PORT_1 10001 #define PM_CTL "./mptcp_pm_nl_ctl" +#define PM_EVENTS "/tmp/bpf_userspace_pm_events" #define WITH_DATA true #define WITHOUT_DATA false =20 @@ -57,6 +58,14 @@ #endif #define MPTCP_SCHED_NAME_MAX 16 =20 +enum mptcp_pm_type { + MPTCP_PM_TYPE_KERNEL =3D 0, + MPTCP_PM_TYPE_USERSPACE, + + __MPTCP_PM_TYPE_NR, + __MPTCP_PM_TYPE_MAX =3D __MPTCP_PM_TYPE_NR - 1, +}; + static const unsigned int total_bytes =3D 10 * 1024 * 1024; static int duration; =20 @@ -252,6 +261,19 @@ static void send_byte(int fd) ASSERT_EQ(write(fd, &b, sizeof(b)), 1, "send single byte"); } =20 +static int recv_byte(int fd) +{ + char buf[1]; + ssize_t n; + + n =3D recv(fd, buf, sizeof(buf), 0); + if (CHECK(n <=3D 0, "recv_byte", "recv")) { + log_err("failed/partial recv"); + return -1; + } + return 0; +} + static int verify_mptcpify(int server_fd, int client_fd) { struct __mptcp_info info; @@ -567,6 +589,196 @@ static void test_iters_subflow(void) close(cgroup_fd); } =20 +static int userspace_pm_init(enum mptcp_pm_type pm_type) +{ + if (address_init()) + goto fail; + + SYS(fail, "ip netns exec %s sysctl -qw net.mptcp.pm_type=3D%u", + NS_TEST, pm_type); + SYS(fail, "ip netns exec %s %s limits 4 4", + NS_TEST, PM_CTL); + SYS(fail, "ip netns exec %s %s events >> %s 2>&1 &", + NS_TEST, PM_CTL, PM_EVENTS); + + return 0; +fail: + return -1; +} + +static void userspace_pm_cleanup(void) +{ + SYS_NOFAIL("ip netns exec %s killall %s > /dev/null 2>&1", + NS_TEST, PM_CTL); + SYS_NOFAIL("ip netns exec %s rm -rf %s", NS_TEST, PM_EVENTS); +} + +static int userspace_pm_get_events_line(char *type, char *line) +{ + char buf[BUFSIZ], *str; + size_t len; + int fd; + + fd =3D open(PM_EVENTS, O_RDONLY); + if (fd < 0) { + log_err("failed to open pm events\n"); + return -1; + } + + len =3D read(fd, buf, sizeof(buf)); + close(fd); + if (len <=3D 0) { + log_err("failed to read pm events\n"); + return -1; + } + + str =3D strstr(buf, type); + if (!str) { + log_err("failed to get type %s pm event\n", type); + return -1; + } + + strcpy(line, str); + return 0; +} + +static int userspace_pm_get_token(int fd) +{ + char line[1024], *str; + __u32 token; + int i; + + /* Wait max 2 sec for the connection to be established */ + for (i =3D 0; i < 10; i++) { + usleep(200000); /* 0.2s */ + send_byte(fd); + + sync(); + if (userspace_pm_get_events_line("type:2", line)) + continue; + str =3D strstr(line, "token"); + if (!str) + continue; + if (sscanf(str, "token:%u,", &token) !=3D 1) + continue; + return token; + } + + return 0; +} + +static int userspace_pm_add_subflow(__u32 token, char *addr, __u8 id) +{ + bool ipv6 =3D strstr(addr, ":"); + char line[1024], *str; + __u32 sport, dport; + + if (userspace_pm_get_events_line("type:2", line)) + return -1; + + str =3D strstr(line, "sport"); + if (!str || sscanf(str, "sport:%u,dport:%u,", &sport, &dport) !=3D 2) { + log_err("add_subflow error, str=3D%s\n", str); + return -1; + } + + str =3D ipv6 ? (strstr(addr, ".") ? "::ffff:"ADDR_1 : ADDR6_1) : ADDR_1; + SYS_NOFAIL("ip netns exec %s %s csf lip %s lid %u rip %s rport %u token %= u", + NS_TEST, PM_CTL, addr, id, str, dport, token); + + return 0; +} + +static void run_iters_address(void) +{ + int server_fd, client_fd, accept_fd; + int is_mptcp, err; + socklen_t len; + __u32 token; + + server_fd =3D start_mptcp_server(AF_INET6, "::ffff:"ADDR_1, PORT_1, 0); + if (!ASSERT_OK_FD(server_fd, "start_mptcp_server")) + return; + + client_fd =3D connect_to_fd(server_fd, 0); + if (!ASSERT_OK_FD(client_fd, "connect_to_fd")) + goto close_server; + + accept_fd =3D accept(server_fd, NULL, NULL); + if (!ASSERT_OK_FD(accept_fd, "accept")) + goto close_client; + + token =3D userspace_pm_get_token(client_fd); + if (!token) + goto close_client; + recv_byte(accept_fd); + usleep(200000); /* 0.2s */ + + err =3D userspace_pm_add_subflow(token, "::ffff:"ADDR_2, 10); + err =3D err ?: userspace_pm_add_subflow(token, "::ffff:"ADDR_3, 20); + err =3D err ?: userspace_pm_add_subflow(token, "::ffff:"ADDR_4, 30); + if (!ASSERT_OK(err, "userspace_pm_add_subflow")) + goto close_accept; + + send_byte(accept_fd); + recv_byte(client_fd); + + len =3D sizeof(is_mptcp); + /* mainly to trigger the BPF program */ + err =3D getsockopt(client_fd, SOL_TCP, TCP_IS_MPTCP, &is_mptcp, &len); + if (ASSERT_OK(err, "getsockopt(client_fd, TCP_IS_MPTCP)")) + ASSERT_EQ(is_mptcp, 1, "is_mptcp"); + +close_accept: + close(accept_fd); +close_client: + close(client_fd); +close_server: + close(server_fd); +} + +static void test_iters_address(void) +{ + struct mptcp_bpf_iters *skel; + struct netns_obj *netns; + int cgroup_fd; + int err; + + cgroup_fd =3D test__join_cgroup("/iters_address"); + if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: iters_address")) + return; + + skel =3D mptcp_bpf_iters__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_open_load: iters_address")) + goto close_cgroup; + + skel->links.iters_address =3D bpf_program__attach_cgroup(skel->progs.iter= s_address, + cgroup_fd); + if (!ASSERT_OK_PTR(skel->links.iters_address, "attach getsockopt")) + goto skel_destroy; + + netns =3D netns_new(NS_TEST, true); + if (!ASSERT_OK_PTR(netns, "netns_new")) + goto skel_destroy; + + err =3D userspace_pm_init(MPTCP_PM_TYPE_USERSPACE); + if (!ASSERT_OK(err, "userspace_pm_init: iters_address")) + goto close_netns; + + run_iters_address(); + + /* 10 + 20 + 30 =3D 60 */ + ASSERT_EQ(skel->bss->ids, 60, "address ids"); + + userspace_pm_cleanup(); +close_netns: + netns_free(netns); +skel_destroy: + mptcp_bpf_iters__destroy(skel); +close_cgroup: + close(cgroup_fd); +} + static struct netns_obj *sched_init(char *flags, char *sched) { struct netns_obj *netns; @@ -750,6 +962,8 @@ void test_mptcp(void) test_subflow(); if (test__start_subtest("iters_subflow")) test_iters_subflow(); + if (test__start_subtest("iters_address")) + test_iters_address(); if (test__start_subtest("default")) test_default(); if (test__start_subtest("first")) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf.h b/tools/testing/= selftests/bpf/progs/mptcp_bpf.h index 3b20cfd44505..f4952e489628 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf.h +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf.h @@ -58,4 +58,9 @@ extern void mptcp_subflow_set_scheduled(struct mptcp_subf= low_context *subflow, extern struct mptcp_subflow_context * bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned= int pos) __ksym; =20 +extern void bpf_spin_lock_bh(spinlock_t *lock) __ksym; +extern void bpf_spin_unlock_bh(spinlock_t *lock) __ksym; + +extern bool bpf_ipv6_addr_v4mapped(const struct mptcp_addr_info *a) __ksym; + #endif diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_iters.c index 1bede22a7e3d..41227de36cc1 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c @@ -62,3 +62,42 @@ int iters_subflow(struct bpf_sockopt *ctx) bpf_mptcp_sock_release(msk); return 1; } + +SEC("cgroup/getsockopt") +int iters_address(struct bpf_sockopt *ctx) +{ + struct mptcp_pm_addr_entry *entry; + struct bpf_sock *sk =3D ctx->sk; + struct mptcp_sock *msk; + int local_ids =3D 0; + + if (!sk || sk->protocol !=3D IPPROTO_MPTCP || + ctx->level !=3D SOL_TCP || ctx->optname !=3D TCP_IS_MPTCP) + return 1; + + msk =3D bpf_mptcp_sk((struct sock *)sk); + if (msk->pm.server_side) + return 1; + + msk =3D bpf_mptcp_sock_acquire(msk); + if (!msk) + return 1; + bpf_spin_lock_bh(&msk->pm.lock); + bpf_for_each(mptcp_userspace_pm_addr, entry, msk) { + /* Here MPTCP-specific path manager kfunc can be called: + * this test is not doing anything really useful, only to + * verify the iteration works. + */ + + if (!bpf_ipv6_addr_v4mapped(&entry->addr)) + break; + + local_ids +=3D entry->addr.id; + } + bpf_spin_unlock_bh(&msk->pm.lock); + bpf_mptcp_sock_release(msk); + + ids =3D local_ids; + + return 1; +} --=20 2.45.2