From nobody Wed Mar 11 23:58:55 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 639AC1EB3D for ; Mon, 9 Dec 2024 08:47: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=1733734043; cv=none; b=PfZtSjfoneXVaya8Aw2Mc7CmqOeoxWqst7dEKMHz+vQ96NvvRbLJIWA6Zo6+iFIyqhpHNlsiIJjtvW760J/JDbZVhBgahLPXMyaDzd5U2eHUgp/Z2j44f+Az8BDelsUMyZXQHx3YSVFtjbXctfyhyVxz7VT1UAQIdl/M9fahWSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733734043; c=relaxed/simple; bh=64HULWyzXDYk7pnekHwq+De85X3l90hy6SwEMfu9TR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sssLVy5kj83vSgTfKn8XNOspJeO2ref00uyMEsM1fZb6mYnIAsLzARSsEue/Xy0Ni0uyXajYADuzyKXh2z0IW6+LEq08S1Q6WL7wk11XRZXJuZTtebXN5DpZQgjCJbFSc+VV6vqmQl2lwmI64+ywkZqkCJpFWcqnbQfyJ6LE6GU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EGslamQh; 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="EGslamQh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8609C4CED1; Mon, 9 Dec 2024 08:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733734043; bh=64HULWyzXDYk7pnekHwq+De85X3l90hy6SwEMfu9TR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EGslamQhotlJo42EqI2Nv9W0gJFqkm+PaAnETWk/DCeMLe3+t4ThdkStHyZN3FJyb XWidNEOp/HNbLjnoEEhW+qs/iFEmRcYZn3KJu3klrKmwzf2A5CTObs4yiL4LdmZNg1 IaKnY72jgVmC2m035l/4grUIDix45VwACKmjp01xvUuR6yTO5TXnBAJqIUvNrgXXZE Eq5U1KmvosdRBN//5PUg5q3APCK4UMhjxXgJsvAFBpynf68etwh4DLrMP/ZP9ohNuQ 8AAUafClrpfF2ChvQ+d166XTbxg4p8bvFe5Nt1lheZi4mz+Z7FLfbWKdW/Q8qVgGZr HStl5nKrBFunQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 1/5] mptcp: update bpf_mptcp_sock_from_subflow Date: Mon, 9 Dec 2024 16:47:12 +0800 Message-ID: <8f9c34611d46f96a0047928ac41b385faf743805.1733733573.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 The input parameter of bpf_mptcp_sock_from_subflow() is an msk subsocket of type IPPROTO_TCP. This patch extends it to accept an IPPROTO_MPTCP socket. With this change, the function name bpf_mptcp_sock_from_subflow is no longer appropriate, and it is renamed to bpf_mptcp_sock_from_sock. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 4 ++-- net/core/filter.c | 2 +- net/mptcp/bpf.c | 4 +++- 3 files changed, 6 insertions(+), 4 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..a0f49af85d57 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -188,8 +188,10 @@ 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_MPTCP) + return mptcp_sk(sk); if (sk && sk_fullsock(sk) && sk->sk_protocol =3D=3D IPPROTO_TCP && sk_is_= mptcp(sk)) return mptcp_sk(mptcp_subflow_ctx(sk)->conn); =20 --=20 2.45.2 From nobody Wed Mar 11 23:58:55 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 452591EB3D for ; Mon, 9 Dec 2024 08:47: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=1733734045; cv=none; b=gMUod8Sy4tyCfvdS2V0byZAGbnFItDFTpnVKPo6enFup5ahej+t8t1ck53JbuGK30B3/GuGp4qt09astFuJsWSSpIV9w1R4MfD+UlOMEWGh4gapw9cVlT+Vsc1OU4IFrM+jMoAYqPfFnY4Bylfydu4mA4Hrf/gob0oj0d68bP6k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733734045; c=relaxed/simple; bh=PDPl9RB/6dCKKUJchPq9UX9loOsc2k2o0XbbZp0CIYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EgB1NwOWFtt6mxQriXGRKfTf4+DuXoPrV8nIunaYElvt6+WCZbbqI4BIY70wMBORYREa9+9a2rOxQZOK1j4sQqmb0fWkwairUWRaPo3Pg2GbWvQhw3JJlw/EH62gW4wGWO4WSy2jJmqtQEdiNzJdkLiABqWK6t0KK2/TIWNzkB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WmWGydXc; 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="WmWGydXc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2841C4CED1; Mon, 9 Dec 2024 08:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733734044; bh=PDPl9RB/6dCKKUJchPq9UX9loOsc2k2o0XbbZp0CIYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WmWGydXc/8+WcDXts8NgMnELrSyCDMlMPXazOh1YDpRa92+wzzU4ssClr0cYQsFMQ H2ZK0IGJiNsdAbN6FHx+TYVo3l9G8GVQXg123525JsA4/YZaAh5kYh8Vec33EAXzyh oHjEobHxf90L3+edLYgwAKaPkcF2u8GDZ0e4sf6bcoCTh0mlwmAjYLa3DHCNuIe7dU vIt/FDnGiJgjxWzC+Sy9YztM3u6x8LaL36fiJtMeHKxwqrfmB4bAg8bfZlJ2JKtWoX eCPGU8gGyCQ1s051dQIaiIz86CXjLqA+3JDfl9HeID6/sttXVZoCWwsNUtVym9Ex3i XoYI4j0+y0NaQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 2/5] bpf: Allow use of skc_to_mptcp_sock in cg_sockopt Date: Mon, 9 Dec 2024 16:47:13 +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() helper is not allowed to be used in cg_sockopt. This patch adds this permission. Signed-off-by: Geliang Tang --- 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 Wed Mar 11 23:58:55 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 ABAAE1EB3D for ; Mon, 9 Dec 2024 08:47: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=1733734048; cv=none; b=UtYLiqvoMkB4VdqPyIZ1AoCwB0078/7aYYGvTY0LAR6AFl+MiNpPJlU3cWBZ708lnhuSgKm00vbhQ6A5QtUBUEm5k8tF7/Pz5Amahyl0sQb+NmRZd9CVyaQ9+Au3uAT/wlXhHnTojblmHYDn70lr5sMesT56IOFT312AnZrbM74= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733734048; c=relaxed/simple; bh=EKbFdwz3S9dXyILkw0Qq2CPn84MHoOZ5plQHQU1nvrE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y/k+d/hf5JSuO53uZa+CxuyQQW4WDSBUnH92kxrsbM+LF4Bo+qkd85Jhsu1/3P6mJ4WsU0ZnnjnYB2SXDnxa+ZxxT1YvqIxOrhSB5Yy2+fy9NZar0oiCFjJRTu6vIUIeHHwHcjvYEz2/ePfyQ03EbKq+heU+u7+QXC7oBevcjPk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KhPrXldX; 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="KhPrXldX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BBE3C4CED1; Mon, 9 Dec 2024 08:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733734046; bh=EKbFdwz3S9dXyILkw0Qq2CPn84MHoOZ5plQHQU1nvrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KhPrXldXF96kGylFUzFGdL6HXhC07mYQl6gUlZvBZO2ODfiGGDuGkpl0BSfbS9Skg V9guxyUG/LbrqZIIRQIyBKNGsGg+qlOReen5YhD60c6bP85dRd1TI4tmc6SXk1Usvv bvj517ho8I5R6V1/W00VvZ0qHwoF48PKoQzAqhEjpF+VaU1pMoYdnyj7D793K1RObr vGeg5pSocDsz59If4kJ7IlyWJUv7N1sNGJqvAFVzOKjl6H3HMo4XbopqTV3/I9TWmi p2cd7l+YpcfPTmGhEnE5UmiokD4s4vytBQ0ex9QzvgKMy1da01O31I+/S9n/ZrP5jA WWij3NGv0ck3A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 3/5] Squash to "bpf: Register mptcp common kfunc set" Date: Mon, 9 Dec 2024 16:47:14 +0800 Message-ID: <1de02f9ee30ee67ec5eb4bfd9bdef9737e6cd4d8.1733733573.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 --- net/mptcp/bpf.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index a0f49af85d57..f9ba0a46a9f1 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -218,21 +218,13 @@ 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) + return NULL; =20 -__bpf_kfunc static struct sock * -bpf_mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow) -{ - return mptcp_subflow_tcp_sock(subflow); + return mptcp_subflow_ctx(sk); } =20 __bpf_kfunc static int @@ -301,9 +293,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) @@ -337,7 +327,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 Wed Mar 11 23:58:55 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 18ED02147EB for ; Mon, 9 Dec 2024 08:47: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=1733734049; cv=none; b=gf4u2rnB0vrp+07uEiDRMs0DlzXcsEN+6UIjv2FD9PgaEoDdnbETDR/LGLy45ydV4eqXB2HILfQn560qyiOcxeg8VHrAxvVRGLKZNA6rjeICQRJtjC0RqzewSBBRWPwHYCwuTh9nQXaMnrlfnxmMkAUGMLhkhbj+USc13wD17rE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733734049; c=relaxed/simple; bh=6Jv1bZiTjeIAnj7+JEcUud5D+MHKJfVYna8mKV9jh/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rs8XK34YDL4MkcL1Cr5QtxR0A1f3y7zuEtP1jzsQCAFS6f0+0C4jevOTdxpFagxSAcsSNJkKyDJ/1fn1m1KZrStCUKFI6/LLINHpj7SP/bZHj2pQy3q6QWLH89GIrCa7sx933NtAyAH1VYm1sMo+ZiY4jL2yvz853uq7Vfot/js= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T4lYV30P; 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="T4lYV30P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55807C4CEDF; Mon, 9 Dec 2024 08:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733734048; bh=6Jv1bZiTjeIAnj7+JEcUud5D+MHKJfVYna8mKV9jh/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T4lYV30PZkBZ6qiQnn9SgYOXbUS8zxKn0IQTdnLctD+Q6Rned9rMRP8RGyRD9kgc6 CRHuOLIqLHRONHw8/F1Qpx9eUQqRrINcER1bHObsT7eKY11iAkRHj28DH0Rjb/lTE+ W/1PpO2bwz4/c29tgCfFI9yW5LHrDYiZavYDzwgW9VXWWgc6ijDI7UAQIVsXAaXLf9 wOJ/9VTFs3eFBSHdJwYkQ0wZMUZfqinVM/zoV00js1T+BBV/tSQmhgoYTUY0DfPdKi Asilzn0SJc8EZWCo//y84K7rh1KGw8eaSK9glSBdkzPNBzvEgShLEHRGsZmz+0cOAj TD7zEtaU1IpCw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 4/5] Squash to "bpf: Add mptcp_subflow bpf_iter" Date: Mon, 9 Dec 2024 16:47:15 +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 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 --- 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 f9ba0a46a9f1..0563d3c6d9d3 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -232,12 +232,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 Wed Mar 11 23:58:55 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 E02872147EB for ; Mon, 9 Dec 2024 08:47:30 +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=1733734051; cv=none; b=XhK54CgsXwv7ikC7xpLB/N0Y59i+0BBuO7lZ0R4aPGZeCno5Js7cFThhl0dYjqNRRxGKH2OJ4SEu1G4qJrApZJAOmvPynd5P6Qn7dM25suG1YcvK80cHL4gzg1VtutnbLLiLn4fx207UyKVu+nA7A1EFMMUAp0sN9tADTVv0cto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733734051; c=relaxed/simple; bh=SQV9nesIDZg3IV89hJf9DcNukyegI2kFcLBPZJpMrJg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ifqz5BRUVSeK+76fRUQEzOQLwqVQvyauwLhARxZl3DM8T3m7YbTOaQymLeGgClXyq8KUDHUbW3gWB90DnFH2GeNMe+EuikNcqcfzGtQzpVYsp0zZWIj/NKDdgKLXQNyjH9pwbw6wCp+XECecvxvRr4i7vsvr9RYbPFnkiiHK868= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IzH/J0ph; 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="IzH/J0ph" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48094C4CED1; Mon, 9 Dec 2024 08:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733734050; bh=SQV9nesIDZg3IV89hJf9DcNukyegI2kFcLBPZJpMrJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IzH/J0phb9ZBi6kokH38xBkR+F5YFS7iUfxCqOoPaQo0dZJORAdE96YFY2EZXPenw B8YBgTlP/DDIUxWlqRDV1Zri7/hqXgdaG3WOgGJ2ksD1T9JKF97oS0ZKh00b/Kovuo bEt5hmbosjyms17zYEhBZHCXcPQZwkMkBG6OZfILainJiXOC7gTVlI4Ar10a7ZRX6f dbAku99jmFpDTHKWnSiTHjYt85upsiRGJ5sixX6Hd9J4rNaZgvZG9hkeK9wxnVju5Q QZG6UTaUy6TK2J9raFK3v1MhY19wHSbilrBBpJ+Pk/8NURbNZx0fpXPaYRRvezFUx2 j0xuoWw3WpWpw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 5/5] Squash to "selftests/bpf: Add mptcp_subflow bpf_iter subtest" Date: Mon, 9 Dec 2024 16:47:16 +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 --- 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