From nobody Sun Mar 22 08:25:58 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 AC75C3BC69C for ; Thu, 19 Mar 2026 10:08:59 +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=1773914939; cv=none; b=uvOujfsL/Ng1TFbc8vzVJiou5rG4HKquGFMIY0L3m7P9cJgmzYvGYCdO1WNpCYKN2qlJP/lnk6D3XkYOhMrSxYe0e4yhz/ZELwENjgS6sXRSCJpZ1kxkjslBqASCI8oZ/W0WuQYLkvKgJ/aUVNkQOvRm2rqnYZx8do77JNGvXq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914939; c=relaxed/simple; bh=UefsDU3FPKLQUMrAaw7Ven5+aMb/HMw3/+MaqT+6/gM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ID1te4VST3iJRYsGC1CmOS5PmgxyBmm0jmw9U9snCYISsByPuhz/tfKf6YlZT4SRAJDkAkM/Yl+P3LvQ/I2KcRWPBXyh5qBRMjjxqOi1/4MZFA0vhOIWVf6GLhsV+FVX5f3rRbDsXBGUl9zR/B95xv5q4UF+6nCKZoPSgRouwCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uVoKzaqP; 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="uVoKzaqP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64194C2BCAF; Thu, 19 Mar 2026 10:08:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914939; bh=UefsDU3FPKLQUMrAaw7Ven5+aMb/HMw3/+MaqT+6/gM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uVoKzaqPROvI2tmObYgd2tID6Rxb9NN6ZGIVjTpTMmO9ICv+cpqFIRljP6lkOmUVi Vi5B+xV6QFtUUGMWmGyfXttLKHZ8FXeR1XEnBRVJPRiY80J9XdEgVHCkM5PvbxeMaM Mc6ytGNata3J4SkFBHGxkfgU+DztzW6znu/LPAkuYRmlPdN5eGW/DOdYbUmYqWB0Uk IHIa49TVxKZIAqg907tvGKChPpC4Kz/CDH5PEsZmGVRQoeiWAoNc1EW6ZseXZ7+uHS qUWK9aK9z/A0wxpnnQN+93jtlDHWvC7ECLHfi9mtWz6k6cFUhMSI4qMWLZcGOEAMtL hUfftOwZcy1RA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 01/15] tls: introduce struct tls_prot_ops for protocol ops Date: Thu, 19 Mar 2026 18:08:34 +0800 Message-ID: <0b078c3c3ceda966bcc2f379c584f695a6a13f00.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 To extend MPTCP support based on TCP TLS, a tls_prot_ops structure has been introduced for TLS, encapsulating TCP-specific helpers within this structure. Add registering, validating and finding functions for this structure to add, validate and find a tls_prot_ops on the global list tls_prot_ops_list. Register TCP-specific structure tls_tcp_ops in tls_init(). Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/tls.h | 19 +++++++++++ net/tls/tls_main.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/include/net/tls.h b/include/net/tls.h index ebd2550280ae..40001110bccb 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -220,6 +220,25 @@ struct tls_prot_info { u16 tail_size; }; =20 +struct tls_prot_ops { + int protocol; + struct module *owner; + struct list_head list; + + int (*inq)(struct sock *sk); + int (*sendmsg_locked)(struct sock *sk, struct msghdr *msg, size_t size); + struct sk_buff *(*recv_skb)(struct sock *sk, u32 *off); + int (*read_sock)(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor); + void (*read_done)(struct sock *sk, size_t len); + u32 (*get_skb_off)(struct sk_buff *skb); + u32 (*get_skb_seq)(struct sk_buff *skb); + __poll_t (*poll)(struct file *file, struct socket *sock, + struct poll_table_struct *wait); + bool (*epollin_ready)(const struct sock *sk); + void (*check_app_limited)(struct sock *sk); +}; + struct tls_context { /* read-only cache line */ struct tls_prot_info prot_info; diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index fd39acf41a61..e628b729cbd3 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -128,6 +128,24 @@ static struct proto_ops tls_proto_ops[TLS_NUM_PROTS][T= LS_NUM_CONFIG][TLS_NUM_CON static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], const struct proto *base); =20 +static DEFINE_SPINLOCK(tls_prot_ops_lock); +static LIST_HEAD(tls_prot_ops_list); + +/* Must be called with rcu read lock held */ +static struct tls_prot_ops *tls_prot_ops_find(int protocol) +{ + struct tls_prot_ops *ops, *ret =3D NULL; + + list_for_each_entry_rcu(ops, &tls_prot_ops_list, list) { + if (ops->protocol =3D=3D protocol) { + ret =3D ops; + break; + } + } + + return ret; +} + void update_sk_prot(struct sock *sk, struct tls_context *ctx) { int ip_ver =3D sk->sk_family =3D=3D AF_INET6 ? TLSV6 : TLSV4; @@ -1236,6 +1254,68 @@ static struct tcp_ulp_ops tcp_tls_ulp_ops __read_mos= tly =3D { .get_info_size =3D tls_get_info_size, }; =20 +static int tls_validate_prot_ops(const struct tls_prot_ops *ops) +{ + if (!ops->inq || !ops->sendmsg_locked || + !ops->recv_skb || !ops->read_sock || + !ops->read_done || !ops->get_skb_seq || + !ops->poll || !ops->epollin_ready || + !ops->check_app_limited) { + pr_err("%d does not implement required ops\n", ops->protocol); + return -EINVAL; + } + + return 0; +} + +static int tls_register_prot_ops(struct tls_prot_ops *ops) +{ + int ret; + + ret =3D tls_validate_prot_ops(ops); + if (ret) + return ret; + + spin_lock(&tls_prot_ops_lock); + if (tls_prot_ops_find(ops->protocol)) { + spin_unlock(&tls_prot_ops_lock); + return -EEXIST; + } + list_add_tail_rcu(&ops->list, &tls_prot_ops_list); + spin_unlock(&tls_prot_ops_lock); + + pr_debug("tls_prot_ops %d registered\n", ops->protocol); + return 0; +} + +static struct sk_buff *tls_tcp_recv_skb(struct sock *sk, u32 *off) +{ + return tcp_recv_skb(sk, tcp_sk(sk)->copied_seq, off); +} + +static u32 tls_tcp_get_skb_seq(struct sk_buff *skb) +{ + return TCP_SKB_CB(skb)->seq; +} + +static bool tls_tcp_epollin_ready(const struct sock *sk) +{ + return tcp_epollin_ready(sk, INT_MAX); +} + +static struct tls_prot_ops tls_tcp_ops =3D { + .protocol =3D IPPROTO_TCP, + .inq =3D tcp_inq, + .sendmsg_locked =3D tcp_sendmsg_locked, + .recv_skb =3D tls_tcp_recv_skb, + .read_sock =3D tcp_read_sock, + .read_done =3D tcp_read_done, + .get_skb_seq =3D tls_tcp_get_skb_seq, + .poll =3D tcp_poll, + .epollin_ready =3D tls_tcp_epollin_ready, + .check_app_limited =3D tcp_rate_check_app_limited, +}; + static int __init tls_register(void) { int err; @@ -1254,6 +1334,8 @@ static int __init tls_register(void) =20 tcp_register_ulp(&tcp_tls_ulp_ops); =20 + tls_register_prot_ops(&tls_tcp_ops); + return 0; err_strp: tls_strp_dev_exit(); --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 D23CC3BD65A for ; Thu, 19 Mar 2026 10:09:01 +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=1773914941; cv=none; b=rmxzbT5JdQXYE/fiwcRQT/FoLR0eKpmmPB7XK4J8NFYB6AJmrRz4A6+ZGcmxaTvbpmGT9A8a1I8kh2qE7geZM6nYoc5Z1c60X9C/4QIJBs58aoDutmhZXUpB5MgxYUyFv5WE5S/JWjPjI4VjCzab36pXsVTQNyiI6PU5asaZjMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914941; c=relaxed/simple; bh=PV/w9+r+ciuDscd9fw5x/4NRmhwZfXkP+AFCndwH1oQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GXxzmc7rsIFx8I2DbW5wVXgUHCtl60jj73uIcoF8EFjkAYh0GxsaFYo5M9wtJdKtq9jg9kb2K2nMHxioobTUd6j/Az0bxsmH5uEOzg3tKq/64LQ95HKPfwrqU/iUWpSRm7BLLJo24XxvxdwwMhwnJx1j6RSPHieS5mDhQ+FIMwU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YyZToE1B; 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="YyZToE1B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6D55C2BC87; Thu, 19 Mar 2026 10:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914941; bh=PV/w9+r+ciuDscd9fw5x/4NRmhwZfXkP+AFCndwH1oQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YyZToE1BbLIvt1ho/Zi+Xr3ceszxmdhNFDjYBYm9J2kk0R6oZLCJa0AikNhMN8+zx Udal6zdi6w/sgPudZBe/e6On6IRVEQSvhWiCDeNdPaq36kIDRBiESzwEcjQWti4NAZ mAJKXMVKnzqILlio6HafKwMGisqCBSBWTOBuDoaCmypbyA0DpuFHleugLnF8k4pks0 P2sjscyldo4er7ND8/IngsfMqsFFJlgjxu26b5jpOBgFEkjeb64rLvkKnweNHxcleT bElLVTyZYAorHGjyMzKCP40mLNPfPa0cr6PzyQfkkSIfFE4askED6nypmMaWhMxrn+ o2uB7ucH/K8Lw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 02/15] tls: add tls_prot_ops pointer to tls_context Date: Thu, 19 Mar 2026 18:08:35 +0800 Message-ID: <6f82310870b97cca64134cd7c88c3e7e5de6c525.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 A pointer to struct tls_prot_ops, named 'ops', has been added to struct tls_context. The places originally calling TLS-specific helpers have now been modified to indirectly invoke them via 'ops' pointer in tls_context. In do_tls_setsockopt_conf(), ctx->ops is assigned either 'tls_mptcp_ops' or 'tls_tcp_ops' based on the socket protocol. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/tls.h | 1 + net/tls/tls_main.c | 15 +++++++++++---- net/tls/tls_strp.c | 29 +++++++++++++++++++---------- net/tls/tls_sw.c | 7 +++++-- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/include/net/tls.h b/include/net/tls.h index 40001110bccb..3c67c45f13be 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -277,6 +277,7 @@ struct tls_context { struct sock *sk; =20 void (*sk_destruct)(struct sock *sk); + const struct tls_prot_ops *ops; =20 union tls_crypto_context crypto_send; union tls_crypto_context crypto_recv; diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index e628b729cbd3..fe8ba116504a 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -206,13 +206,13 @@ int tls_push_sg(struct sock *sk, ctx->splicing_pages =3D true; while (1) { /* is sending application-limited? */ - tcp_rate_check_app_limited(sk); + ctx->ops->check_app_limited(sk); p =3D sg_page(sg); retry: 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 ctx->ops->sendmsg_locked(sk, &msg, size); =20 if (ret !=3D size) { if (ret > 0) { @@ -427,14 +427,14 @@ static __poll_t tls_sk_poll(struct file *file, struct= socket *sock, u8 shutdown; int state; =20 - mask =3D tcp_poll(file, sock, wait); + tls_ctx =3D tls_get_ctx(sk); + mask =3D tls_ctx->ops->poll(file, sock, wait); =20 state =3D inet_sk_state_load(sk); shutdown =3D READ_ONCE(sk->sk_shutdown); if (unlikely(state !=3D TCP_ESTABLISHED || shutdown & RCV_SHUTDOWN)) return mask; =20 - tls_ctx =3D tls_get_ctx(sk); ctx =3D tls_sw_ctx_rx(tls_ctx); psock =3D sk_psock_get(sk); =20 @@ -1094,6 +1094,13 @@ static int tls_init(struct sock *sk) ctx->tx_conf =3D TLS_BASE; ctx->rx_conf =3D TLS_BASE; ctx->tx_max_payload_len =3D TLS_MAX_PAYLOAD_SIZE; + ctx->ops =3D tls_prot_ops_find(sk->sk_protocol); + if (!ctx->ops) { + tls_ctx_free(sk, ctx); + inet_csk(sk)->icsk_ulp_ops =3D NULL; + rc =3D -EINVAL; + goto out; + } update_sk_prot(sk, ctx); out: write_unlock_bh(&sk->sk_callback_lock); diff --git a/net/tls/tls_strp.c b/net/tls/tls_strp.c index 98e12f0ff57e..ef1a8659ee18 100644 --- a/net/tls/tls_strp.c +++ b/net/tls/tls_strp.c @@ -120,6 +120,7 @@ struct sk_buff *tls_strp_msg_detach(struct tls_sw_conte= xt_rx *ctx) int tls_strp_msg_cow(struct tls_sw_context_rx *ctx) { struct tls_strparser *strp =3D &ctx->strp; + struct tls_context *tls_ctx; struct sk_buff *skb; =20 if (strp->copy_mode) @@ -132,7 +133,8 @@ int tls_strp_msg_cow(struct tls_sw_context_rx *ctx) tls_strp_anchor_free(strp); strp->anchor =3D skb; =20 - tcp_read_done(strp->sk, strp->stm.full_len); + tls_ctx =3D tls_get_ctx(strp->sk); + tls_ctx->ops->read_done(strp->sk, strp->stm.full_len); strp->copy_mode =3D 1; =20 return 0; @@ -376,6 +378,7 @@ static int tls_strp_copyin(read_descriptor_t *desc, str= uct sk_buff *in_skb, =20 static int tls_strp_read_copyin(struct tls_strparser *strp) { + struct tls_context *ctx =3D tls_get_ctx(strp->sk); read_descriptor_t desc; =20 desc.arg.data =3D strp; @@ -383,13 +386,14 @@ static int tls_strp_read_copyin(struct tls_strparser = *strp) desc.count =3D 1; /* give more than one skb per call */ =20 /* sk should be locked here, so okay to do read_sock */ - tcp_read_sock(strp->sk, &desc, tls_strp_copyin); + ctx->ops->read_sock(strp->sk, &desc, tls_strp_copyin); =20 return desc.error; } =20 static int tls_strp_read_copy(struct tls_strparser *strp, bool qshort) { + struct tls_context *ctx =3D tls_get_ctx(strp->sk); struct skb_shared_info *shinfo; struct page *page; int need_spc, len; @@ -398,7 +402,7 @@ static int tls_strp_read_copy(struct tls_strparser *str= p, bool qshort) * to read the data out. Otherwise the connection will stall. * Without pressure threshold of INT_MAX will never be ready. */ - if (likely(qshort && !tcp_epollin_ready(strp->sk, INT_MAX))) + if (likely(qshort && !ctx->ops->epollin_ready(strp->sk))) return 0; =20 shinfo =3D skb_shinfo(strp->anchor); @@ -434,12 +438,13 @@ static int tls_strp_read_copy(struct tls_strparser *s= trp, bool qshort) static bool tls_strp_check_queue_ok(struct tls_strparser *strp) { unsigned int len =3D strp->stm.offset + strp->stm.full_len; + struct tls_context *ctx =3D tls_get_ctx(strp->sk); struct sk_buff *first, *skb; u32 seq; =20 first =3D skb_shinfo(strp->anchor)->frag_list; skb =3D first; - seq =3D TCP_SKB_CB(first)->seq; + seq =3D ctx->ops->get_skb_seq(first); =20 /* Make sure there's no duplicate data in the queue, * and the decrypted status matches. @@ -449,7 +454,7 @@ static bool tls_strp_check_queue_ok(struct tls_strparse= r *strp) len -=3D skb->len; skb =3D skb->next; =20 - if (TCP_SKB_CB(skb)->seq !=3D seq) + if (ctx->ops->get_skb_seq(skb) !=3D seq) return false; if (skb_cmp_decrypted(first, skb)) return false; @@ -460,11 +465,11 @@ static bool tls_strp_check_queue_ok(struct tls_strpar= ser *strp) =20 static void tls_strp_load_anchor_with_queue(struct tls_strparser *strp, in= t len) { - struct tcp_sock *tp =3D tcp_sk(strp->sk); + struct tls_context *ctx =3D tls_get_ctx(strp->sk); struct sk_buff *first; u32 offset; =20 - first =3D tcp_recv_skb(strp->sk, tp->copied_seq, &offset); + first =3D ctx->ops->recv_skb(strp->sk, &offset); if (WARN_ON_ONCE(!first)) return; =20 @@ -483,6 +488,7 @@ static void tls_strp_load_anchor_with_queue(struct tls_= strparser *strp, int len) =20 bool tls_strp_msg_load(struct tls_strparser *strp, bool force_refresh) { + struct tls_context *ctx =3D tls_get_ctx(strp->sk); struct strp_msg *rxm; struct tls_msg *tlm; =20 @@ -490,7 +496,7 @@ 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(ctx->ops->inq(strp->sk) < strp->stm.full_len)) { WRITE_ONCE(strp->msg_ready, 0); memset(&strp->stm, 0, sizeof(strp->stm)); return false; @@ -511,9 +517,10 @@ bool tls_strp_msg_load(struct tls_strparser *strp, boo= l force_refresh) /* Called with lock held on lower socket */ static int tls_strp_read_sock(struct tls_strparser *strp) { + struct tls_context *ctx =3D tls_get_ctx(strp->sk); int sz, inq; =20 - inq =3D tcp_inq(strp->sk); + inq =3D ctx->ops->inq(strp->sk); if (inq < 1) return 0; =20 @@ -583,10 +590,12 @@ static void tls_strp_work(struct work_struct *w) =20 void tls_strp_msg_done(struct tls_strparser *strp) { + struct tls_context *ctx =3D tls_get_ctx(strp->sk); + WARN_ON(!strp->stm.full_len); =20 if (likely(!strp->copy_mode)) - tcp_read_done(strp->sk, strp->stm.full_len); + ctx->ops->read_done(strp->sk, strp->stm.full_len); else tls_strp_flush_anchor_copy(strp); =20 diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index a656ce235758..b6959ebcded8 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1952,13 +1952,14 @@ tls_read_flush_backlog(struct sock *sk, struct tls_= prot_info *prot, size_t len_left, size_t decrypted, ssize_t done, size_t *flushed_at) { + struct tls_context *tls_ctx =3D tls_get_ctx(sk); size_t max_rec; =20 if (len_left <=3D decrypted) return false; =20 max_rec =3D prot->overhead_size - prot->tail_size + TLS_MAX_PAYLOAD_SIZE; - if (done - *flushed_at < SZ_128K && tcp_inq(sk) > max_rec) + if (done - *flushed_at < SZ_128K && tls_ctx->ops->inq(sk) > max_rec) return false; =20 *flushed_at =3D done; @@ -2445,6 +2446,7 @@ int tls_rx_msg_size(struct tls_strparser *strp, struc= t sk_buff *skb) size_t cipher_overhead; size_t data_len =3D 0; int ret; + u32 seq; =20 /* Verify that we have a full TLS header, or wait for more data */ if (strp->stm.offset + prot->prepend_size > skb->len) @@ -2487,8 +2489,9 @@ int tls_rx_msg_size(struct tls_strparser *strp, struc= t sk_buff *skb) goto read_failure; } =20 + seq =3D tls_ctx->ops->get_skb_seq(skb); tls_device_rx_resync_new_rec(strp->sk, data_len + TLS_HEADER_SIZE, - TCP_SKB_CB(skb)->seq + strp->stm.offset); + seq + strp->stm.offset); return data_len + TLS_HEADER_SIZE; =20 read_failure: --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 6AC0F370D51 for ; Thu, 19 Mar 2026 10:09:03 +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=1773914943; cv=none; b=vALwpDEPjBSyTm1Oi0wakmfXm1tUdcFlHQP/IpHyRIme7HmK8fLghxN8W/3GlLKzOyIRtfxFqKHr/Y7fvnrwUavjnD3brCPZ0B9FtzpwDAqm8lxpZfy9Xe7bRbpfoOY+FgEK4l/0j87S6ezmAzV3jS4XLVh4Q9UN3tGFojGPRCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914943; c=relaxed/simple; bh=IpOEgkWeR/fGuGvjz34os5dYQma6F4rBZsAwJ7DQ8No=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OKRQZmZX9J38WfaTVTT7ZxIzXwHyUHCgFYMOKGsLWNwqYJnq0AGQofhQ5DX92U7DtWLNLocRQP3K4x+B2g6rDKAVeRx6/ELhlJUWuQGnzB8H4A5bgJsN5btpmlp0NECBbq2R5d1wPG4dRZ3k7SKROrceeoWON3w+N0bSPHZ5BRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZuFVWxyl; 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="ZuFVWxyl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12573C2BC87; Thu, 19 Mar 2026 10:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914943; bh=IpOEgkWeR/fGuGvjz34os5dYQma6F4rBZsAwJ7DQ8No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZuFVWxyl0asl5H5BDfYQDtbJn0waXdlveE3aI+61UOn0rCg+bmmelpTSTYrpOHAHY 7UAtzQsMYUK0Y+PFVcCgVYm59jBaYqN6jrI52Ll+qpz+HtfsrOlNN00+Hm7Tj8mQhl Cp5i19FoUuU6szftKp2C1JMVOkUoFnA70iT/+A1KfJ97pu0bB0Cm6ZQE7OMgxMN1FQ hGb64nZNJ+OxYyxveNapcfMOlPxH670WvAdrhAhbr/raQmGOermwUUdaIWcgO3JS52 vmAZwF1HB9LjTCiNWZNC7IxCW+NNTV6kDLRKh7s54K28QQILXPA0+si1mNI3VYWBWU S/k3/IjJdBKXg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [RFC mptcp-next v11 03/15] tls: add MPTCP SKB offset check in strp queue walk Date: Thu, 19 Mar 2026 18:08:36 +0800 Message-ID: <21b57225396ef0c31b31a19fac02a5b455703a63.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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: Gang Yan In MPTCP, subflow SKBs can have non-zero offsets due to out-of-order handling or partial delivery. When walking the TLS strp queue for sequence and decryption checks, validate each SKB's offset except the first using get_skb_off() to ensure queue consistency. This is specific to MPTCP, as TCP does not require offset checks. If any invalid offset is found, return false to trigger resynchronization. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- net/tls/tls_strp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/tls/tls_strp.c b/net/tls/tls_strp.c index ef1a8659ee18..b6798d09c922 100644 --- a/net/tls/tls_strp.c +++ b/net/tls/tls_strp.c @@ -454,6 +454,9 @@ static bool tls_strp_check_queue_ok(struct tls_strparse= r *strp) len -=3D skb->len; skb =3D skb->next; =20 + if (ctx->ops->get_skb_off && + ctx->ops->get_skb_off(skb)) + return false; if (ctx->ops->get_skb_seq(skb) !=3D seq) return false; if (skb_cmp_decrypted(first, skb)) --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 702B13AD536 for ; Thu, 19 Mar 2026 10:09:05 +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=1773914945; cv=none; b=WaUS6uruoqc2TSFwBwpb7+CoOfOZuqyMXLuZJVyMO6N3rJP1/sBEYcCClIcQPi1bTNfz5N6ce4COIrYmSsXfy8yH5WKwqLhkscYbkBm2Dy+9YmSgh+1lLoblRsLCf3vrB7OO33n+2JZzkT+//BdRNZrnlML4uKE6PWzO/Gi2848= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914945; c=relaxed/simple; bh=gKHyvosmK+Ox2nSYitqTgWp5DrHAaeGPnAjnUS+lgOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NN8y8seRkJO8YhAEj+5JFmhanmVnRWT7404+8JfccK1zxaV+zSQ6wx+TKu1XuKStQ6vX1jIS4geuoUHu9iEeaj3O5qA9H9UjdMr2erBQwEnvngDYoDgbWXWLXiv2YxWhcCO5RrOpioDxLtiVdZm0zguhi4xpFJBOi8xYC7DIIQc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iEPTOOi2; 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="iEPTOOi2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD24FC19424; Thu, 19 Mar 2026 10:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914945; bh=gKHyvosmK+Ox2nSYitqTgWp5DrHAaeGPnAjnUS+lgOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iEPTOOi2lYlqcfJ5yvYSA7nahZP0uUPwfoHwGKKOVXC4vl2NLIG9hcqdq0xtEwFdw 53PDpI1CzarYFw6VT0H6MhO0HIQBoWQXnrlGwG8sYpaZzVgPbp+ATD6rvLs9s6ZgqP Sk3isnQb42EJEPU0/e0MpKtRs0UDZvRzdYz1DvHAGl7YvrP+EDLngoL80qIMwkyFMm dK42YFSPYMY+kTdqTCS9Q2NgyunDO0dvQQnFqIozQSH5g5XQx3fecwR+JPLRO9nCEu GjvSDGzvAAh3sA0Ao3SiHjyJ/d4/gbZX8v8oSvMLPfVgZwmoJv/yNPzf8nmtD9jzR8 D9FLkW5Rnmg7w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [RFC mptcp-next v11 04/15] mptcp: update mptcp_check_readable for TLS use Date: Thu, 19 Mar 2026 18:08:37 +0800 Message-ID: X-Mailer: git-send-email 2.53.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: Gang Yan This patch makes mptcp_check_readable() aligned with TCP, and renames it to mptcp_stream_is_readable(). It will be used in the case of KTLS, because 'prot' will be modified, tls_sw_sock_is_readable() is expected to be called from prot->sock_is_readable(). Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- net/mptcp/protocol.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 023a4fb68617..5585f43cf879 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3309,9 +3309,11 @@ void __mptcp_unaccepted_force_close(struct sock *sk) __mptcp_destroy_sock(sk); } =20 -static __poll_t mptcp_check_readable(struct sock *sk) +static bool mptcp_stream_is_readable(struct sock *sk) { - return mptcp_epollin_ready(sk) ? EPOLLIN | EPOLLRDNORM : 0; + if (mptcp_epollin_ready(sk)) + return true; + return sk_is_readable(sk); } =20 static void mptcp_check_listen_stop(struct sock *sk) @@ -4373,7 +4375,8 @@ static __poll_t mptcp_poll(struct file *file, struct = socket *sock, mask |=3D EPOLLIN | EPOLLRDNORM | EPOLLRDHUP; =20 if (state !=3D TCP_SYN_SENT && state !=3D TCP_SYN_RECV) { - mask |=3D mptcp_check_readable(sk); + if (mptcp_stream_is_readable(sk)) + mask |=3D EPOLLIN | EPOLLRDNORM; if (shutdown & SEND_SHUTDOWN) mask |=3D EPOLLOUT | EPOLLWRNORM; else --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 64AB3379999 for ; Thu, 19 Mar 2026 10:09:07 +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=1773914947; cv=none; b=jBIWqlcg7ZwnVOXFIDwo+k7RToVikVwbKLC55NgixKMcNE28lggo+/L7mRPZYpx9RsV0gNepVqBzD7Ua8Q7hnk/THDISKzcR7W2Yw1DtrkFZmUcE6gHaHL4FswbUDoIy8rmXnWJpkot3cE0psLJtPuZv3Tfjx+tYhmj/r1uKPPU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914947; c=relaxed/simple; bh=g0QtebIG9KnPGBWOJY5HMZ/sRaDgRN7bFJpZ1zwo4H8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pJpbC+qnCknbXE7sgB+aYV73MwzF+EyMW7tiYaCPZTmfhFTN8PJyIZzmnZYZ4rmRm91Ak9JD1T2ioM7Qq64IbyHEwCKOXQZGys+GvVyfGVkp/KOKHFTpJioeT0r7bJGgNsxSzhsJekM2Zh9C7Tsvve45fZnKqCg6YXOw3bhutOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iKIrJyXa; 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="iKIrJyXa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C2ECC2BC87; Thu, 19 Mar 2026 10:09:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914947; bh=g0QtebIG9KnPGBWOJY5HMZ/sRaDgRN7bFJpZ1zwo4H8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iKIrJyXaza988hBpj5Fhsb9DMi9RxFnIb4v5QrdWDxn8RnOTIBiHk5hOZqoibQ755 at4Ta1UmitSa6UV17e7HZLvF6ExCQnheJlRByaHJYFh9EWWxfwlfv+d37JnXgB3/mO MuY2/rYUdkd9RHVc9x2n3eRNR+Rl6OQO4HWLmbwVNRq4eKfrKgyzHQ33Afv64frWPF +GtTvGK0dh+O0umsuDv2/vX8bD6XVAGFE3o//x03uAMY5rEjLBgJapRq920ZdK7Ioy 4hzDmpU813588Uz7zyAZGr9d6yO5ogLo0q7b3wla2+GpWwm/e/psHNn3s+c0TjLWEc H43F3cwN2fflQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 05/15] mptcp: avoid sleeping in read_sock path under softirq Date: Thu, 19 Mar 2026 18:08:38 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 When mptcp_read_sock() is called from softirq context via TLS read_sock, lock_sock_fast() in mptcp_rcv_space_adjust() and mptcp_cleanup_rbuf() may trigger might_sleep() warnings or illegal sleeps, as softirq context cannot block. Replace lock_sock_fast() with spin_trylock_bh() to make locking non-blocking and context-safe. Skip operations if the lock cannot be acquired. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5585f43cf879..e9e40dfab5ea 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -561,12 +561,11 @@ static void mptcp_send_ack(struct mptcp_sock *msk) =20 static void mptcp_subflow_cleanup_rbuf(struct sock *ssk, int copied) { - bool slow; - - slow =3D lock_sock_fast(ssk); - if (tcp_can_send_ack(ssk)) + if (!spin_trylock_bh(&ssk->sk_lock.slock)) + return; + if (!sock_owned_by_user(ssk) && tcp_can_send_ack(ssk)) tcp_cleanup_rbuf(ssk, copied); - unlock_sock_fast(ssk, slow); + spin_unlock_bh(&ssk->sk_lock.slock); } =20 static bool mptcp_subflow_could_cleanup(const struct sock *ssk, bool rx_em= pty) @@ -2194,14 +2193,15 @@ static void mptcp_rcv_space_adjust(struct mptcp_soc= k *msk, int copied) */ mptcp_for_each_subflow(msk, subflow) { struct sock *ssk; - bool slow; =20 ssk =3D mptcp_subflow_tcp_sock(subflow); - slow =3D lock_sock_fast(ssk); + if (!spin_trylock_bh(&ssk->sk_lock.slock)) + continue; /* subflows can be added before tcp_init_transfer() */ - if (tcp_sk(ssk)->rcvq_space.space) + if (!sock_owned_by_user(ssk) && + tcp_sk(ssk)->rcvq_space.space) tcp_rcvbuf_grow(ssk, copied); - unlock_sock_fast(ssk, slow); + spin_unlock_bh(&ssk->sk_lock.slock); } } =20 --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 6D79F38551B for ; Thu, 19 Mar 2026 10:09:09 +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=1773914949; cv=none; b=EbE5Ndqj03Zov4klwkLmJBrKddWiWN+Tg1/BEwz44bqw/a3X14uT7arVaLrO7YoKJVyQh+vBm/ZSm858FtnNa0bl+8PImJ4x47l5kWxPMn7UPFjZIEBoi7yWLor32fOuNAXOh+msalQutFg5Mn85lVP7U613EraZlfso0iEWj1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914949; c=relaxed/simple; bh=tKD7o0qE78g6xXx3GatHnxJd6DSYoyyneqpkH5Qbfi0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T8OoLTcSUIXpoP1X8Ls/D9VyXwhiANYwTS48J2fsNXCi6AfPZYNXXTZThMNNzGQU17AtumcPH/JbY8xn0u6T22BUjO2F4bLErrgfFGHq3iPzz5OpGGhRavA7TVgp9SZiC2wREiaLk103lBi3zGWa0FI7gWRpfgB/jywIlz+TDOI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EDsQtaoN; 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="EDsQtaoN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88D33C19424; Thu, 19 Mar 2026 10:09:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914948; bh=tKD7o0qE78g6xXx3GatHnxJd6DSYoyyneqpkH5Qbfi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EDsQtaoNYr31N9muvY1rY2l23/MyuNAhE2TRhPyJHW2vGov+mF9AFsAV4DzXpKnsT wTR0I+gChi1atmerY870xANOS8gsWujlmEaREn/pGKTtn53BdBTGF/5P7lDCWfWjPa 2pfHE6+oSw3v8eKsDjHvJcU/nvOHwl+08MEjJ05q7FAL6at4vT+HEUQVvPUHJ8mJbH 5ojvkay0nJv/gH1a93HL9JcIKd8obYlwhFOkxPRa8IdNJqS3WR+DPgBMjrRrLq8e3D kPcYNA75+xjmoC93P1B2WfMxcM/YhvxwXKuxWt7KjjLqSxbYCsUDYmI+JihPrzDd6Q np46wJBeVM3cQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 06/15] mptcp: implement tls_mptcp_ops for MPTCP TLS Date: Thu, 19 Mar 2026 18:08:39 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 This patch implements the MPTCP-specific struct tls_prot_ops, named 'tls_mptcp_ops'. Note that there is a slight difference between mptcp_inq() and mptcp_inq_hint(), it does not return 1 when the socket is closed or shut down; instead, it returns 0. Otherwise, it would break the condition "inq < 1" in tls_strp_read_sock(). Passing an MPTCP socket to tcp_sock_rate_check_app_limited() can trigger a crash. Here, an MPTCP version of check_app_limited() is implemented, which calls tcp_sock_rate_check_app_limited() for each subflow. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/mptcp.h | 2 + include/net/tcp.h | 1 + net/ipv4/tcp.c | 9 +++- net/mptcp/protocol.c | 106 ++++++++++++++++++++++++++++++++++++++++--- net/tls/tls_main.c | 3 ++ 5 files changed, 113 insertions(+), 8 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4cf59e83c1c5..02564eceeb7e 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -132,6 +132,8 @@ struct mptcp_pm_ops { void (*release)(struct mptcp_sock *msk); } ____cacheline_aligned_in_smp; =20 +extern struct tls_prot_ops tls_mptcp_ops; + #ifdef CONFIG_MPTCP void mptcp_init(void); =20 diff --git a/include/net/tcp.h b/include/net/tcp.h index f87bdacb5a69..b198938945bf 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -851,6 +851,7 @@ static inline int tcp_bound_to_half_wnd(struct tcp_sock= *tp, int pktsize) =20 /* tcp.c */ void tcp_get_info(struct sock *, struct tcp_info *); +void tcp_sock_rate_check_app_limited(struct tcp_sock *tp); void tcp_rate_check_app_limited(struct sock *sk); =20 /* Read 'sendfile()'-style from a TCP socket */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index dfd677c689ef..23a35201a05a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1110,9 +1110,9 @@ int tcp_sendmsg_fastopen(struct sock *sk, struct msgh= dr *msg, int *copied, } =20 /* If a gap is detected between sends, mark the socket application-limited= . */ -void tcp_rate_check_app_limited(struct sock *sk) +void tcp_sock_rate_check_app_limited(struct tcp_sock *tp) { - struct tcp_sock *tp =3D tcp_sk(sk); + struct sock *sk =3D (struct sock *)tp; =20 if (/* We have less than one packet to send. */ tp->write_seq - tp->snd_nxt < tp->mss_cache && @@ -1125,6 +1125,11 @@ void tcp_rate_check_app_limited(struct sock *sk) tp->app_limited =3D (tp->delivered + tcp_packets_in_flight(tp)) ? : 1; } + +void tcp_rate_check_app_limited(struct sock *sk) +{ + tcp_sock_rate_check_app_limited(tcp_sk(sk)); +} EXPORT_SYMBOL_GPL(tcp_rate_check_app_limited); =20 int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e9e40dfab5ea..c6f8e432d5af 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -24,11 +24,12 @@ #include #include #include +#include #include #include "protocol.h" #include "mib.h" =20 -static unsigned int mptcp_inq_hint(const struct sock *sk); +static unsigned int mptcp_inq_hint(struct sock *sk); static bool mptcp_can_spool_backlog(struct sock *sk, struct list_head *skb= s); static void mptcp_backlog_spooled(struct sock *sk, u32 moved, struct list_head *skbs); @@ -1927,7 +1928,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) +static 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; @@ -1938,8 +1939,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) || @@ -2047,7 +2046,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: @@ -2058,6 +2056,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) @@ -2311,7 +2320,7 @@ static bool mptcp_move_skbs(struct sock *sk) return enqueued; } =20 -static unsigned int mptcp_inq_hint(const struct sock *sk) +static int mptcp_inq(struct sock *sk) { const struct mptcp_sock *msk =3D mptcp_sk(sk); const struct sk_buff *skb; @@ -2326,6 +2335,16 @@ static unsigned int mptcp_inq_hint(const struct sock= *sk) return (unsigned int)hint_val; } =20 + return 0; +} + +static unsigned int mptcp_inq_hint(struct sock *sk) +{ + unsigned int inq =3D mptcp_inq(sk); + + if (inq) + return inq; + if (sk->sk_state =3D=3D TCP_CLOSE || (sk->sk_shutdown & RCV_SHUTDOWN)) return 1; =20 @@ -4751,3 +4770,78 @@ int __init mptcp_proto_v6_init(void) return err; } #endif + +static 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); + msk->bytes_consumed +=3D used; + MPTCP_SKB_CB(skb)->offset +=3D used; + MPTCP_SKB_CB(skb)->map_seq +=3D used; + left -=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_cleanup_rbuf(msk, len - left); +} + +static u32 mptcp_get_skb_off(struct sk_buff *skb) +{ + return MPTCP_SKB_CB(skb)->offset; +} + +static u32 mptcp_get_skb_seq(struct sk_buff *skb) +{ + return MPTCP_SKB_CB(skb)->map_seq; +} + +static void mptcp_check_app_limited(struct sock *sk) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + bool slow; + + slow =3D lock_sock_fast(ssk); + tcp_sock_rate_check_app_limited(tcp_sk(ssk)); + unlock_sock_fast(ssk, slow); + } +} + +struct tls_prot_ops tls_mptcp_ops =3D { + .protocol =3D IPPROTO_MPTCP, + .inq =3D mptcp_inq, + .sendmsg_locked =3D mptcp_sendmsg_locked, + .recv_skb =3D mptcp_recv_skb, + .read_sock =3D mptcp_read_sock, + .read_done =3D mptcp_read_done, + .get_skb_off =3D mptcp_get_skb_off, + .get_skb_seq =3D mptcp_get_skb_seq, + .poll =3D mptcp_poll, + .epollin_ready =3D mptcp_epollin_ready, + .check_app_limited =3D mptcp_check_app_limited, +}; +EXPORT_SYMBOL(tls_mptcp_ops); diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index fe8ba116504a..d98beec89ddb 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -1342,6 +1342,9 @@ static int __init tls_register(void) tcp_register_ulp(&tcp_tls_ulp_ops); =20 tls_register_prot_ops(&tls_tcp_ops); +#ifdef CONFIG_MPTCP + tls_register_prot_ops(&tls_mptcp_ops); +#endif =20 return 0; err_strp: --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 128D338551B for ; Thu, 19 Mar 2026 10:09: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=1773914951; cv=none; b=lEoqXjyXD5HRhrrYFjUSsCdCFo/y7RP36yRZeQVG6NM0XTWuraIZegEhbZ9ZyArCUavqxYnwAo5CY9+G7QzjIaJaPDoADed7QFfz/ywaxSTJncOdj0rrEH30napqTUmXWWve1xZGD8e6gSfEMqgEQcga3YRTm9Fw0g5krRZ8YNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914951; c=relaxed/simple; bh=QCtkSjLWnfBnI8wObN2ozkvWfxp89TiXkwvv7ih34Nw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j2zHa1qt9IPP2x7UEvJF8aMSkIkeoEenklSrNY/NMahObATCj2nFaxFQWfsd+THypRQPKtzcYnA4p/dADga0p4pAGMCwfNFG3TCFZlVMr6EKewQtpEeJu2lAd3qo0kCY91FJm59hs0CRMUweVvKgXnRCgucoFw4Sj2TwXnpwVnc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M+UMH4cZ; 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="M+UMH4cZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C170C2BC87; Thu, 19 Mar 2026 10:09:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914950; bh=QCtkSjLWnfBnI8wObN2ozkvWfxp89TiXkwvv7ih34Nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M+UMH4cZ4BwfmMJ3cjHDAxcahoj1nQ2mcQlA/Efrk68ETAZaHKEHgdMl/+iLX+IRF pwH6e7h0/UBMGLvWye7JfDFDzEJtAvQc6CO8tt1jte2eJgEcRnI1ayGnSDt3Kgt2ic 9jbfM/3Ea1waCkhgPw2zQRgktPKf9PXWQAuENOnGp+Ge2Ntt+5haFSN1G3eOH2M5Zx eX+BzwkUZinQyZCmegnURhyCByVyxYn/wmdE4bmd0LLISN04s6K2tDQdyvAeTFVib1 RcNbS2uvtVnAFxvsQN5ukTpOQ0Tn2Hxv/ENybI6beh+8g/4UShoJy6D/psg3hJup4J WzAR2fxMk6B/g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 07/15] tls: disable device offload for MPTCP sockets Date: Thu, 19 Mar 2026 18:08:40 +0800 Message-ID: <75c8462b5cda32b42c56642b6c59b28a417eff82.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 MPTCP TLS hardware offload is not yet implemented. Return -EOPNOTSUPP when attempting to enable device offload on MPTCP sockets. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/tls/tls_device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 99c8eff9783e..6744c2494740 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -1074,6 +1074,9 @@ int tls_set_device_offload(struct sock *sk) ctx =3D tls_get_ctx(sk); prot =3D &ctx->prot_info; =20 + if (sk->sk_protocol =3D=3D IPPROTO_MPTCP) + return -EOPNOTSUPP; + if (ctx->priv_ctx_tx) return -EEXIST; =20 @@ -1196,6 +1199,9 @@ int tls_set_device_offload_rx(struct sock *sk, struct= tls_context *ctx) struct net_device *netdev; int rc =3D 0; =20 + if (sk->sk_protocol =3D=3D IPPROTO_MPTCP) + return -EOPNOTSUPP; + if (ctx->crypto_recv.info.version !=3D TLS_1_2_VERSION) return -EOPNOTSUPP; =20 --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 E47AC379999 for ; Thu, 19 Mar 2026 10:09:12 +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=1773914953; cv=none; b=jz8vLoCUkHj58SLU1BOsVB2uTU4Veve3u61kFQugH/tLZhsoA3zXgsDfjKyQcUFoCYf7GL16o9iyvIRd2g9eThXZTc83jS3ZRqyuzehL5dmMNONuI/6A2i2TWq0DGmnAxDCYTe078viKRbqYkAVknZWrOqYaRl/vDQPkQBtLhyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914953; c=relaxed/simple; bh=Br96xUOeotLpe4KwgDWfp58kFiwJy9hqm5vdUL2bFyI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tnVq4mQcoXZsCrfwu6ZCLBwSQutg2VpaUj19easunQVbIJ2EXp3yPquN0vyQlR9i1j7DDIUNpgrtRcSF/pp9fcSIC96XWaxHnYk910hWcS3aCyaPCHYVsZW8DRv/BtX7bhmWiz03+IJUdekC52IHXJM0dvQh9gu6pI4QP6E0MYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g6J9EobV; 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="g6J9EobV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22561C19424; Thu, 19 Mar 2026 10:09:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914952; bh=Br96xUOeotLpe4KwgDWfp58kFiwJy9hqm5vdUL2bFyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g6J9EobVtADSU8GhiFqC8Ibjr/SB34/bJ3u0Waeovsi4kyQy6LnuVk2g+pCmpnkXQ eweAC1LdN1SexZEGDxu1Vi/ORbYHSmEeLVXzXZH5/HBMbbqxs4yCmksGA7oih4BI0q 5QUmMiEM0V8zVd4WVe6ZZIG9kDISuPxHrnDfEadmxG2cBugvh68YC6QAmL3jJKYmlm cP5vjZUCWHOLp1y9bwdAmlv3NOMlrzMcEHez0rGIcYnCnqGNqSm44lKw3n/B9f22Xs UP0XHBsL/xh6Sdo4yY1WGp51sn+Ov/9SZldnsAIm9fkmvRSZuNSdbJPPvJY7Wz7HhE ZlJsSauaFYbSw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 08/15] mptcp: update ULP getsockopt for TLS support Date: Thu, 19 Mar 2026 18:08:41 +0800 Message-ID: <1ed3c6bb8572953a1c0f6a0a1c457cc7b6c714cb.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 This patch extracts TCP_ULP getsockopt operation into a tcp_sock_get_ulp() helper so that it can also be used in MPTCP. TCP_ULP was obtained by calling mptcp_getsockopt_first_sf_only() to get ULP of the first subflow. Now that the mechanism has changed, a new helper mptcp_getsockopt_tcp_ulp() is added to get ULP of msk. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/linux/tcp.h | 1 + net/ipv4/tcp.c | 36 ++++++++++++++++++++++-------------- net/mptcp/sockopt.c | 12 ++++++++++++ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 6982f10e826b..2bb1cbd3eeab 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -653,6 +653,7 @@ void tcp_sock_set_quickack(struct sock *sk, int val); int tcp_sock_set_syncnt(struct sock *sk, int val); int tcp_sock_set_user_timeout(struct sock *sk, int val); int tcp_sock_set_maxseg(struct sock *sk, int val); +int tcp_sock_get_ulp(struct sock *sk, sockptr_t optval, sockptr_t optlen); =20 static inline bool dst_tcp_usec_ts(const struct dst_entry *dst) { diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 23a35201a05a..55d8fb848842 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4495,6 +4495,27 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const= struct sock *sk, return stats; } =20 +int tcp_sock_get_ulp(struct sock *sk, sockptr_t optval, sockptr_t optlen) +{ + struct inet_connection_sock *icsk =3D inet_csk(sk); + int len; + + if (copy_from_sockptr(&len, optlen, sizeof(int))) + return -EFAULT; + len =3D min_t(unsigned int, len, TCP_ULP_NAME_MAX); + if (!icsk->icsk_ulp_ops) { + len =3D 0; + if (copy_to_sockptr(optlen, &len, sizeof(int))) + return -EFAULT; + return 0; + } + if (copy_to_sockptr(optlen, &len, sizeof(int))) + return -EFAULT; + if (copy_to_sockptr(optval, icsk->icsk_ulp_ops->name, len)) + return -EFAULT; + return 0; +} + int do_tcp_getsockopt(struct sock *sk, int level, int optname, sockptr_t optval, sockptr_t optlen) { @@ -4604,20 +4625,7 @@ int do_tcp_getsockopt(struct sock *sk, int level, return 0; =20 case TCP_ULP: - if (copy_from_sockptr(&len, optlen, sizeof(int))) - return -EFAULT; - len =3D min_t(unsigned int, len, TCP_ULP_NAME_MAX); - if (!icsk->icsk_ulp_ops) { - len =3D 0; - if (copy_to_sockptr(optlen, &len, sizeof(int))) - return -EFAULT; - return 0; - } - if (copy_to_sockptr(optlen, &len, sizeof(int))) - return -EFAULT; - if (copy_to_sockptr(optval, icsk->icsk_ulp_ops->name, len)) - return -EFAULT; - return 0; + return tcp_sock_get_ulp(sk, optval, optlen); =20 case TCP_FASTOPEN_KEY: { u64 key[TCP_FASTOPEN_KEY_BUF_LENGTH / sizeof(u64)]; diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index de90a2897d2d..a6230f7910fd 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1393,6 +1393,17 @@ static int mptcp_put_int_option(struct mptcp_sock *m= sk, char __user *optval, return 0; } =20 +static int mptcp_getsockopt_tcp_ulp(struct sock *sk, char __user *optval, + int __user *optlen) +{ + int ret; + + lock_sock(sk); + ret =3D tcp_sock_get_ulp(sk, USER_SOCKPTR(optval), USER_SOCKPTR(optlen)); + release_sock(sk); + return ret; +} + static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname, char __user *optval, int __user *optlen) { @@ -1400,6 +1411,7 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock= *msk, int optname, =20 switch (optname) { case TCP_ULP: + return mptcp_getsockopt_tcp_ulp(sk, optval, optlen); case TCP_CONGESTION: case TCP_INFO: case TCP_CC_INFO: --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 287CF3A255D for ; Thu, 19 Mar 2026 10:09: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=1773914954; cv=none; b=pMyMJEZWo6zDYkCb1UoZzw3gVJyXeiZv4ahgXZ4YBDJY3meWcpDefturcXD3veUNOu/cZIsYiEGJDfybsBvScD8vb0lMukM9KOLgj9RfjoPj8xrnU5rhIEsYynOdxBVipcBg9I12LjG9ENyVU8+KXJSYUvaOaS0cApNdOWcDReU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914954; c=relaxed/simple; bh=+0BOLVFV8WRz9YaB5apP5PLt30g76/hz+1Ru+LI4UNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Va7pTO9BBbG9DLDGU2J4gRvhlHrOgCxHGPGFWHuIDGVp8bvSLOaGjnZ9DeTcZxSx34hMb54PE2E4fH+d635oFvzYZBdSIb1kWY5V8GhokyQDz8XEzbBF37sGxr40SXqb9AG733ORRDQuoh/p+Dai1CkcDo1zJmimPUSRCDQRt2s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JKdL7SeF; 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="JKdL7SeF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A50FBC2BC87; Thu, 19 Mar 2026 10:09:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914953; bh=+0BOLVFV8WRz9YaB5apP5PLt30g76/hz+1Ru+LI4UNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JKdL7SeF1t7m1Eyhh9vQ4YTxgoLqAXtQRuG4LUQF925K4iv6i6bBHhkTA9yUNIjd/ F98ilALgO8TZXVnpW132XspqwxOAr40eEZHb4KGAcoSQg/UD3XCApMCHL+GooLLp7o Xlli4zQIvxwuQ8QdqpJVgzB3D3n00E8SXHphMxnOP+38Kzg8l4Dl6OA1vW0Ay8JXJQ Zy0t7MX/HAE5OsTsATfegTs2puxZMhha3MsD7VW9+SAwOyQbYsnH2t0aGVUlq7QcjV t1AcyOumXfs/uJG5zS44eEDlckv4hY2wVKc4tPciR6yJhILf45/A02uAxqWQEWXQ0P TxnK9DmrN+FIQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 09/15] mptcp: enable ULP setsockopt for TLS support Date: Thu, 19 Mar 2026 18:08:42 +0800 Message-ID: <434a1d953278303dee02053f25abee2b2967117a.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 This patch extracts TCP_ULP setsockopt operation into a tcp_sock_set_ulp() helper so that it can also be used in MPTCP. Add MPTCP ULP setsockopt support in mptcp_setsockopt_sol_tcp(). This option cannot be set when the socket is in CLOSE or LISTEN state. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/linux/tcp.h | 1 + net/ipv4/tcp.c | 42 ++++++++++++++++++++++++------------------ net/mptcp/sockopt.c | 27 ++++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 19 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 2bb1cbd3eeab..00538b1aa2f0 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -654,6 +654,7 @@ int tcp_sock_set_syncnt(struct sock *sk, int val); int tcp_sock_set_user_timeout(struct sock *sk, int val); int tcp_sock_set_maxseg(struct sock *sk, int val); int tcp_sock_get_ulp(struct sock *sk, sockptr_t optval, sockptr_t optlen); +int tcp_sock_set_ulp(struct sock *sk, sockptr_t optval, unsigned int optle= n); =20 static inline bool dst_tcp_usec_ts(const struct dst_entry *dst) { diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 55d8fb848842..8ebd2402847e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3858,6 +3858,28 @@ int tcp_sock_set_maxseg(struct sock *sk, int val) return 0; } =20 +int tcp_sock_set_ulp(struct sock *sk, sockptr_t optval, unsigned int optle= n) +{ + char name[TCP_ULP_NAME_MAX]; + int err =3D 0; + size_t len; + int val; + + if (optlen < 1) + return -EINVAL; + + len =3D min_t(long, TCP_ULP_NAME_MAX - 1, optlen); + val =3D strncpy_from_sockptr(name, optval, len); + if (val < 0) + return -EFAULT; + name[val] =3D 0; + + sockopt_lock_sock(sk); + err =3D tcp_set_ulp(sk, name); + sockopt_release_sock(sk); + return err; +} + /* * Socket option code for TCP. */ @@ -3891,24 +3913,8 @@ int do_tcp_setsockopt(struct sock *sk, int level, in= t optname, sockopt_release_sock(sk); return err; } - case TCP_ULP: { - char name[TCP_ULP_NAME_MAX]; - - if (optlen < 1) - return -EINVAL; - - val =3D strncpy_from_sockptr(name, optval, - min_t(long, TCP_ULP_NAME_MAX - 1, - optlen)); - if (val < 0) - return -EFAULT; - name[val] =3D 0; - - sockopt_lock_sock(sk); - err =3D tcp_set_ulp(sk, name); - sockopt_release_sock(sk); - return err; - } + case TCP_ULP: + return tcp_sock_set_ulp(sk, optval, optlen); case TCP_FASTOPEN_KEY: { __u8 key[TCP_FASTOPEN_KEY_BUF_LENGTH]; __u8 *backup_key =3D NULL; diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index a6230f7910fd..d04eb98aaa32 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 @@ -815,6 +817,29 @@ static int mptcp_setsockopt_all_sf(struct mptcp_sock *= msk, int level, return ret; } =20 +static int mptcp_setsockopt_tcp_ulp(struct sock *sk, sockptr_t optval, + unsigned int optlen) +{ + char name[TCP_ULP_NAME_MAX]; + size_t len; + int val; + + if (optlen < 1) + return -EINVAL; + + len =3D min_t(long, TCP_ULP_NAME_MAX - 1, optlen); + val =3D strncpy_from_sockptr(name, optval, len); + if (val < 0) + return -EFAULT; + name[val] =3D 0; + + if (strcmp(name, "tls\0")) + return -EOPNOTSUPP; + if ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) + return -ENOTCONN; + return tcp_sock_set_ulp(sk, optval, optlen); +} + static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -823,7 +848,7 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *= msk, int optname, =20 switch (optname) { case TCP_ULP: - return -EOPNOTSUPP; + return mptcp_setsockopt_tcp_ulp(sk, optval, optlen); case TCP_CONGESTION: return mptcp_setsockopt_sol_tcp_congestion(msk, optval, optlen); case TCP_DEFER_ACCEPT: --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 E5B5A38551B for ; Thu, 19 Mar 2026 10:09:15 +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=1773914956; cv=none; b=JxcD4nuiOfftDgFzvKD36Vh7i3SLFhjIJtL3a/sApe7mU7885sMURLiPUUbDbAH8SqV6cAdh+naMJfV3rrtdA8vTx4vHvSvuJKBb1nGHZemFR/GU2JxQr+Ebo47v2xBtWcfdDpazs0qC/4IjzjZv0TprgOfI9jIw8IcgQ9Vi+rI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914956; c=relaxed/simple; bh=/LebqvnknnL06basaKBFF0yShgEpaL6raWlnbLgcSj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dWknMqSUbD1++HXm7lqnHp4IyrjwDI+KYjz1AtXjppf26wPOQ2pRBLeygZ6r72lgvhRVeluneFjZAVMwSOvIYwq/7ToO50DGEpUgUeDJzZzwgfb+1+kbA9mtTib2ue7N7vuH05vOq9bzfVp3aCvQxVzDyZsccb8GlFOpZvRa9k4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tQZvenFc; 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="tQZvenFc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E677C19424; Thu, 19 Mar 2026 10:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914955; bh=/LebqvnknnL06basaKBFF0yShgEpaL6raWlnbLgcSj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tQZvenFcDuvRgPWba21NEEcXAvVlEhHwUATrmKItUmMjTGfqHQ2OvbioW5X63EAs7 bDIERp49mNxff02L9biC9+YzAZ+3l/gUj7V5viuRJl4yXZdBmB5WTHPKfrjCCSUSot lQzh8qLRKF75up0fjZ0e3AQXnW6ZOYiR9kk5tu5BaKeTLI9wTUmjzyLLeAUz1BDUzf IWqv7YqOB6+5k7WSKxvwnMi1NaibvQEpcv7/inOHIg/3Ty/H8D6/HmAsPUioBuS+1Z kWMmr+WBESdMrl7g28jNzxXWZhhTxKuyQjwBH2DOmg4Twf1xxH7E3yA6q+mmEhfSyP jGYm9lgV8yRmA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 10/15] selftests: mptcp: connect: use espintcp for ULP test Date: Thu, 19 Mar 2026 18:08:43 +0800 Message-ID: <84a5532ce60d1ddbc9204f3a36d1d21ed1e70f7b.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 With KTLS being implemented, "tls" should no longer be used in sock_test_tcpulp(), it breaks mptcp_connect.sh tests. Another ULP name, "espintcp", is set instead in this patch. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 1 + tools/testing/selftests/net/mptcp/mptcp_connect.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index cbe573c4ab3a..0d4a944c4269 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -289,7 +289,7 @@ static void sock_test_tcpulp(int sock, int proto, unsig= ned int line) if (ret =3D=3D 0) X("setsockopt"); } else if (proto =3D=3D IPPROTO_MPTCP) { - ret =3D do_ulp_so(sock, "tls"); + ret =3D do_ulp_so(sock, "espintcp"); if (ret !=3D -1) X("setsockopt"); } --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 DB08A3BC697 for ; Thu, 19 Mar 2026 10:09:17 +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=1773914957; cv=none; b=aADjAHpC2daHfX15L4cUe5hFJzTUDI2d/5rZV75cjUd+6DoiSeF9Rfp3xCwbYY8T+32AX2XSa1KnAxFidVtbibwSag+oqLp0F0dTQU4UqVzeDOIDSQ9JSCOwxrYtejYjplMTOyUsLuEAPj1qjwphoY1GSIHOI3rIBr0jxq6XQpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914957; c=relaxed/simple; bh=tsDe+JxlsYBbaj5nJOkTXKxPUBEBZnjZgBM+evG90vE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uvCR+yRa574aHdutgXllGOL9fkEYYRv+npTaEw3IeNx2A34rhSf6F5tqMWxBc3rHhVn51S18UNRnD/u/wcG7ULj6Oez09+kmbPJPRtj3rghTiNuRwCwZVpATpit/C2GYEPkuZ5K0g5URvamzsLsot02s8g3ccrzT7Go7ABRLmgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ugwGPUpj; 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="ugwGPUpj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28405C19424; Thu, 19 Mar 2026 10:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914957; bh=tsDe+JxlsYBbaj5nJOkTXKxPUBEBZnjZgBM+evG90vE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ugwGPUpjK1hengCCgWs3sPqFogFad4nVj7UqqiVAfYRON0bOvZNaq0QQg+U6Hsm8L vLAkzKn02KguiEdaOljSYStmQhPXCrT/Z9U9Y/z+a6SbTm8cpMfwZUFc5/yhW+p7zG QYYnv30Qp96svBz0OLIKjI0FXynskYCGVgGPW5iLiMh8XflhdgwMs077B66OxLLmpf Oi99rF/qjj4xAT5eZrgZNc6UfDtgaTMN8fM9WiYuIBrIDnHcYms+wbuuAcqjkOUnjT xN0gu4g4o9FT5n6TcqPeNxSIVH/nRdTwHEf073jAgFMv/8zKcnC1RLPnCtpx4M8/UB GvqtATDz+H9Ww== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 11/15] selftests: tls: add mptcp variant for testing Date: Thu, 19 Mar 2026 18:08:44 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 To enable easy MPTCP socket creation in MPTCP TLS tests, two protocol parameters (cli_proto and srv_proto) have been added to ulp_sock_pair(). These are passed as third arguments of socket(): 0 creates TCP sockets, IPPROTO_MPTCP creates MPTCP sockets. A new variant "mptcp" is added both in FIXTURE_VARIANT(tls) to control whether to create MPTCP sockets or not for tests. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 32 +++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index 9e2ccea13d70..82631c1b3355 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -26,6 +26,10 @@ #define TLS_PAYLOAD_MAX_LEN 16384 #define SOL_TLS 282 =20 +#ifndef IPPROTO_MPTCP +#define IPPROTO_MPTCP 262 +#endif + static int fips_enabled; =20 struct tls_crypto_info_keys { @@ -109,7 +113,8 @@ static void memrnd(void *s, size_t n) } =20 static void ulp_sock_pair(struct __test_metadata *_metadata, - int *fd, int *cfd, bool *notls) + int *fd, int *cfd, bool *notls, + int cli_proto, int srv_proto) { struct sockaddr_in addr; socklen_t len; @@ -122,8 +127,8 @@ static void ulp_sock_pair(struct __test_metadata *_meta= data, addr.sin_addr.s_addr =3D htonl(INADDR_ANY); addr.sin_port =3D 0; =20 - *fd =3D socket(AF_INET, SOCK_STREAM, 0); - sfd =3D socket(AF_INET, SOCK_STREAM, 0); + *fd =3D socket(AF_INET, SOCK_STREAM, cli_proto); + sfd =3D socket(AF_INET, SOCK_STREAM, srv_proto); =20 ret =3D bind(sfd, &addr, sizeof(addr)); ASSERT_EQ(ret, 0); @@ -232,7 +237,7 @@ FIXTURE(tls_basic) =20 FIXTURE_SETUP(tls_basic) { - ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls); + ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls, 0, 0); } =20 FIXTURE_TEARDOWN(tls_basic) @@ -310,6 +315,7 @@ FIXTURE_VARIANT(tls) uint16_t tls_version; uint16_t cipher_type; bool nopad, fips_non_compliant; + bool mptcp; }; =20 FIXTURE_VARIANT_ADD(tls, 12_aes_gcm) @@ -407,7 +413,9 @@ FIXTURE_SETUP(tls) tls_crypto_info_init(variant->tls_version, variant->cipher_type, &tls12, 0); =20 - ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls); + ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls, + variant->mptcp ? IPPROTO_MPTCP : 0, + variant->mptcp ? IPPROTO_MPTCP : 0); =20 if (self->notls) return; @@ -2473,7 +2481,7 @@ FIXTURE_SETUP(zero_len) tls_crypto_info_init(TLS_1_2_VERSION, TLS_CIPHER_AES_CCM_128, &tls12, 0); =20 - ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls); + ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls, 0, 0); if (self->notls) return; =20 @@ -2554,8 +2562,8 @@ FIXTURE_SETUP(tls_err) tls_crypto_info_init(variant->tls_version, TLS_CIPHER_AES_GCM_128, &tls12, 0); =20 - ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls); - ulp_sock_pair(_metadata, &self->fd2, &self->cfd2, &self->notls); + ulp_sock_pair(_metadata, &self->fd, &self->cfd, &self->notls, 0, 0); + ulp_sock_pair(_metadata, &self->fd2, &self->cfd2, &self->notls, 0, 0); if (self->notls) return; =20 @@ -2906,7 +2914,7 @@ TEST(tls_12_tx_max_payload_len) tls_crypto_info_init(TLS_1_2_VERSION, TLS_CIPHER_AES_CCM_128, &tls12, 0); =20 - ulp_sock_pair(_metadata, &fd, &cfd, ¬ls); + ulp_sock_pair(_metadata, &fd, &cfd, ¬ls, 0, 0); =20 if (notls) exit(KSFT_SKIP); @@ -2955,7 +2963,7 @@ TEST(tls_12_tx_max_payload_len_open_rec) tls_crypto_info_init(TLS_1_2_VERSION, TLS_CIPHER_AES_CCM_128, &tls12, 0); =20 - ulp_sock_pair(_metadata, &fd, &cfd, ¬ls); + ulp_sock_pair(_metadata, &fd, &cfd, ¬ls, 0, 0); =20 if (notls) exit(KSFT_SKIP); @@ -3058,7 +3066,7 @@ TEST(keysizes) { tls12.info.version =3D TLS_1_2_VERSION; tls12.info.cipher_type =3D TLS_CIPHER_AES_GCM_256; =20 - ulp_sock_pair(_metadata, &fd, &cfd, ¬ls); + ulp_sock_pair(_metadata, &fd, &cfd, ¬ls, 0, 0); =20 if (!notls) { ret =3D setsockopt(fd, SOL_TLS, TLS_TX, &tls12, @@ -3084,7 +3092,7 @@ TEST(no_pad) { tls12.info.version =3D TLS_1_3_VERSION; tls12.info.cipher_type =3D TLS_CIPHER_AES_GCM_256; =20 - ulp_sock_pair(_metadata, &fd, &cfd, ¬ls); + ulp_sock_pair(_metadata, &fd, &cfd, ¬ls, 0, 0); =20 if (notls) exit(KSFT_SKIP); --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 5686F3AD536 for ; Thu, 19 Mar 2026 10:09:19 +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=1773914959; cv=none; b=O75wmeBLpMX+RWNkK8Efwz935wQYPp0fK1LB9zQxwA3ciXe6QkHHXAMvbjrO+hhwVY+kSSgConhc4WnI9axtMjMvMt5qCM4DEiKkJgHtO0dLa32wnIyZh8fV0VhfDFO4z4NyR+IE2Gj2zhdtJFsQolNYxN+9ijiqC4oYn88YEEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914959; c=relaxed/simple; bh=iPS29msdi7CJmBZYf3L4bmYPtdYtCB01O5NyIXPM0H8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CvHXFDkad1VUEABkPyaXOjLtXIrLH5eMqQNy3vK7UrAsb5zITzMpSQlO+u4o+g8bhjFkk4a/oYVz0v+QfbvQhg1C2gBEDGO5GHRF7UqN/C7fnnLigYsyUnaqU0+WmsZUvzEx2m/pEKtzuFZC6iszC+2cyKu7pg4sX6jb/bol58E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ils2HHcW; 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="Ils2HHcW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03C58C2BCAF; Thu, 19 Mar 2026 10:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914959; bh=iPS29msdi7CJmBZYf3L4bmYPtdYtCB01O5NyIXPM0H8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ils2HHcW0HA5gMPLSA4Yg4MSmz1f1p5JOJ6DE8CQCbI+X8oyfF4BQgd/QaPXS8XAm cwR/svuvFXUe0+UUTYJbdgdENIiAQo/ZhqP5Isn1cBPTj6aDNaZtB2wUjLS9uVHUBZ qbbtN0HjzaXloIJ5Cx+WHUUSVL4wJksa70W6IYciJaSnPJ9PKVKqMmHEGw47aa5v7R k3RDV2JQW4cNDlbtc5I2ofhhCl3HU8mRdty2bUfMadrQPEIwfftuE0etLGieOolUQ+ 3O7lTQeOJt+PWUAoL5D2bJ7mAIrPvVHcFnaL69MB3AES+1TGlIiPA0cLbVVEAaEQ8H xlJ1cqhG7tRNA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 12/15] selftests: tls: increase nonblocking data size for MPTCP Date: Thu, 19 Mar 2026 18:08:45 +0800 Message-ID: <0e41df5ab04cd871955c2468c2c5949c9c6f3280.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 Double the data size in nonblocking tests to accommodate MPTCP's multi-subflow behavior and ensure sufficient data for testing, avoiding the following errors: # RUN tls.12_aria_gcm_mptcp.nonblocking ... # tls.c:1534:nonblocking:Expected 0 (0) !=3D eagain (0) # nonblocking: Test failed Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index 82631c1b3355..534c4ffd8fd1 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -1398,6 +1398,9 @@ TEST_F(tls, nonblocking) int flags; int res; =20 + if (variant->mptcp) + data *=3D 2; + flags =3D fcntl(self->fd, F_GETFL, 0); fcntl(self->fd, F_SETFL, flags | O_NONBLOCK); fcntl(self->cfd, F_SETFL, flags | O_NONBLOCK); --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 09C293BE14F for ; Thu, 19 Mar 2026 10:09:20 +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=1773914961; cv=none; b=SnovGQypB6KGFX/DrCLnNk/h+beMK/DD8DVXYwQevBBlwdwM+HjydJunOH12+i3r83j4E0/++OW7PaQwqzZ2EGQoS6LfFBPQ3bfxj5nxgyLBbAwQOqY2rnX94vYRN5gsk241uFoujT6adP1pcA7cfCM0kPVjg+nz5q4T6KjfClg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914961; c=relaxed/simple; bh=yqVyD0SoK436qWkgcDSH/RKHOhV4qAzNeI9w8pbCgHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QTZOZVtUFtPgpwKgDyK4cTpBkw7orESVi5JlPn3Zdc+iI6OgvyF7iuC7ZmlOAl7f0acjAQk6Zg6hLRvYnkILt4RCPXlDro/Crlt6Xp1l079+e/Z6fJNhAAdT9NcFB0jrTJPGSUxgPZc6FL6y3lyruVlEmZFIyEBKdA6RIaSyuEs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qJxKbzd8; 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="qJxKbzd8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B25E4C19424; Thu, 19 Mar 2026 10:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914960; bh=yqVyD0SoK436qWkgcDSH/RKHOhV4qAzNeI9w8pbCgHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qJxKbzd8ysU9/qnSqQLxWwGPGmiOIbO1aOLkTjwyM622cgOsXIos7fCpXsozwW/VI Tcd0Ntdp3T/h5sksGY547gCLuq0Vf4eC0+I7cVuVM1dp/sX5iRiiDS3W5sGCSs22pd OiQK8hAYIdbSQw1ZP4Xulr6oHleXN0kqwCijBU+csEC3pSpp9fGD3pGcgKNb/fD+q9 OicZtfTioDyAcmljQT6neV5aEI5NGg4LvZWWajJ8AcbMZLIT3oXS5fnrXHisunIHH8 v1eBZjw0yrzO8MptG9f6noVpp750ZpUEB1+QN5/Bja+eEsXoxmSZD1x8vaCctjaM9I Gzo0n/LVRIfRg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 13/15] selftests: tls: wait TCP_CLOSE in shutdown_reuse for MPTCP Date: Thu, 19 Mar 2026 18:08:46 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 In shutdown_reuse tests, add a delay after shutdown to wait for MPTCP sockets to reach TCP_CLOSE state before reuse via bind(), avoiding the following errors: # RUN tls.12_aes_gcm_mptcp.shutdown_reuse ... # tls.c:1790:shutdown_reuse:Expected ret (-1) =3D=3D 0 (0) # shutdown_reuse: Test failed # FAIL tls.12_aes_gcm_mptcp.shutdown_reuse not ok 14 tls.12_aes_gcm_mptcp.shutdown_reuse # RUN tls.13_aes_gcm_mptcp.shutdown_reuse ... # tls.c:1790:shutdown_reuse:Expected ret (-1) =3D=3D 0 (0) # shutdown_reuse: Test failed # FAIL tls.13_aes_gcm_mptcp.shutdown_reuse not ok 15 tls.13_aes_gcm_mptcp.shutdown_reuse # RUN tls.12_chacha_mptcp.shutdown_reuse ... # OK tls.12_chacha_mptcp.shutdown_reuse ok 16 tls.12_chacha_mptcp.shutdown_reuse # RUN tls.13_chacha_mptcp.shutdown_reuse ... # OK tls.13_chacha_mptcp.shutdown_reuse ok 17 tls.13_chacha_mptcp.shutdown_reuse # RUN tls.13_sm4_gcm_mptcp.shutdown_reuse ... # tls.c:1790:shutdown_reuse:Expected ret (-1) =3D=3D 0 (0) # shutdown_reuse: Test failed # FAIL tls.13_sm4_gcm_mptcp.shutdown_reuse not ok 18 tls.13_sm4_gcm_mptcp.shutdown_reuse Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index 534c4ffd8fd1..45cbdfe8aed4 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -30,6 +30,10 @@ #define IPPROTO_MPTCP 262 #endif =20 +#ifndef TCP_CLOSE +#define TCP_CLOSE 7 +#endif + static int fips_enabled; =20 struct tls_crypto_info_keys { @@ -1671,6 +1675,25 @@ TEST_F(tls, shutdown_unsent) shutdown(self->cfd, SHUT_RDWR); } =20 +static int wait_for_tcp_close(struct __test_metadata *_metadata, + int fd, int max) +{ + struct tcp_info info; + socklen_t len; + int i, ret; + + len =3D sizeof(info); + for (i =3D 0; i < max; i++) { + ret =3D getsockopt(fd, IPPROTO_TCP, TCP_INFO, &info, &len); + EXPECT_EQ(ret, 0); + if (info.tcpi_state =3D=3D TCP_CLOSE) + return 0; + usleep(1000); + } + + return -1; +} + TEST_F(tls, shutdown_reuse) { struct sockaddr_in addr; @@ -1680,6 +1703,9 @@ TEST_F(tls, shutdown_reuse) shutdown(self->cfd, SHUT_RDWR); close(self->cfd); =20 + if (variant->mptcp) + EXPECT_EQ(wait_for_tcp_close(_metadata, self->fd, 1000), 0); + addr.sin_family =3D AF_INET; addr.sin_addr.s_addr =3D htonl(INADDR_ANY); addr.sin_port =3D 0; --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 86C4A370D51 for ; Thu, 19 Mar 2026 10:09:22 +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=1773914962; cv=none; b=Zj6to/tqffnWKKGU+1IThRSYqaJ/9yGG/8xWwU1qnbr227AJVJn5EO1NcgXwO8vRlxPqc3FSB9A9HPvUsUJcsvnMULdvypCxRsMBogAWwitZjYKAYQMLJDZpZpf8Hhim6mqjLyt2xIR4YkUCP18HgGI0vnstDV1bp14ZM2CmLvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914962; c=relaxed/simple; bh=zTXMrGGakrElMh1RKOBctf48723/tQGZv5OkXCW3lgo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tb4qGomZ599BtxuWOCj0vvFRwM99bJk7MZSGlC6gLPCJSq4H7HC7jALa5KtLy7b2IDTZw98V0l4WV9Z1gcwRgxSvebXMEJS9RsJjaeTVQRlFAA0rPt2PU64LZ2zA8dxzg64TXqhhpZ2lHvKvTN02RsV5TjOc8m9T+9DLyBVxqOA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QuKAqCL+; 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="QuKAqCL+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 553C9C2BC87; Thu, 19 Mar 2026 10:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914962; bh=zTXMrGGakrElMh1RKOBctf48723/tQGZv5OkXCW3lgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QuKAqCL+wEheBdjVJQbgjri5tiK8Y9Hv2wY+1KNy9aL9Hhd6CD8RmdiE7SP/h0U4Z kjGwapMP8smc7VxU+i1dgp5wQmQbwF9xo9HLnOmpvmuVu6xQhyIlYi6KwDjs9UdFx3 12J6VfbUdlud8wQzVGfPsYWSv7Nqs8KKHoKkZq4iTQGJ86invUgvWMHBPZO1LzaPHg ShrPFdCkYmJUnnPNwosUYe+uYEDIPEIpeqelTFBtiL8LkzAMmDJ+QhGgA5Y+scHeA6 +JV0Q/W2oK7ihaEQSoKe+EaN4yBrSV96I9KHSUWtwTerjOmXN8vUFLf8H9ne86jZgV zUsA7RL8VO8Yg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 14/15] selftests: tls: add MPTCP test cases Date: Thu, 19 Mar 2026 18:08:47 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 This patch introduces MPTCP test cases for the TLS fixture. These "mptcp" variants are configured to create MPTCP sockets specifically for MPTCP TLS testing purposes. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 96 +++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index 45cbdfe8aed4..b225db55be8f 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -405,6 +405,102 @@ FIXTURE_VARIANT_ADD(tls, 12_aria_gcm_256) .cipher_type =3D TLS_CIPHER_ARIA_GCM_256, }; =20 +FIXTURE_VARIANT_ADD(tls, 12_aes_gcm_mptcp) +{ + .tls_version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_128, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 13_aes_gcm_mptcp) +{ + .tls_version =3D TLS_1_3_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_128, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 12_chacha_mptcp) +{ + .tls_version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_CHACHA20_POLY1305, + .fips_non_compliant =3D true, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 13_chacha_mptcp) +{ + .tls_version =3D TLS_1_3_VERSION, + .cipher_type =3D TLS_CIPHER_CHACHA20_POLY1305, + .fips_non_compliant =3D true, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 13_sm4_gcm_mptcp) +{ + .tls_version =3D TLS_1_3_VERSION, + .cipher_type =3D TLS_CIPHER_SM4_GCM, + .fips_non_compliant =3D true, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 13_sm4_ccm_mptcp) +{ + .tls_version =3D TLS_1_3_VERSION, + .cipher_type =3D TLS_CIPHER_SM4_CCM, + .fips_non_compliant =3D true, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 12_aes_ccm_mptcp) +{ + .tls_version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_AES_CCM_128, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 13_aes_ccm_mptcp) +{ + .tls_version =3D TLS_1_3_VERSION, + .cipher_type =3D TLS_CIPHER_AES_CCM_128, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 12_aes_gcm_256_mptcp) +{ + .tls_version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_256, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 13_aes_gcm_256_mptcp) +{ + .tls_version =3D TLS_1_3_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_256, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 13_nopad_mptcp) +{ + .tls_version =3D TLS_1_3_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_128, + .nopad =3D true, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 12_aria_gcm_mptcp) +{ + .tls_version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_ARIA_GCM_128, + .mptcp =3D true, +}; + +FIXTURE_VARIANT_ADD(tls, 12_aria_gcm_256_mptcp) +{ + .tls_version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_ARIA_GCM_256, + .mptcp =3D true, +}; + FIXTURE_SETUP(tls) { struct tls_crypto_info_keys tls12; --=20 2.53.0 From nobody Sun Mar 22 08:25:58 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 9B63D3BD242 for ; Thu, 19 Mar 2026 10:09: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=1773914964; cv=none; b=WG9xbEOAE+j68prrNK8DhiyQbS8xYOXOVYs5WnHYLpOgysYsi6MjLYLmSzn7qcEk0C2lJuStZ9o3zWSZ6IBHBbGpGGuBM/2VB6H2ZBFhMhk19/602ZIOJ0i7x6PqyLQBRisDzx27AgjvpHqfscUPKxqxh12i3mgOLRAqeknV/3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773914964; c=relaxed/simple; bh=P/VbPc6nzXHUtnt2XJ9fN+R9cJSxqarYu7inTXRT6qs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VlnRXTCEPjJjYi2lSXiZGTzdimURv2brQm0QUGNpTUVnMQCgaxd3ov6jKzh60u/1SwnVO4s/jBPVd+1WPo+vC1esyaeKYrTAMKDlO2YFY476vQ7S+XD0I1SWAsr8hf/uKp+R1U64qdpzx00Bo84nnSTwmdN6INPyjh61OHc3HKI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pjc+35j5; 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="pjc+35j5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1212C2BC87; Thu, 19 Mar 2026 10:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773914964; bh=P/VbPc6nzXHUtnt2XJ9fN+R9cJSxqarYu7inTXRT6qs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pjc+35j5Ehm27oCG1836hzLQeLBPKa0IrKqWNtY5ToBHXI4UTzh9GRbkyET9+odcf SNnJkmgUFg5cCJbPXYGCwK+k9GCCeknnKruo93yoU+8anbuG/o0sNnmEXof22Qx7M5 t2aMelRh73O4Pspv5PQd6k6ERjldR0GWWcNM0YrwLOy/XBUunFwuKckPYq6dXbfw2c R5BMMInXdwsKU0pdHRZVCzqgHpUqTaCaUMGL3KxuB4moDPXwn32MbYSJXIu17C74Qn YWlut/ADJiyN6nahdwzlf+ZJziIH6f6IEPEbLwvH0ZOXqOhECot0ukmYqbLwS6qdz9 q/mXprbSe7QBw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v11 15/15] selftests: mptcp: cover mptcp tls tests Date: Thu, 19 Mar 2026 18:08:48 +0800 Message-ID: <7dfdc9c184b8f96cb4a808e1022ef5a6af15099e.1773911536.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 The mptcp tests for tls.c is available now, this patch adds mptcp_tls.sh to test it in the MPTCP CI by default. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/Makefile | 2 + tools/testing/selftests/net/mptcp/config | 3 ++ .../testing/selftests/net/mptcp/mptcp_tls.sh | 53 +++++++++++++++++++ tools/testing/selftests/net/mptcp/tls.c | 1 + 4 files changed, 59 insertions(+) create mode 100755 tools/testing/selftests/net/mptcp/mptcp_tls.sh create mode 120000 tools/testing/selftests/net/mptcp/tls.c diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/sel= ftests/net/mptcp/Makefile index 22ba0da2adb8..f7c959a25b3b 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -14,6 +14,7 @@ TEST_PROGS :=3D \ mptcp_connect_splice.sh \ mptcp_join.sh \ mptcp_sockopt.sh \ + mptcp_tls.sh \ pm_netlink.sh \ simult_flows.sh \ userspace_pm.sh \ @@ -25,6 +26,7 @@ TEST_GEN_FILES :=3D \ mptcp_inq \ mptcp_sockopt \ pm_nl_ctl \ + tls \ # end of TEST_GEN_FILES =20 TEST_FILES :=3D \ diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 18bd29ac5b24..471c7e0ba2be 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -35,3 +35,6 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_SYN_COOKIES=3Dy CONFIG_VETH=3Dy CONFIG_TLS=3Dy +CONFIG_CRYPTO_ARIA=3Dy +CONFIG_CRYPTO_CHACHA20POLY1305=3Dm +CONFIG_CRYPTO_SM4_GENERIC=3Dy diff --git a/tools/testing/selftests/net/mptcp/mptcp_tls.sh b/tools/testing= /selftests/net/mptcp/mptcp_tls.sh new file mode 100755 index 000000000000..9d928a3a5ed4 --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_tls.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +. "$(dirname "${0}")/mptcp_lib.sh" + +ret=3D0 +ns1=3D"" + +cleanup() +{ + if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then + kill "$pid" 2>/dev/null + wait "$pid" 2>/dev/null + fi + + mptcp_lib_ns_exit "$ns1" +} + +init() +{ + mptcp_lib_ns_init ns1 + + mptcp_lib_pm_nl_set_limits "$ns1" 8 8 + + local i + for i in $(seq 1 4); do + mptcp_lib_pm_nl_add_endpoint "$ns1" \ + "127.0.0.1" flags signal port 1000"$i" + done +} + +init +trap cleanup EXIT + +ip netns exec "$ns1" ./tls -v 12_aes_gcm_mptcp \ + -v 13_aes_gcm_mptcp \ + -v 12_chacha_mptcp \ + -v 13_chacha_mptcp \ + -v 13_sm4_gcm_mptcp \ + -v 13_sm4_ccm_mptcp \ + -v 12_aes_ccm_mptcp \ + -v 13_aes_ccm_mptcp \ + -v 12_aes_gcm_256_mptcp \ + -v 13_aes_gcm_256_mptcp \ + -v 13_nopad_mptcp \ + -v 12_aria_gcm_mptcp \ + -v 12_aria_gcm_256_mptcp & +pid=3D$! +wait $pid +ret=3D$? + +mptcp_lib_result_print_all_tap +exit $ret diff --git a/tools/testing/selftests/net/mptcp/tls.c b/tools/testing/selfte= sts/net/mptcp/tls.c new file mode 120000 index 000000000000..724b1f047c89 --- /dev/null +++ b/tools/testing/selftests/net/mptcp/tls.c @@ -0,0 +1 @@ +../tls.c \ No newline at end of file --=20 2.53.0