From nobody Fri Mar 13 13:20:11 2026 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 BE8A2205E1B for ; Wed, 11 Dec 2024 03:12: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=1733886726; cv=none; b=l5MY2yXpXV568JKSLshTQyrcCb4t/BJpArWfpJ6yLGqpT7vjVn8PyXELk57Zb8LesYfRK0H6ltzKlzQ93IfOU/MD3NTNDoX8tk6teAHqA6/u3scDUOBXIk9xysCYANH6CTs/c/3fCzxaufn6qnYasOaiLifhBCEyS369roc36f0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733886726; c=relaxed/simple; bh=M01EiuzHoOxggISi5fFfJVRm9VtHusNpvppZs7ZUozg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XdAXKV9olQeS2gUX6BwYf+tHaW5F+jH2kYLoYEsqBHoxXe4GzozeHbJd23e2GOfzybR2ytYXnb7ap16ODqwZhU6NMosUhk+EctcyRlfCDBYQoK3zlOh+73TzcNHFCc/zS57XsC0acpNDAf9nJRS6PVSTShNT+47XHUAsjy/VhjM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oCvcts67; 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="oCvcts67" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BB6FC4CED6; Wed, 11 Dec 2024 03:12:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733886726; bh=M01EiuzHoOxggISi5fFfJVRm9VtHusNpvppZs7ZUozg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oCvcts670gIhCgHRYYLPNmbAVA5tkgB2hBWnWRfNtN5/ckPJrvRJYxZ9ibYMBYN42 bmOj8NqT+rC8cALaL3cAJQPvdEjuxmmnkN05rv6WQeBzF3frtoZSLzplm0EA1puplc E2SFWmEknntnRnMoIOI0TDNy69e5IpCSM+goTOFEeBGmV9Ua+Llceil8aL86iDUShj tnecvJhm8/s9OCnD8SHWu8znDlV2dvQ+aTwZAzkuD+ibLqSx2LXfpIjL27fYvUvIzG ksMmgseqwnPp0GAciSNyfdm3Hs49i3+hJ0Z01HcbDemjEEVTyoLpUrA9/gQcNR7imF GO7JtbxtwqvXA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 1/5] bpf: Extend bpf_skc_to_mptcp_sock to MPTCP sock Date: Wed, 11 Dec 2024 11:11:52 +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 Currently, bpf_skc_to_mptcp_sock() can only be used with sockets that are MPTCP subflows: TCP sockets with tp->is_mptcp, created by the kernel from an MPTCP socket (IPPROTO_MPTCP). Typically used with BPF sock_ops operators. Here, this helper is extended to support MPTCP sockets, the ones created by the userspace (IPPROTO_MPTCP). This is useful for BPF hooks involving these sockets, e.g. [gs]etsocktopt. bpf_skc_to_mptcp_sock() uses bpf_mptcp_sock_from_subflow(). The former suggests any MPTCP type/subtype can be used, but the latter only accepts subflow ones. So bpf_mptcp_sock_from_subflow is modified here to support MPTCP socket, and renamed to avoid confusions. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- include/net/mptcp.h | 4 ++-- net/core/filter.c | 2 +- net/mptcp/bpf.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 814b5f2e3ed5..94d5976f7b8d 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -322,9 +322,9 @@ static inline void mptcpv6_handle_mapped(struct sock *s= k, bool mapped) { } #endif =20 #if defined(CONFIG_MPTCP) && defined(CONFIG_BPF_SYSCALL) -struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk); +struct mptcp_sock *bpf_mptcp_sock_from_sock(struct sock *sk); #else -static inline struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *= sk) { return NULL; } +static inline struct mptcp_sock *bpf_mptcp_sock_from_sock(struct sock *sk)= { return NULL; } #endif =20 #if !IS_ENABLED(CONFIG_MPTCP) diff --git a/net/core/filter.c b/net/core/filter.c index fac245065b0a..9ac048f0c5dd 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -11836,7 +11836,7 @@ const struct bpf_func_proto bpf_skc_to_unix_sock_pr= oto =3D { BPF_CALL_1(bpf_skc_to_mptcp_sock, struct sock *, sk) { BTF_TYPE_EMIT(struct mptcp_sock); - return (unsigned long)bpf_mptcp_sock_from_subflow(sk); + return (unsigned long)bpf_mptcp_sock_from_sock(sk); } =20 const struct bpf_func_proto bpf_skc_to_mptcp_sock_proto =3D { diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index e9db856972cb..1e8efe9cd4ff 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -188,9 +188,15 @@ static struct bpf_struct_ops bpf_mptcp_sched_ops =3D { }; #endif /* CONFIG_BPF_JIT */ =20 -struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) +struct mptcp_sock *bpf_mptcp_sock_from_sock(struct sock *sk) { - if (sk && sk_fullsock(sk) && sk->sk_protocol =3D=3D IPPROTO_TCP && sk_is_= mptcp(sk)) + if (unlikely(!sk || !sk_fullsock(sk))) + return NULL; + + if (sk->sk_protocol =3D=3D IPPROTO_MPTCP) + return mptcp_sk(sk); + + if (sk->sk_protocol =3D=3D IPPROTO_TCP && sk_is_mptcp(sk)) return mptcp_sk(mptcp_subflow_ctx(sk)->conn); =20 return NULL; --=20 2.45.2 From nobody Fri Mar 13 13:20:11 2026 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 81AB91FBEB0 for ; Wed, 11 Dec 2024 03:12: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=1733886728; cv=none; b=N3LaDeTXiglfGYfRzNSbnx1NwEklZVee3DWNO/XBxgoVj4LhgHpxOKQ7H2vJmHZLrnSXY+QS4WfMX0ClfZZw7/e7LAVB4SSr/PX1FHOLuZjNTSDwdTKOOoG2LFJAO8uYAoDQHbrTrqpm67VpEflskk9HjZ3pRxqWCkD7mV3QdYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733886728; c=relaxed/simple; bh=aSoxMkRuS6FrPLEbSoIBOLQISKqR8T8VOlvc600xB3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jc2cYiLgcPtq3PsriEBBntCIfeyUnszHvpswke5eAkq/1llq63lQijgigLb+SSrBx0wVopdOCgiMq/ShA3/UwzJVlo1BznSCZdqN00oT2CnD9xZU5Xx4AhADMpP+Yus5+TCwA7KbqAO7uag7z7RbzGoSloppXg2rERgqN1oeQak= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=abG8ez6B; 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="abG8ez6B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 057F9C4CED6; Wed, 11 Dec 2024 03:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733886728; bh=aSoxMkRuS6FrPLEbSoIBOLQISKqR8T8VOlvc600xB3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=abG8ez6B6l6uoeUA8lLrUCXj6yo+cfCK9BaNwRFE62OoYoUu8xaW/I+czM4ByCiOa LZZ9HTgI1t1Z2jJNDCPimDAVkh++sP/E90YHQ7wZx6q6mxClS/WYNVKC7kkKkT7Hrw ZiMec0loTjK1tDNyOwdsmuEXpRai28923x8ZHzG2tOVUPyNmzFsy7aX07v3EIxC3b7 Zp/7wk3sWPitJYybJSXIY9jaKi2WP52bcIJS9w879VGvR2BrTuAFr7TEZra1EaWpoW pcmz8VmuWSSUpS6DeMTpU+tEIqjLDriQ9pFhvBVF4LPGjotFQUwyDPmi1wQ2t1PlRJ rwvCuzP4Ao3xg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 2/5] bpf: Allow use of skc_to_mptcp_sock in cg_sockopt Date: Wed, 11 Dec 2024 11:11:53 +0800 Message-ID: <8521a7350fadd389e60b24bd67c21aca67d9b03f.1733886326.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 Currently, bpf_skc_to_mptcp_sock() helper is not allowed to be used in cg_sockopt. This patch adds this permission. Thanks to the previous patch allowing skc_to_mptcp_sock() to be used with MPTCP sockets, this permission allows this helper to be use it in CGroup BPF hooks, e.g. [gs]etsocktopt. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- kernel/bpf/cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index 46e5db65dbc8..1ca22e4842cf 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -2358,6 +2358,8 @@ cg_sockopt_func_proto(enum bpf_func_id func_id, const= struct bpf_prog *prog) #ifdef CONFIG_INET case BPF_FUNC_tcp_sock: return &bpf_tcp_sock_proto; + case BPF_FUNC_skc_to_mptcp_sock: + return &bpf_skc_to_mptcp_sock_proto; #endif case BPF_FUNC_perf_event_output: return &bpf_event_output_data_proto; --=20 2.45.2 From nobody Fri Mar 13 13:20:11 2026 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 44D58CA4E for ; Wed, 11 Dec 2024 03:12:10 +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=1733886730; cv=none; b=pSLQJz6ob+1bupfgpxQAOaFLsdfvluSjKIBykRAvaKqHi6fL5RkgM6dDbpuSRJsFebuB22VfLcx/yViYhMV/F7ewYPTX3OjKkAJVcCNaDHss8V9FCLWWsQpZafgFbWbOv++i+AV/iQvRrThzs4Ku3lUKN61esKeOoHmKr/dMEKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733886730; c=relaxed/simple; bh=fTLi544gDaKxmJ1r9ykIJA+VWbYGcQfmHnEBCq8NdV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t0NQv+EXkhCv2FmGJAtrhHdN9hvD+d5c8gQDz+PwyOCzwwyQBLivxpcNAUoN1eadwSUCrQe9fU9Q49BileqNIEiEb73mQ9Rmc/u2S9fPO+ilcLfb4OA6LnSK6wkcfpsAH4S/kPLGpf0dSVDYPy1urxzOrqj/8ANyIjf56jBnPGc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m5tgJp+9; 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="m5tgJp+9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8C03C4CED6; Wed, 11 Dec 2024 03:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733886729; bh=fTLi544gDaKxmJ1r9ykIJA+VWbYGcQfmHnEBCq8NdV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m5tgJp+95d41zUXTCyWV3ocEedZRZbU3QYOg20AnRSze4ylNumZRVOfPwfKEuCd/J enRRukfUbPTd2lja6DITlbUj0i351o0f3HTJbzxNH6PaGD97rbV6T/akVSuNN4j5cA ut9siHQLCurmkFpiTfBoaojXP4Zhi3xeWs29IWdHrbpuCvgAAztI/0mC5MTYCwMwS0 XIY/L78JRxY5rUDKw0aeD6AsUauz4nSrM/lyjFsRVuAQmroO5aF+yKC6CCIouVOXEJ 6e+Y3fEw49hI8P56c6WtJks+Xxq2Cbi0dXSipbOcOV4JkbwvUgP4DFzjy8wGfmzukz Xn10ZejBPaD7Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 3/5] Squash to "bpf: Register mptcp common kfunc set" Date: Wed, 11 Dec 2024 11:11:54 +0800 Message-ID: <09a1b24f12b97f7c5737da1e2a0d1ff1e9c35fde.1733886326.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 Drop bpf_mptcp_sk() and bpf_mptcp_subflow_tcp_sock() definitions. Use bpf_skc_to_mptcp_sock() and mptcp_subflow_tcp_sock() in mptcp_subflow bpf_iter selftests instead. Address Martin's comments in v1: - add null-check for bpf_mptcp_subflow_ctx. - add KF_RET_NULL flags for bpf_mptcp_subflow_ctx. - register this kfunc set to BPF_PROG_TYPE_CGROUP_SOCKOPT only, not BPF_PROG_TYPE_UNSPEC. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- net/mptcp/bpf.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 1e8efe9cd4ff..e2a85ada213e 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -222,21 +222,14 @@ struct bpf_iter_mptcp_subflow_kern { =20 __bpf_kfunc_start_defs(); =20 -__bpf_kfunc static struct mptcp_sock *bpf_mptcp_sk(struct sock *sk) -{ - return mptcp_sk(sk); -} - __bpf_kfunc static struct mptcp_subflow_context * bpf_mptcp_subflow_ctx(const struct sock *sk) { - return mptcp_subflow_ctx(sk); -} + if (sk && sk_fullsock(sk) && + sk->sk_protocol =3D=3D IPPROTO_TCP && sk_is_mptcp(sk)) + return mptcp_subflow_ctx(sk); =20 -__bpf_kfunc static struct sock * -bpf_mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow) -{ - return mptcp_subflow_tcp_sock(subflow); + return NULL; } =20 __bpf_kfunc static int @@ -305,9 +298,7 @@ __bpf_kfunc static bool bpf_mptcp_subflow_queues_empty(= struct sock *sk) __bpf_kfunc_end_defs(); =20 BTF_KFUNCS_START(bpf_mptcp_common_kfunc_ids) -BTF_ID_FLAGS(func, bpf_mptcp_sk) -BTF_ID_FLAGS(func, bpf_mptcp_subflow_ctx) -BTF_ID_FLAGS(func, bpf_mptcp_subflow_tcp_sock) +BTF_ID_FLAGS(func, bpf_mptcp_subflow_ctx, KF_RET_NULL) 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) @@ -341,7 +332,7 @@ static int __init bpf_mptcp_kfunc_init(void) int ret; =20 ret =3D register_btf_fmodret_id_set(&bpf_mptcp_fmodret_set); - ret =3D ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_UNSPEC, + ret =3D ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SOCKOPT, &bpf_mptcp_common_kfunc_set); ret =3D ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &bpf_mptcp_sched_kfunc_set); --=20 2.45.2 From nobody Fri Mar 13 13:20:11 2026 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 C5A7B1FBEB0 for ; Wed, 11 Dec 2024 03:12:11 +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=1733886731; cv=none; b=glAEOH+1ob/hkmXQd+SBPbxYl5ZthWhPkCUW22uGtDN5fFf/E55iSVgH7QTPFtKt4gFGRytJXC66/2Gkk5bfYWVxSjoKqGhHQ9y2q3K3Efv5adQvccp+/TWBWXu37dyKl5GZWFW3pAXPy/clUvrJoQBofHT36iHFfoLehYzxF38= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733886731; c=relaxed/simple; bh=PDBrDJi05Q8UiAIfhxiONeZT7FvBxt/RW1GzR0gGdBU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TTT5NJ7X5Ro2WkD/vdSl4ZDA0elVtJQn55N6n15UwPAc1ve9uHdLXd11PNOBRzyPvkKUu6SPSU27gZ7kCqc7yYEhe+lFvW/NLSXdaNEToLdZ5Z47D8KCuiNJTuikUZHiyA0g+esCQlkHjfUFjDDEgR7OIoZlc/bhJkDighQysdM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FDmulhNi; 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="FDmulhNi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78FEAC4CED6; Wed, 11 Dec 2024 03:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733886731; bh=PDBrDJi05Q8UiAIfhxiONeZT7FvBxt/RW1GzR0gGdBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FDmulhNif9iZept6R4OAJDDS2mdreUQjnOAoZiAt/5PeprXzrvNr0OxQJyZFF/Q2S +uZYfT4aSQDYhdsPGQ5kVDAxxWd9ZwSSODYCfTmiwFvUvPeNCaT9Ewj076b2lS7YXO x7LMi0njZHuVBKq+02fhFCj6RkVQ6SF2UcIeL8PNc+y49iP2xIUsNV6jZyrBj5EjhA 1sqInc4pqBT0DZ4juYTMS2+TuZaBTbuuW2eKsP9ifPZ6L1zXP0RaaH8g5XRwpJjBLf 4FnYghk+wKJhmvuETMVJpamEc4Ujt0z8ub7F2lZnfdhR83G5HFi/oe5shd/8i1DGoV GX6ubOG3NyctA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 4/5] Squash to "bpf: Add mptcp_subflow bpf_iter" Date: Wed, 11 Dec 2024 11:11:55 +0800 Message-ID: <5ee4ae1ecdec196e339e472bf759487991839d7f.1733886326.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 Add "sizeof" and "alignof" checks. Address Martin's comments in v1: - bpf_iter_mptcp_subflow_new returns -EINVAL when msk socket lock isn't held. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- net/mptcp/bpf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index e2a85ada213e..923895322b2c 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -237,12 +237,20 @@ bpf_iter_mptcp_subflow_new(struct bpf_iter_mptcp_subf= low *it, struct mptcp_sock *msk) { struct bpf_iter_mptcp_subflow_kern *kit =3D (void *)it; + struct sock *sk =3D (struct sock *)msk; + + BUILD_BUG_ON(sizeof(struct bpf_iter_mptcp_subflow_kern) > + sizeof(struct bpf_iter_mptcp_subflow)); + BUILD_BUG_ON(__alignof__(struct bpf_iter_mptcp_subflow_kern) !=3D + __alignof__(struct bpf_iter_mptcp_subflow)); =20 kit->msk =3D msk; if (!msk) return -EINVAL; =20 - msk_owned_by_me(msk); + if (!sock_owned_by_user_nocheck(sk) && + !spin_is_locked(&sk->sk_lock.slock)) + return -EINVAL; =20 kit->pos =3D &msk->conn_list; return 0; --=20 2.45.2 From nobody Fri Mar 13 13:20:11 2026 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 D6C1B1FECA3 for ; Wed, 11 Dec 2024 03:12: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=1733886733; cv=none; b=CYW7bAzVM6Nvs1JqV5dVbXE6iCvtWg9UMaZzGH/Oi+10u77ZpkN7CwNMxjEHxyU4KV4IeBDiLCCpazNgwsxKJeN/xYPRHWfJQl6bys2p4Tek+agxTlKBx7Uoug0s68EPUp4zC0JPkPlRS5tpDaGV/1Oi9oeC3cp+OAUIbqAzUp4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733886733; c=relaxed/simple; bh=SQV9nesIDZg3IV89hJf9DcNukyegI2kFcLBPZJpMrJg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H+BhLBDymEIVPuWuV7ii9SO5n/hmzRYUYbdWUdG7wK8qJqEW/OXjBfZ3wFOdsFDP71ctoaR9vuvur3u+2qoqbVNT5CvSokso7S17zmTooevJcBjlEiSwv8RrWc9+rInKBqDK59dPrg/p3OEbLGYUimZsmDLRRMUHNKP8kaqR4lQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WfrVZ+kD; 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="WfrVZ+kD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53556C4CEDD; Wed, 11 Dec 2024 03:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733886733; bh=SQV9nesIDZg3IV89hJf9DcNukyegI2kFcLBPZJpMrJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WfrVZ+kDtu4PJtaJzKGP0dtFhgpgeSI0U0ott2HSESYAHmYQQVcgdWNxh1+S1gw0n Q81Ydsq2Gf27P4aCGsAi1m07dwmbjb6Jr3WAnMzFo1+T8ZbCSXQ4+osNhwsOsu4t+3 UXtjoKpw9uZQsHmAMQ0ruBYORI9oH6x9+iHRrQnbweOr2lpk6n5sRb2l8CKeXoEh/K LaV2humIA1l4h4P4CdlkGBa/b7HS9siyybIFfO0BdSW3OKk26lPxhBC5ybmmbd3KPW h92txRsIMRxqmKujRMQojQZ/pVrStOLpE9+GbYMv23pA8fMl/5M2VsAm0dIo6Agddj W37BAgbULQZVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 5/5] Squash to "selftests/bpf: Add mptcp_subflow bpf_iter subtest" Date: Wed, 11 Dec 2024 11:11:56 +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 Use bpf_skc_to_mptcp_sock() and mptcp_subflow_tcp_sock() instead of bpf_mptcp_sk() and bpf_mptcp_subflow_tcp_sock(). IPPROTO_MPTCP is checked in bpf_skc_to_mptcp_sock(), no need to check it in BPF program. bpf_skc_to_mptcp_sock() and bpf_mptcp_subflow_ctx() may return NULL, need to check the return values. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/bpf/progs/mptcp_bpf.h | 1 - tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf.h b/tools/testing/= selftests/bpf/progs/mptcp_bpf.h index 3b20cfd44505..b1f6e1fb467e 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf.h +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf.h @@ -46,7 +46,6 @@ mptcp_subflow_tcp_sock(const struct mptcp_subflow_context= *subflow) extern struct mptcp_sock *bpf_mptcp_sock_acquire(struct mptcp_sock *msk) _= _ksym; extern void bpf_mptcp_sock_release(struct mptcp_sock *msk) __ksym; =20 -extern struct mptcp_sock *bpf_mptcp_sk(struct sock *sk) __ksym; extern struct mptcp_subflow_context * bpf_mptcp_subflow_ctx(const struct sock *sk) __ksym; extern struct sock * 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..fd5691a4073b 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c @@ -21,12 +21,11 @@ int iters_subflow(struct bpf_sockopt *ctx) struct mptcp_sock *msk; int local_ids =3D 0; =20 - if (!sk || sk->protocol !=3D IPPROTO_MPTCP || - ctx->level !=3D SOL_TCP || ctx->optname !=3D TCP_IS_MPTCP) + if (ctx->level !=3D SOL_TCP || ctx->optname !=3D TCP_IS_MPTCP) return 1; =20 - msk =3D bpf_mptcp_sk((struct sock *)sk); - if (msk->pm.server_side || !msk->pm.subflows) + msk =3D bpf_skc_to_mptcp_sock(sk); + if (!msk || msk->pm.server_side || !msk->pm.subflows) return 1; =20 msk =3D bpf_mptcp_sock_acquire(msk); @@ -41,7 +40,7 @@ int iters_subflow(struct bpf_sockopt *ctx) local_ids +=3D subflow->subflow_id; =20 /* only to check the following kfunc works */ - ssk =3D bpf_mptcp_subflow_tcp_sock(subflow); + ssk =3D mptcp_subflow_tcp_sock(subflow); } =20 if (!ssk) @@ -53,7 +52,7 @@ int iters_subflow(struct bpf_sockopt *ctx) =20 /* only to check the following kfunc works */ subflow =3D bpf_mptcp_subflow_ctx(ssk); - if (subflow->token !=3D msk->token) + if (!subflow || subflow->token !=3D msk->token) goto out; =20 ids =3D local_ids; --=20 2.45.2