From nobody Thu Nov 27 12:37:15 2025 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 4BFB721D3F5 for ; Wed, 19 Nov 2025 10:05:31 +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=1763546731; cv=none; b=r02hMBR60+wYj+Pb6AyoQZ6mpL79V7arwwYLhsXrpVAjiRiK23tB4fFmySgQFkFKF4wMO+F2VzRO41HWitvie1OltfUgIXyEX3pvFc1wBKW/at3vwnsAPn8Rpb+XZLc/afmQPDbxY+SWj8K/t2d/mNOO4uy0OaYruiAR5ZwwiQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546731; c=relaxed/simple; bh=ItBcX26JNOnEC0ZuUYWho7yseHT2YnYMj5yO1XhXd74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IiJ4XCJBiOtvYh+M3GE5LPAKKY7oszYUjYQPR+rSZ3JOmq7vb9QgjjhuPmz3xOs9nuTnWj3SV9ZTcgJ0CJE3wethavPZ3a3DjukCdT1jWOKNmn9G0f5FYt6UbXqalHfpYb9UAZWuTOBEusbrskvm7wVXKtZV2aSGodOPwG1YnGY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OvwC/M7Z; 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="OvwC/M7Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 922E7C2BC86; Wed, 19 Nov 2025 10:05:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546730; bh=ItBcX26JNOnEC0ZuUYWho7yseHT2YnYMj5yO1XhXd74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OvwC/M7Z2QJzax4fKc6s+CnKZMRBSiEbF5Wk8lHjaOH3JV45bWmWNvHKgd4pB7ezp uUY/B/k3bHZUBbl6aCuqYgztbrCBTyT3utekKbd/0cPLxT9kQQozEY9MmcrJ5bPkfj AKIfSZwIzRsW5VwHBWk9Gz3XCObtLPFjaN4lqSeerLxk74voNTnbAOmQGpuCUOR9ZD ZgO17+tN8MeCNk4t9ZyuoxfGZG2zkt8o1y8znLH6CAvHyr2yumCz44cNBDLrSeefeA 19csma+7yz/emlBbH9agDSQFRUx9nG+VtlWvMX1/fD5wIbqzmU6Fvt1gLhFiBhb/hU 6pDRn0HY48ujg== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v2 1/8] tls: add MPTCP protocol support Date: Wed, 19 Nov 2025 18:05:00 +0800 Message-ID: X-Mailer: git-send-email 2.51.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 Extend TLS subsystem to support MPTCP protocol by implementing MPTCP-specific versions of key operations: - mptcp_sendmsg_locked() for TLS record transmission; - mptcp_inq_hint() and mptcp_recv_skb() for receive side handling; - mptcp_read_sock() and mptcp_read_done() for data reading; - mptcp_disconnect() for disconnect. Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/mptcp.h | 42 ++++++++++++++++++++++++++++ net/mptcp/protocol.c | 66 ++++++++++++++++++++++++++++++++++++-------- net/tls/tls_main.c | 6 +++- net/tls/tls_strp.c | 20 +++++++++++--- 4 files changed, 118 insertions(+), 16 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4cf59e83c1c5..ffbbeb08a8be 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -237,6 +237,19 @@ static inline __be32 mptcp_reset_option(const struct s= k_buff *skb) } =20 void mptcp_active_detect_blackhole(struct sock *sk, bool expired); + +int mptcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t len); + +unsigned int mptcp_inq_hint(const struct sock *sk); + +struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off); + +int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor); + +void mptcp_read_done(struct sock *sk, size_t len); + +int mptcp_disconnect(struct sock *sk, int flags); #else =20 static inline void mptcp_init(void) @@ -323,6 +336,35 @@ static inline struct request_sock *mptcp_subflow_reqsk= _alloc(const struct reques static inline __be32 mptcp_reset_option(const struct sk_buff *skb) { retu= rn htonl(0u); } =20 static inline void mptcp_active_detect_blackhole(struct sock *sk, bool exp= ired) { } + +static inline int mptcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, + size_t len) +{ + return 0; +} + +static inline unsigned int mptcp_inq_hint(const struct sock *sk) +{ + return 0; +} + +static inline struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off) +{ + return NULL; +} + +static inline int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor) +{ + return 0; +} + +static inline void mptcp_read_done(struct sock *sk, size_t len) { } + +static inline int mptcp_disconnect(struct sock *sk, int flags) +{ + return 0; +} #endif /* CONFIG_MPTCP */ =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b31724523ed5..e5e2ba1cd976 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1752,8 +1752,6 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool } } =20 -static int mptcp_disconnect(struct sock *sk, int flags); - static int mptcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, size_t len, int *copied_syn) { @@ -1862,7 +1860,7 @@ static void mptcp_rps_record_subflows(const struct mp= tcp_sock *msk) } } =20 -static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) +int mptcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t len) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct page_frag *pfrag; @@ -1873,8 +1871,6 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) /* silently ignore everything else */ msg->msg_flags &=3D MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_FASTOPEN; =20 - lock_sock(sk); - mptcp_rps_record_subflows(msk); =20 if (unlikely(inet_test_bit(DEFER_CONNECT, sk) || @@ -1982,7 +1978,6 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) __mptcp_push_pending(sk, msg->msg_flags); =20 out: - release_sock(sk); return copied; =20 do_error: @@ -1993,6 +1988,17 @@ static int mptcp_sendmsg(struct sock *sk, struct msg= hdr *msg, size_t len) goto out; } =20 +static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) +{ + int ret; + + lock_sock(sk); + ret =3D mptcp_sendmsg_locked(sk, msg, len); + release_sock(sk); + + return ret; +} + static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied); =20 static void mptcp_eat_recv_skb(struct sock *sk, struct sk_buff *skb) @@ -2224,7 +2230,7 @@ static bool mptcp_move_skbs(struct sock *sk) return enqueued; } =20 -static unsigned int mptcp_inq_hint(const struct sock *sk) +unsigned int mptcp_inq_hint(const struct sock *sk) { const struct mptcp_sock *msk =3D mptcp_sk(sk); const struct sk_buff *skb; @@ -3329,7 +3335,7 @@ static void mptcp_destroy_common(struct mptcp_sock *m= sk) mptcp_pm_destroy(msk); } =20 -static int mptcp_disconnect(struct sock *sk, int flags) +int mptcp_disconnect(struct sock *sk, int flags) { struct mptcp_sock *msk =3D mptcp_sk(sk); =20 @@ -4271,7 +4277,7 @@ static __poll_t mptcp_poll(struct file *file, struct = socket *sock, return mask; } =20 -static struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off) +struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct sk_buff *skb; @@ -4295,8 +4301,8 @@ static struct sk_buff *mptcp_recv_skb(struct sock *sk= , u32 *off) * Note: * - It is assumed that the socket was locked by the caller. */ -static int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, - sk_read_actor_t recv_actor) +int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor) { struct mptcp_sock *msk =3D mptcp_sk(sk); size_t len =3D sk->sk_rcvbuf; @@ -4453,6 +4459,44 @@ static ssize_t mptcp_splice_read(struct socket *sock= , loff_t *ppos, return ret; } =20 +void mptcp_read_done(struct sock *sk, size_t len) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct sk_buff *skb; + size_t left; + u32 offset; + + msk_owned_by_me(msk); + + if (sk->sk_state =3D=3D TCP_LISTEN) + return; + + left =3D len; + while (left && (skb =3D mptcp_recv_skb(sk, &offset)) !=3D NULL) { + int used; + + used =3D min_t(size_t, skb->len - offset, left); + left -=3D used; + msk->bytes_consumed +=3D used; + MPTCP_SKB_CB(skb)->offset +=3D used; + MPTCP_SKB_CB(skb)->map_seq +=3D used; + + if (skb->len > offset + used) + break; + + mptcp_eat_recv_skb(sk, skb); + } + + mptcp_rcv_space_adjust(msk, len - left); + + /* Clean up data we have read: This will do ACK frames. */ + if (left !=3D len) { + mptcp_recv_skb(sk, &offset); + mptcp_cleanup_rbuf(msk, len - left); + } +} +EXPORT_SYMBOL(mptcp_read_done); + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 56ce0bc8317b..7d7bde1702c1 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -194,7 +194,9 @@ int tls_push_sg(struct sock *sk, bvec_set_page(&bvec, p, size, offset); iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); =20 - ret =3D tcp_sendmsg_locked(sk, &msg, size); + ret =3D sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_sendmsg_locked(sk, &msg, size) : + tcp_sendmsg_locked(sk, &msg, size); =20 if (ret !=3D size) { if (ret > 0) { @@ -907,6 +909,8 @@ static int tls_setsockopt(struct sock *sk, int level, i= nt optname, =20 static int tls_disconnect(struct sock *sk, int flags) { + if (sk->sk_protocol =3D=3D IPPROTO_MPTCP) + return mptcp_disconnect(sk, flags); return -EOPNOTSUPP; } =20 diff --git a/net/tls/tls_strp.c b/net/tls/tls_strp.c index 98e12f0ff57e..3985e77f3351 100644 --- a/net/tls/tls_strp.c +++ b/net/tls/tls_strp.c @@ -132,6 +132,8 @@ int tls_strp_msg_cow(struct tls_sw_context_rx *ctx) tls_strp_anchor_free(strp); strp->anchor =3D skb; =20 + strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_read_done(strp->sk, strp->stm.full_len) : tcp_read_done(strp->sk, strp->stm.full_len); strp->copy_mode =3D 1; =20 @@ -383,6 +385,8 @@ static int tls_strp_read_copyin(struct tls_strparser *s= trp) desc.count =3D 1; /* give more than one skb per call */ =20 /* sk should be locked here, so okay to do read_sock */ + strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_read_sock(strp->sk, &desc, tls_strp_copyin) : tcp_read_sock(strp->sk, &desc, tls_strp_copyin); =20 return desc.error; @@ -464,8 +468,10 @@ static void tls_strp_load_anchor_with_queue(struct tls= _strparser *strp, int len) struct sk_buff *first; u32 offset; =20 - first =3D tcp_recv_skb(strp->sk, tp->copied_seq, &offset); - if (WARN_ON_ONCE(!first)) + first =3D strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_recv_skb(strp->sk, &offset) : + tcp_recv_skb(strp->sk, tp->copied_seq, &offset); + if (!first) return; =20 /* Bestow the state onto the anchor */ @@ -490,7 +496,9 @@ bool tls_strp_msg_load(struct tls_strparser *strp, bool= force_refresh) DEBUG_NET_WARN_ON_ONCE(!strp->stm.full_len); =20 if (!strp->copy_mode && force_refresh) { - if (unlikely(tcp_inq(strp->sk) < strp->stm.full_len)) { + if (unlikely((strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_inq_hint(strp->sk) : + tcp_inq(strp->sk)) < strp->stm.full_len)) { WRITE_ONCE(strp->msg_ready, 0); memset(&strp->stm, 0, sizeof(strp->stm)); return false; @@ -513,7 +521,9 @@ static int tls_strp_read_sock(struct tls_strparser *str= p) { int sz, inq; =20 - inq =3D tcp_inq(strp->sk); + inq =3D strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_inq_hint(strp->sk) : + tcp_inq(strp->sk); if (inq < 1) return 0; =20 @@ -586,6 +596,8 @@ void tls_strp_msg_done(struct tls_strparser *strp) WARN_ON(!strp->stm.full_len); =20 if (likely(!strp->copy_mode)) + strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_read_done(strp->sk, strp->stm.full_len) : tcp_read_done(strp->sk, strp->stm.full_len); else tls_strp_flush_anchor_copy(strp); --=20 2.51.0 From nobody Thu Nov 27 12:37:15 2025 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 4365F3346A6 for ; Wed, 19 Nov 2025 10:05:33 +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=1763546733; cv=none; b=Jv89IYhzGQae2UWet/94XVfkCV4A3BL+bIUFxjwXPeslp+IAqfOMQfj8DwM02vILHIQ9Ktpe9e9UAFgH+Q2U+lQSZvZM2Rj3fZGH4TkOQojJXd76zC9oDjkhKIUB57cboRIenajaBQ3ANyEZ8/ntxdrgXlhMkP5QWa4tET9yvEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546733; c=relaxed/simple; bh=wI41m9xxWX7xZoCdF0d8Q5gacVsSsY3DvlvG83+6MQo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L1Gut50Vm1lU1agtmOZiEoYbqAyWIWLlMZEqDZiypAVIhhW6vtoaw7mlREflAMclu4mBtNT5X/jiyOnhFlV0DySnltWFR/zk3paxRK3kiXVKnEW64rGUtd063RJf9f+vPAPiRWAYOvS+heE/DTFNmZS8pZybBt5eXA4s28CqfD4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HETb3KkF; 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="HETb3KkF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06844C2BC87; Wed, 19 Nov 2025 10:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546733; bh=wI41m9xxWX7xZoCdF0d8Q5gacVsSsY3DvlvG83+6MQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HETb3KkFHDUi6cIKVsnH2Nr2nx89cMy094sNb+sbOtrHU+lU3Fqx7u9rNier04JM3 MA0YxpijkY2XiszUCGKrZKUQ/kZxc8l6C7p3E7l1oJR8Colqt8d3MCtaJl8FFY0YzU l4omZv5e4+Y2GU4ON38fOk+Ivs3B2oynhGo8lvlKzlHcmHvCj+AP/7CY+UeCHbSSmF y5FnHrwoo8q4FIY45fsZuH2CZYofoSHRbTccdeFLAlqPcGkQ9rl8OU3S1OjkccNH4Z KfeEsaI1K0oBcbNezKThIKmseui6u7R6d1umF/5eRlhORZkQwG8arRmMCrLE7yi1f9 v2BYAk26S9Z2g== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v2 2/8] mptcp: enable TLS setsockopt Date: Wed, 19 Nov 2025 18:05:01 +0800 Message-ID: <7332355ce3ab08926cc4c18a12ff7daed239cff5.1763546473.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.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 Add support for TLS-related socket options in MPTCP protocol: - Allow TCP_ULP option with "tls" parameter; - Support TLS_TX and TLS_RX options from SOL_TLS level; - Delegate TLS option handling to underlying TCP implementation. Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/sockopt.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index de90a2897d2d..54ad674da151 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "protocol.h" =20 #define MIN_INFO_OPTLEN_SIZE 16 @@ -567,6 +568,7 @@ static bool mptcp_supported_sockopt(int level, int optn= ame) case TCP_FASTOPEN_CONNECT: case TCP_FASTOPEN_KEY: case TCP_FASTOPEN_NO_COOKIE: + case TCP_ULP: return true; } =20 @@ -576,6 +578,13 @@ static bool mptcp_supported_sockopt(int level, int opt= name) * TCP_REPAIR_WINDOW are not supported, better avoid this mess */ } + if (level =3D=3D SOL_TLS) { + switch (optname) { + case TLS_TX: + case TLS_RX: + return true; + } + } return false; } =20 @@ -819,11 +828,18 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock= *msk, int optname, sockptr_t optval, unsigned int optlen) { struct sock *sk =3D (void *)msk; + char ulp[4] =3D ""; int ret, val; =20 switch (optname) { case TCP_ULP: - return -EOPNOTSUPP; + if (copy_from_user(ulp, optval.user, 4)) + return -EFAULT; + if (strcmp(ulp, "tls\0")) + return -EOPNOTSUPP; + if ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) + return -EINVAL; + return tcp_setsockopt(sk, SOL_TCP, optname, optval, optlen); case TCP_CONGESTION: return mptcp_setsockopt_sol_tcp_congestion(msk, optval, optlen); case TCP_DEFER_ACCEPT: --=20 2.51.0 From nobody Thu Nov 27 12:37:15 2025 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 38CC1274B2E for ; Wed, 19 Nov 2025 10:05:35 +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=1763546736; cv=none; b=eCGpJTak0yJHC+iQvlwPgp9XzG+PsqH7yeRH4V7nNK5Mkr9zL/H19rt9af+7ufo/rNjZfUjDK6y6uvSboCCkXVWpN31A8AA5eCtQ51QGQHdAqO1pWmxlupO0OOs4AYJwLL7NPdYTzbaFiLo29vgWSqTd1ekSQoVmxPF55083bvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546736; c=relaxed/simple; bh=CXIEd2zkZciP19HeuLiQcf2rhqR3ifkT7q2ezeX0Z/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UE4iOlE+7iptdonGlFCs5vdnHa1gqQ4XnuyXh0QQqvmjTXH7MXvE33jgH06iAEjNY9WegQIUht6ayBGvLmvU2h9vEChhne97R5+HkTwH2Dwq+nPT3QCQaYvSdSZ3ehewUCI6MjctNjssetAMnhVRjuljJBBuBE2QZYZReyflqes= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sfqDXL1M; 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="sfqDXL1M" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEBD3C19421; Wed, 19 Nov 2025 10:05:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546735; bh=CXIEd2zkZciP19HeuLiQcf2rhqR3ifkT7q2ezeX0Z/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sfqDXL1MtPbzDZ6J8q5Uj4uozUPQSYlo5pwf6yqmi8OKxQXMuzfqqgbTf5N6UjoYX Q9sQHpE+XeaorJDokXxB8a/7SAVNxAGRJW89AFgX/z11hL3liYWrG/U1MUI+6+p3Yr GTHg2OJUwkOn4Osx0S0Bmv+u4ELJxLEsbuRb2C58JxFtulQdJ3Sluc7Ec3LFz6rX4t 95bQyxgkTw10dkjKpNXqjJk3LJ1shoqjr+jWHwO9Mi09PC5eX/Oj7AaZ36VcWD2e0F FavxTTRrCJDohkN0g9TI+J9jn3tsnG5OcGTX0pXUxo1Irw0ECQRwx80p4LusBGmgwz noKDaceyDg0BQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang Subject: [RFC mptcp-next v2 3/8] mptcp: update ULP getsockopt Date: Wed, 19 Nov 2025 18:05:02 +0800 Message-ID: <397d591df64c3d1c9267c99a2c9d4255490beff6.1763546473.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.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 TCP_ULP was obtained by calling mptcp_getsockopt_first_sf_only() to get the ULP of the first subflow. Now that the mechanism has changed, a new helper needs to be implemented to get the ULP of the msk. Signed-off-by: Geliang Tang --- net/mptcp/sockopt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 54ad674da151..52ff75702404 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1409,6 +1409,17 @@ static int mptcp_put_int_option(struct mptcp_sock *m= sk, char __user *optval, return 0; } =20 +static int mptcp_getsockopt_msk(struct sock *sk, int level, int optname, + char __user *optval, int __user *optlen) +{ + int ret; + + lock_sock(sk); + ret =3D tcp_getsockopt(sk, level, optname, optval, optlen); + release_sock(sk); + return ret; +} + static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname, char __user *optval, int __user *optlen) { @@ -1416,6 +1427,7 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock= *msk, int optname, =20 switch (optname) { case TCP_ULP: + return mptcp_getsockopt_msk(sk, SOL_TCP, optname, optval, optlen); case TCP_CONGESTION: case TCP_INFO: case TCP_CC_INFO: --=20 2.51.0 From nobody Thu Nov 27 12:37:15 2025 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 8AA8032D7FC for ; Wed, 19 Nov 2025 10:05:38 +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=1763546738; cv=none; b=QXkU/KN8zGNbMSnq5YA98y091C8eObs/DgLQQTOcfUuWe4CWxIXANEo+Yn/FHs5PuEN6J+yfRUEEohIxsfMnWUHRWY/nPQ9Sh4C+/MFPciG4d2X5bhoX11+mmgLSAvEcVyXutNpvVptFdvKIn8jbbEyZdbU39wMWReNzkzY2Iyw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546738; c=relaxed/simple; bh=Dt0shIeVMEA2HPY3UF5xjD57QUMX00XkWetIBuomlMQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OnvNLAeKwa35jQWHcO6zFihjjrKETi97sWBg1c1eq5MIV1iRaKqecmA659rGhg6U3MYAx8MAoMyKDaXS7w8BVy8hcDd/0BvgL63VTzRhK5tNCAr1Ry4Ob1QPUlaXTdOfM2TVuh4tlABV4M12w8PqYmh5oKAqEgtFeGD7aNYO8FQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ssNxNcko; 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="ssNxNcko" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4548CC4AF09; Wed, 19 Nov 2025 10:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546737; bh=Dt0shIeVMEA2HPY3UF5xjD57QUMX00XkWetIBuomlMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ssNxNckoyKmZARRxkkdbDwKy7Q2gkZIoSXFw0sTF4bnNejzsu4Vw97zhnFH6LD0XC sv6xn0SSmDdhcvPn3jPE5VakYWtrPQFFbt050IFcbR8Szv/Oem6F1Og48glOACEXvb vfmCYma5/NmPAi2abq/nOUy455wkJhjMEoH1Xoiy4MG8u8cEG/jVEVHyRBershWXl0 sV+DVDHyX+B5BMRzd3BsBQ6Q6EB2SSFkEOtKgv2Et/o7VL6LeE+9M/C+hY4ewr8b7Q f04hIVXdUQn3uNq7zBpziPwIyGnMXDzMQTQHMGdhnysldhZa4g0mJZa7x138WV1/lh aEzK620mcMPZw== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang Subject: [RFC mptcp-next v2 4/8] selftests: mptcp: connect: update sock_test_tcpulp Date: Wed, 19 Nov 2025 18:05:03 +0800 Message-ID: X-Mailer: git-send-email 2.51.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 Improve sock_test_tcpulp() function to properly validate TLS ULP setup on MPTCP sockets. The updated logic verifies that TLS can be correctly configured based on the socket protocol type and state. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.c | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index 2e50d6f93640..badb04b58a64 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -266,13 +266,25 @@ static void set_mptfo(int fd, int pf) perror("TCP_FASTOPEN"); } =20 +static int is_mptcp(int fd) +{ + socklen_t optlen; + int mptcp =3D 0; + + optlen =3D sizeof(mptcp); + if (getsockopt(fd, IPPROTO_TCP, TCP_IS_MPTCP, &mptcp, &optlen) =3D=3D -1) + perror("TCP_IS_MPTCP"); + + return mptcp; +} + static int do_ulp_so(int sock, const char *name) { return setsockopt(sock, IPPROTO_TCP, TCP_ULP, name, strlen(name)); } =20 #define X(m) xerror("%s:%u: %s: failed for proto %d at line %u", __FILE__,= __LINE__, (m), proto, line) -static void sock_test_tcpulp(int sock, int proto, unsigned int line) +static void sock_test_tcpulp(int sock, int proto, int r, unsigned int line) { socklen_t buflen =3D 8; char buf[8] =3D ""; @@ -282,14 +294,14 @@ static void sock_test_tcpulp(int sock, int proto, uns= igned int line) X("getsockopt"); =20 if (buflen > 0) { - if (strcmp(buf, "mptcp") !=3D 0) + if (strcmp(buf, is_mptcp(sock) ? "tls" : "mptcp") !=3D 0) xerror("unexpected ULP '%s' for proto %d at line %u", buf, proto, line); ret =3D do_ulp_so(sock, "tls"); - if (ret =3D=3D 0) + if (ret !=3D r) X("setsockopt"); } else if (proto =3D=3D IPPROTO_MPTCP) { ret =3D do_ulp_so(sock, "tls"); - if (ret !=3D -1) + if (ret !=3D r) X("setsockopt"); } =20 @@ -300,7 +312,7 @@ static void sock_test_tcpulp(int sock, int proto, unsig= ned int line) #undef X } =20 -#define SOCK_TEST_TCPULP(s, p) sock_test_tcpulp((s), (p), __LINE__) +#define SOCK_TEST_TCPULP(s, p, r) sock_test_tcpulp((s), (p), (r), __LINE__) =20 static int sock_listen_mptcp(const char * const listenaddr, const char * const port) @@ -325,7 +337,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, if (sock < 0) continue; =20 - SOCK_TEST_TCPULP(sock, cfg_sock_proto); + SOCK_TEST_TCPULP(sock, cfg_sock_proto, -1); =20 if (-1 =3D=3D setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) @@ -352,7 +364,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, return sock; } =20 - SOCK_TEST_TCPULP(sock, cfg_sock_proto); + SOCK_TEST_TCPULP(sock, cfg_sock_proto, -1); =20 if (listen(sock, 20)) { perror("listen"); @@ -360,7 +372,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, return -1; } =20 - SOCK_TEST_TCPULP(sock, cfg_sock_proto); + SOCK_TEST_TCPULP(sock, cfg_sock_proto, -1); =20 return sock; } @@ -388,7 +400,7 @@ static int sock_connect_mptcp(const char * const remote= addr, continue; } =20 - SOCK_TEST_TCPULP(sock, proto); + SOCK_TEST_TCPULP(sock, proto, -1); =20 if (cfg_mark) set_mark(sock, cfg_mark); @@ -425,7 +437,7 @@ static int sock_connect_mptcp(const char * const remote= addr, =20 freeaddrinfo(addr); if (sock !=3D -1) - SOCK_TEST_TCPULP(sock, proto); + SOCK_TEST_TCPULP(sock, proto, is_mptcp(sock) ? 0 : -1); return sock; } =20 @@ -1202,7 +1214,7 @@ int main_loop_s(int listensock) xerror("can't open %s: %d", cfg_input, errno); } =20 - SOCK_TEST_TCPULP(remotesock, 0); + SOCK_TEST_TCPULP(remotesock, 0, 0); =20 memset(&winfo, 0, sizeof(winfo)); err =3D copyfd_io(fd, remotesock, 1, true, &winfo); @@ -1381,7 +1393,7 @@ int main_loop(void) again: check_getpeername_connect(fd); =20 - SOCK_TEST_TCPULP(fd, cfg_sock_proto); + SOCK_TEST_TCPULP(fd, cfg_sock_proto, -1); =20 if (cfg_rcvbuf) set_rcvbuf(fd, cfg_rcvbuf); --=20 2.51.0 From nobody Thu Nov 27 12:37:15 2025 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 AA460346790 for ; Wed, 19 Nov 2025 10:05:40 +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=1763546740; cv=none; b=AepZyFjUPDPW+mwI1gCaWyOenDKgtJIEaEIBji3J45dhbM0aHBusKk417FcCY7ECsjswmSTPMtFrtnxVGCAYwOd/F2FPfcurc3xJSVq4TtvzsuqufXJBvXGZEcChW0U+qwjN430K1rXMlr73oig/Oc8Wcl025Urc9MLzYXhw8YM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546740; c=relaxed/simple; bh=qyFKIDIWadRIL7qHqTNHoDu9Bua1Wu4TocWIR0mYghg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GU8OXqDP9Y0ky7jYx6AZr9KGwKwcjE0y6i1AEakTq8d7tQpTmTSr/NbcAbCyL6Slv9N3AWWi6yS/DVBTsVg2zDXD+1gnZY0QJYDPG1xbW8uZq9izXfPUMASh/WIbE0d72ssmD94oJslzAWiO7WbfvOUpA5CCf3K2kQa/2xYb2L0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Wmzb7JMx; 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="Wmzb7JMx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80AB6C116B1; Wed, 19 Nov 2025 10:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546740; bh=qyFKIDIWadRIL7qHqTNHoDu9Bua1Wu4TocWIR0mYghg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wmzb7JMxntBhpkWEyqisPlyLPB3EQwzkTJXIHOdjKHgCl9ZRcRWIUhU3L6HuMI4zA 9B+jPQlAtNnlRAn7rO2WHh1YJuHW0evE6TIJOigDi19qiDMA9i7WxQ/XQlkakGp459 8q6uBky3t0tBLgsaEHJKecLkzxf93Zr4u3vXYepq+DXVFcF2I+L+Oor9SVpr0wsKv8 EZCNCc+iYeABIP93v2xOnAQsleF9eeXBgBGlAFDK28AngvPimR1B1BtU5BaoafRyXj 8r7CkWajPdAkAD/lPd6g3zK1GL0ysyxbcK1RYwaItmxcsBhOvWr8m0ShUEOh0IxZ5T sbPv01g/zMp0g== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang Subject: [RFC mptcp-next v2 5/8] selftests: mptcp: connect: fix uninitialized peer warning Date: Wed, 19 Nov 2025 18:05:04 +0800 Message-ID: <43931d38bed6e47b1b68d3bdf0a13916a926d190.1763546473.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.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 Initialize 'peer' addrinfo pointer to NULL in main_loop() to fix the following compiler warning: 1415:37: warning: 'peer' may be used uninitialized [-Wmaybe-uninitialized] 1415 | if (connect(fd, peer->ai_addr, peer->ai_addrlen)) | ~~~~^~~~~~~~~ 1368:26: note: 'peer' was declared here 1368 | struct addrinfo *peer; | ^~~~ Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index badb04b58a64..4d7016475218 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -1376,7 +1376,7 @@ void xdisconnect(int fd) int main_loop(void) { int fd =3D 0, ret, fd_in =3D 0; - struct addrinfo *peer; + struct addrinfo *peer =3D NULL; struct wstate winfo; =20 if (cfg_input && cfg_sockopt_types.mptfo) { @@ -1414,7 +1414,7 @@ int main_loop(void) =20 if (cfg_truncate > 0) { shutdown(fd, SHUT_WR); - } else if (--cfg_repeat > 0) { + } else if (--cfg_repeat > 0 && peer) { xdisconnect(fd); =20 /* the socket could be unblocking at this point, we need the --=20 2.51.0 From nobody Thu Nov 27 12:37:15 2025 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 0487032D455 for ; Wed, 19 Nov 2025 10:05: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=1763546743; cv=none; b=uhjrjE+jYR7klldTRH2fpiDGP2Qe5f463aoS5L+c64wBVmG9Cql0dlrkmST0JpddOOiOMmUzWWt2zTrEH+Vxe7wHA/GF+qDg+WQClI/SOF65IWQd2aXvSc1J+bP01ZMUi0XXTFyg+YYO0Q8a17Cr33RVZeI141NE69JtIr6t0MY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546743; c=relaxed/simple; bh=mhcKCnPpm4791oDOPR7omwuP+5PqPb18qXF68Pm8uns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QdAQVTcCh2AkmnFlrya6CdN+maDIRdJwQNJaj30p5Dq34O3Qx0NqZ3FIOxRXWANaXVQzX/JQ3/hxN9MbAMZXdmY2ABTpfMU7vTwfxeIY2ewqQBpHvppgx9JoWtUzC/iBZRINJ7eE9QDiBTACkN4QHzapA9GI04eO04jhPeVsIJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h5RtE0gK; 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="h5RtE0gK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7425C2BCB1; Wed, 19 Nov 2025 10:05:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546742; bh=mhcKCnPpm4791oDOPR7omwuP+5PqPb18qXF68Pm8uns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h5RtE0gK46fRfd9X7E3z0p4LX1B+ekDXI3mK4kp1awI8qf2joXCn7HM48vN+CIfwU p61nqeXAt8Vxa+S4TYNLHU0aYyxGroFCbwkt7jQBljxJpoDgBYvsgkBrBYXnRrrE9F Xt7+FFo3T5jmuUuGScBFOW+b22ussJ9B2WHkacbb3GFHN0HB/Li1Gc00UuNkpa2679 vGoLp02WuUOD3G70Ey9Ia/9NhwIQvSDp+YuU5NPQsedfXr7/C2DUPkKftJARR0M5S5 /ErmiWCVRk8ZdAzHFU63eZ9ZJaLGnS6Ifcub2bgSZJyOnWUCWLxT4TzpCl+VqufGUX +dD01dmS16xIQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang Subject: [RFC mptcp-next v2 6/8] selftests: mptcp: sockopt: add protocol arguments Date: Wed, 19 Nov 2025 18:05:05 +0800 Message-ID: <7da7a6b40b337cff2a0477456d6d6e0e99f04e9e.1763546473.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.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 Add -t and -r options to specify tx/rx protocols (TCP/MPTCP). This increases testing flexibility by allowing explicit protocol selection for both transmission and reception paths. These codes are from mptcp_inq.c. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 286164f7246e..e4752f848f08 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -27,6 +27,8 @@ #include =20 static int pf =3D AF_INET; +static int proto_tx =3D IPPROTO_MPTCP; +static int proto_rx =3D IPPROTO_MPTCP; =20 #ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262 @@ -135,7 +137,7 @@ static void die_perror(const char *msg) =20 static void die_usage(int r) { - fprintf(stderr, "Usage: mptcp_sockopt [-6]\n"); + fprintf(stderr, "Usage: mptcp_sockopt [-6] [-t tcp|mptcp] [-r tcp|mptcp]\= n"); exit(r); } =20 @@ -201,7 +203,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, hints.ai_family =3D pf; =20 for (a =3D addr; a; a =3D a->ai_next) { - sock =3D socket(a->ai_family, a->ai_socktype, IPPROTO_MPTCP); + sock =3D socket(a->ai_family, a->ai_socktype, proto_rx); if (sock < 0) continue; =20 @@ -259,11 +261,22 @@ static int sock_connect_mptcp(const char * const remo= teaddr, return sock; } =20 +static int protostr_to_num(const char *s) +{ + if (strcasecmp(s, "tcp") =3D=3D 0) + return IPPROTO_TCP; + if (strcasecmp(s, "mptcp") =3D=3D 0) + return IPPROTO_MPTCP; + + die_usage(1); + return 0; +} + static void parse_opts(int argc, char **argv) { int c; =20 - while ((c =3D getopt(argc, argv, "h6")) !=3D -1) { + while ((c =3D getopt(argc, argv, "h6t:r:")) !=3D -1) { switch (c) { case 'h': die_usage(0); @@ -271,6 +284,12 @@ static void parse_opts(int argc, char **argv) case '6': pf =3D AF_INET6; break; + case 't': + proto_tx =3D protostr_to_num(optarg); + break; + case 'r': + proto_rx =3D protostr_to_num(optarg); + break; default: die_usage(1); break; @@ -776,10 +795,10 @@ static int client(int pipefd) =20 switch (pf) { case AF_INET: - fd =3D sock_connect_mptcp("127.0.0.1", "15432", IPPROTO_MPTCP); + fd =3D sock_connect_mptcp("127.0.0.1", "15432", proto_tx); break; case AF_INET6: - fd =3D sock_connect_mptcp("::1", "15432", IPPROTO_MPTCP); + fd =3D sock_connect_mptcp("::1", "15432", proto_tx); break; default: xerror("Unknown pf %d\n", pf); --=20 2.51.0 From nobody Thu Nov 27 12:37:15 2025 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 867DB34575A for ; Wed, 19 Nov 2025 10:05: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=1763546745; cv=none; b=Tq5Gxklo+9df3JHxmv/QmakCecPXix56BcPJqIRhgm2CuDy9yNWuJhjDdcYvYEl3vztLM9g0RupeQXX2rGAruu9R0dZ2gCmIMrOobr9pT0lPOjssS/YTEJQsuIawW8nbukP0wxAIV4y8USze0lD0CeePhmYhrsH6VYyl3oOm03Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546745; c=relaxed/simple; bh=J86OKn5xH0aCyfgFj2LrEaddfYLxe76BkBFI2DuoDYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cafhs0Ud/EhmYjW6sOCtYTjS7oZKO+a/Ued5N2QzYDDIsMevtCWZaetf9oMjBWo8F4biXq9ukH825mnPNcEIgTcodIo1CtOGC0uf9XyLjqw1ht0CSsQrqfzzvqGdS8MouDaDm0bmXnmJ1jpJEuUJHJcGX1SPcPERfz0hxLWooPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uUR6k3Ay; 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="uUR6k3Ay" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D229C19422; Wed, 19 Nov 2025 10:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546745; bh=J86OKn5xH0aCyfgFj2LrEaddfYLxe76BkBFI2DuoDYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uUR6k3Ay7p+WEIRPOYjuDnCXft+LfBvqmAy5qMCIYW4satqMId3DxHFBfHX1XWarV p8HkFS+dnaaEKdsDow5UlDryyblEBjn/nZBlb2i47iqvl+7oSiCv3iEccCo796z5Bk 8+PAa77o6HnkxeZiYqdWumK10Yn9J4I/y0udf87pGUry4wAOIsyXPGUCR4+BN2O494 2R/XgssptYyj6S3I/6NDPbJMko/mG7/4SttaBOJHb/t+IgNAGD/fomgPzGxJsdqbTp p4Hg+64pEV00zhMhJseg+0tztGZfaEczQvVawAwJh+m/3psdfwDbpt8lJAt8Y+gXrN XiBT7L4SepUEA== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang Subject: [RFC mptcp-next v2 7/8] selftests: mptcp: sockopt: skip mptcp getsockopt for tcp tests Date: Wed, 19 Nov 2025 18:05:06 +0800 Message-ID: X-Mailer: git-send-email 2.51.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 Skip mptcp getsockopt checks during tcp tests since MPTCP socket options are not available for them. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index e4752f848f08..59c07eda12cd 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -384,7 +384,7 @@ static void do_getsockopt_mptcp_info(struct so_state *s= , int fd, size_t w) ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_INFO, &i, &olen); =20 if (ret < 0) - die_perror("getsockopt MPTCP_INFO"); + return; =20 s->pkt_stats_avail =3D olen >=3D sizeof(i); =20 @@ -415,7 +415,7 @@ static void do_getsockopt_tcp_info(struct so_state *s, = int fd, size_t r, size_t =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_TCPINFO, &ti, &olen); if (ret < 0) - xerror("getsockopt MPTCP_TCPINFO (tries %d, %m)"); + return; =20 assert(olen <=3D sizeof(ti)); assert(ti.d.size_kernel > 0); @@ -470,7 +470,7 @@ static void do_getsockopt_subflow_addrs(struct so_state= *s, int fd) =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_SUBFLOW_ADDRS, &addrs, &olen); if (ret < 0) - die_perror("getsockopt MPTCP_SUBFLOW_ADDRS"); + return; =20 assert(olen <=3D sizeof(addrs)); assert(addrs.d.size_kernel > 0); @@ -540,13 +540,8 @@ static void do_getsockopt_mptcp_full_info(struct so_st= ate *s, int fd) olen =3D data_size; =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_FULL_INFO, &mfi, &olen); - if (ret < 0) { - if (errno =3D=3D EOPNOTSUPP) { - perror("MPTCP_FULL_INFO test skipped"); - return; - } - xerror("getsockopt MPTCP_FULL_INFO"); - } + if (ret < 0) + return; =20 assert(olen <=3D data_size); assert(mfi.size_tcpinfo_kernel > 0); @@ -650,7 +645,8 @@ static void connect_one_server(int fd, int pipefd) if (eof) total +=3D 1; /* sequence advances due to FIN */ =20 - assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); + if (s.mptcpi_rcv_delta) + assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); close(fd); } =20 @@ -685,7 +681,8 @@ static void process_one_client(int fd, int pipefd) xerror("expected EOF, got %lu", ret3); =20 do_getsockopts(&s, fd, ret, ret2); - if (s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) + if (s.mptcpi_rcv_delta && + s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) xerror("mptcpi_rcv_delta %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, s.mptcpi_rcv_delta, ret + 1, s.mptcpi_rcv_delta - (ret + 1)); =20 --=20 2.51.0 From nobody Thu Nov 27 12:37:15 2025 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 0C9B732E6B3 for ; Wed, 19 Nov 2025 10:05: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=1763546750; cv=none; b=XjttkwhEosYv6tYuMp/Z05bN/fPuQwD7/149z5dUQWeUU0Y8PGpYWm6wpm6L9346czwzR76bLE6k3x0TJOpFrfXaC0MOOgv/OQ3J9axfSVo4JemFFXPlpZ+mVSVIAYBJMRWRa/5PbS2MWB+JoekBoocDshgBTBcgbdWvQxSqwCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546750; c=relaxed/simple; bh=2NhT2uw+CM4ep0jkqu/g2D/RljHe81CBy0BAX4oQ7h0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=awbDcocyO+oNs9BkkYThVk1H7uIo2BhQexvIePyVseCwpic8AiRSzPamc69nRX+ZsHWcBksVjh4zPTieTC5ayBNtEIRZgw7MTKvO4uQHNvWs3jJQTwCpHHsVlDTiy0obBaV4xCxiXzoEB+5DRSSwE4olMXtTou0z5vL8c1kh0iQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Tnlipmkw; 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="Tnlipmkw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87E57C113D0; Wed, 19 Nov 2025 10:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546747; bh=2NhT2uw+CM4ep0jkqu/g2D/RljHe81CBy0BAX4oQ7h0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TnlipmkwsaMKrGNOEUg9VKpLra6KoDKaQH9UN9QTVOsoOvPmM5wdZyH6YzbLEQR4m rHxwxxQvToU0aA9kqN2K12qGOsnAga8rczJkxAbS8xWQZRHY2/Fr67033VCawVQNhM G3mCON/uZ28ijujWPgIMj42sr7fP8bts5nvlHR0KpZfgYEeh81P2r2+W/mCbuaNKz4 P8JGAoKzvVqIcWkRj1smwedmB/cdqDTaz5fpMxcHQiYzCjrP1ZcSokIXQy3mx82csA VGZzej13FYW9Kcin3N0kuSaj0Y5gHd4NBGSsYxU3EgLEc+10dgB+xIhrqCFcW50WKI St55d9N4yXkdw== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang Subject: [RFC mptcp-next v2 8/8] selftests: mptcp: sockopt: add KTLS test cases Date: Wed, 19 Nov 2025 18:05:07 +0800 Message-ID: X-Mailer: git-send-email 2.51.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 Add Kernel TLS (KTLS) testing support to mptcp_sockopt: - New '-c' option to enable TLS testing; - TLS socket setup with AES-GCM-128 cipher; - Test cases for both TCP and MPTCP with TLS; - IPv4 and IPv6 support for TLS tests. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 1 + .../selftests/net/mptcp/mptcp_sockopt.c | 75 ++++++++++++++++++- .../selftests/net/mptcp/mptcp_sockopt.sh | 47 ++++++++++++ 3 files changed, 121 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 59051ee2a986..18bd29ac5b24 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -34,3 +34,4 @@ CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_TPROXY=3Dm CONFIG_SYN_COOKIES=3Dy CONFIG_VETH=3Dy +CONFIG_TLS=3Dy diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 59c07eda12cd..7a43f681abc0 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -25,10 +25,12 @@ #include =20 #include +#include =20 static int pf =3D AF_INET; static int proto_tx =3D IPPROTO_MPTCP; static int proto_rx =3D IPPROTO_MPTCP; +static bool tls; =20 #ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262 @@ -36,6 +38,9 @@ static int proto_rx =3D IPPROTO_MPTCP; #ifndef SOL_MPTCP #define SOL_MPTCP 284 #endif +#ifndef TCP_ULP +#define TCP_ULP 31 +#endif =20 #ifndef MPTCP_INFO struct mptcp_info { @@ -137,7 +142,7 @@ static void die_perror(const char *msg) =20 static void die_usage(int r) { - fprintf(stderr, "Usage: mptcp_sockopt [-6] [-t tcp|mptcp] [-r tcp|mptcp]\= n"); + fprintf(stderr, "Usage: mptcp_sockopt [-6] [-t tcp|mptcp] [-r tcp|mptcp] = [-c]\n"); exit(r); } =20 @@ -184,6 +189,54 @@ static void xgetaddrinfo(const char *node, const char = *service, } } =20 +#define TLS_OVERHEAD_SIZE 29 + +static int do_setsockopt_tls(int fd) +{ + struct tls12_crypto_info_aes_gcm_128 tls_tx =3D { + .info =3D { + .version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_128, + }, + }; + struct tls12_crypto_info_aes_gcm_128 tls_rx =3D { + .info =3D { + .version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_128, + }, + }; + int so_buf =3D 6553500; + int err; + + err =3D setsockopt(fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls")); + if (err) { + perror("setsockopt TCP_ULP"); + return err; + } + err =3D setsockopt(fd, SOL_TLS, TLS_TX, (void *)&tls_tx, sizeof(tls_tx)); + if (err) { + perror("setsockopt TLS_TX"); + return err; + } + err =3D setsockopt(fd, SOL_TLS, TLS_RX, (void *)&tls_rx, sizeof(tls_rx)); + if (err) { + perror("setsockopt TLS_RX"); + return err; + } + err =3D setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &so_buf, sizeof(so_buf)); + if (err) { + perror("setsockopt SO_SNDBUF"); + return err; + } + err =3D setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &so_buf, sizeof(so_buf)); + if (err) { + perror("setsockopt SO_RCVBUF"); + return err; + } + + return 0; +} + static int sock_listen_mptcp(const char * const listenaddr, const char * const port) { @@ -276,7 +329,7 @@ static void parse_opts(int argc, char **argv) { int c; =20 - while ((c =3D getopt(argc, argv, "h6t:r:")) !=3D -1) { + while ((c =3D getopt(argc, argv, "h6t:r:c")) !=3D -1) { switch (c) { case 'h': die_usage(0); @@ -289,6 +342,8 @@ static void parse_opts(int argc, char **argv) break; case 'r': proto_rx =3D protostr_to_num(optarg); + case 'c': + tls =3D true; break; default: die_usage(1); @@ -640,6 +695,11 @@ static void connect_one_server(int fd, int pipefd) if (s.tcpi_rcv_delta) assert(s.tcpi_rcv_delta <=3D total); =20 + if (tls) { + ret +=3D TLS_OVERHEAD_SIZE; + total +=3D TLS_OVERHEAD_SIZE; + } + do_getsockopts(&s, fd, ret, ret); =20 if (eof) @@ -680,6 +740,11 @@ static void process_one_client(int fd, int pipefd) if (ret3 !=3D 0) xerror("expected EOF, got %lu", ret3); =20 + if (tls) { + ret +=3D TLS_OVERHEAD_SIZE; + ret2 +=3D TLS_OVERHEAD_SIZE; + } + do_getsockopts(&s, fd, ret, ret2); if (s.mptcpi_rcv_delta && s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) @@ -740,6 +805,9 @@ static int server(int pipefd) alarm(15); r =3D xaccept(fd); =20 + if (tls) + do_setsockopt_tls(r); + process_one_client(r, pipefd); =20 close(fd); @@ -803,6 +871,9 @@ static int client(int pipefd) =20 test_ip_tos_sockopt(fd); =20 + if (tls) + do_setsockopt_tls(fd); + connect_one_server(fd, pipefd); =20 return 0; diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index ab8bce06b262..8840be8adea3 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -351,6 +351,52 @@ do_tcpinq_tests() return $? } =20 +do_tls_test() +{ + print_title "KTLS $*" | head -c 53 + ip netns exec "$ns_sbox" ./mptcp_sockopt "$@" + local lret=3D$? + if [ $lret -ne 0 ];then + ret=3D$lret + mptcp_lib_pr_fail + mptcp_lib_result_fail "KTLS: $*" + return $lret + fi + + mptcp_lib_pr_ok + mptcp_lib_result_pass "KTLS: $*" + return $lret +} + +do_tls_tests() +{ + local lret=3D0 + + mptcp_lib_print_info "sockopt KTLS" + + # TCP KTLS + do_tls_test -c -t tcp -r tcp + lret=3D$? + if [ $lret -ne 0 ] ; then + return $lret + fi + do_tls_test -6 -c -t tcp -r tcp + lret=3D$? + if [ $lret -ne 0 ] ; then + return $lret + fi + + # MPTCP KTLS + do_tls_test -c + lret=3D$? + if [ $lret -ne 0 ] ; then + return $lret + fi + do_tls_test -6 -c + lret=3D$? + return $lret +} + sin=3D$(mktemp) sout=3D$(mktemp) cin=3D$(mktemp) @@ -366,6 +412,7 @@ run_tests $ns1 $ns2 dead:beef:1::1 =20 do_mptcp_sockopt_tests do_tcpinq_tests +do_tls_tests =20 mptcp_lib_result_print_all_tap exit $ret --=20 2.51.0