From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 468063ACF0B for ; Thu, 28 May 2026 09:27:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960448; cv=none; b=BguXMre2PZYclt3gxcrd1M6QUj/dIEIohTzMBHwAF+PwpZlg/n0VgQKQTLDVVDbVvpYSGmT6K+mdMmUBk+Rl4a8k+oV++lQOEbcbfnv0VzmifwouhX5EwJnh8fZQ64GnHKgldef5RxFtkYIV5GiUGQG7Jjb22ApiaxYRhoEDytA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960448; c=relaxed/simple; bh=6SzUhpZrI1alAQGT/031hNzjvGXJpkxD2WzZEx9xbgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JDQNsGu3C5wLodfZPbMEJ2BPP5zaDZYuhU9SlfwWztvGWtaHoBwaDP3ign6iA1EQ0P23gk5NU9hW7Xalp4pA5X+O4n6k24EUWPUjgS1dJH2LaYSpDTVTIbwk40t0Iu/Sj8sQHnDPVupIeWrsmkMraQI4NUqVYHfWSbqdrAY++OA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H7f86oC4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H7f86oC4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 777C21F000E9; Thu, 28 May 2026 09:27:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960445; bh=gOb91N4Qy444MyWW0x8lkp6+QPELrR8g796Py5qXNJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H7f86oC475o9u45ZF6MtnsMAE91xCgEP/4U5NthTRYtq1b+GOc0iSmV2/WY55iOj4 Eq5Bct41dXoLS1PwYoA7+jo4iRHX7v52ObJ5e0nGGm2VjwO0yxFfxasgOlWO0wxpYm N3T3m+uGDSwzClclkvNYzjdeZBlW327aQ7sVFBnsS/0t6J/cV8W8/rUEQH0D1Ap3Bl cMWKZQTNyOqLtTrJRDDFvvgx2HW5HPy+A4P3oiFnJ3N8EYTFdlsnBdk49D3sCVSam3 m+/nMnmZ/40OrP5LeTmF+18Pe3IOov+QDk3vVwuSZ/aWfZwMTeK3Rk5MmL9XtVjXTu NUMmLaUVPJ6og== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 01/18] tls: add per-protocol cache for MPTCP support Date: Thu, 28 May 2026 17:26:52 +0800 Message-ID: <675c4178ee70ee93daf1a00e372abd066766c72f.1779959644.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 TLS ULP uses global static arrays to cache base protocol operations. When MPTCP sockets enable TLS, they overwrite these global caches when building for MPTCP, causing active TCP TLS sockets to use MPTCP-specific ops. This leads to type confusion and kernel panics. Fix by replacing the global caches with a per-protocol linked list. Each protocol (TCP, MPTCP, etc.) now has its own cached operations, stored in struct tls_prot and referenced from tls_context. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/tls.h | 12 ++++ net/tls/tls_main.c | 134 ++++++++++++++++++++++++++++++++------------- 2 files changed, 109 insertions(+), 37 deletions(-) diff --git a/include/net/tls.h b/include/net/tls.h index ebd2550280ae..7ff4d4566d41 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -220,6 +220,16 @@ struct tls_prot_info { u16 tail_size; }; =20 +struct tls_prot { + struct rcu_head rcu; + refcount_t refcnt; + struct list_head list; + int ip_ver; + const struct proto *prot; + struct proto prots[TLS_NUM_CONFIG][TLS_NUM_CONFIG]; + struct proto_ops proto_ops[TLS_NUM_CONFIG][TLS_NUM_CONFIG]; +}; + struct tls_context { /* read-only cache line */ struct tls_prot_info prot_info; @@ -257,6 +267,8 @@ struct tls_context { struct proto *sk_proto; struct sock *sk; =20 + struct tls_prot *prot; + void (*sk_destruct)(struct sock *sk); =20 union tls_crypto_context crypto_send; diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index fd39acf41a61..e87e298ebd85 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -119,23 +119,62 @@ CHECK_CIPHER_DESC(TLS_CIPHER_SM4_CCM, tls12_crypto_in= fo_sm4_ccm); CHECK_CIPHER_DESC(TLS_CIPHER_ARIA_GCM_128, tls12_crypto_info_aria_gcm_128); CHECK_CIPHER_DESC(TLS_CIPHER_ARIA_GCM_256, tls12_crypto_info_aria_gcm_256); =20 -static const struct proto *saved_tcpv6_prot; -static DEFINE_MUTEX(tcpv6_prot_mutex); -static const struct proto *saved_tcpv4_prot; -static DEFINE_MUTEX(tcpv4_prot_mutex); -static struct proto tls_prots[TLS_NUM_PROTS][TLS_NUM_CONFIG][TLS_NUM_CONFI= G]; -static struct proto_ops tls_proto_ops[TLS_NUM_PROTS][TLS_NUM_CONFIG][TLS_N= UM_CONFIG]; +static LIST_HEAD(tls_prot_list); +static DEFINE_SPINLOCK(tls_prot_lock); static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], const struct proto *base); =20 +static struct tls_prot *tls_prot_find(const struct proto *proto, + int ip_ver) +{ + struct tls_prot *prot, *ret =3D NULL; + + rcu_read_lock(); + list_for_each_entry_rcu(prot, &tls_prot_list, list) { + if (prot->prot =3D=3D proto && prot->ip_ver =3D=3D ip_ver && + refcount_inc_not_zero(&prot->refcnt)) { + ret =3D prot; + break; + } + } + rcu_read_unlock(); + return ret; +} + +static void tls_prot_free(struct rcu_head *rcu) +{ + struct tls_prot *prot =3D container_of(rcu, struct tls_prot, rcu); + + kfree(prot); +} + +static void tls_prot_cleanup(void) +{ + struct tls_prot *prot, *tmp; + + spin_lock_bh(&tls_prot_lock); + list_for_each_entry_safe(prot, tmp, &tls_prot_list, list) { + list_del_rcu(&prot->list); + call_rcu(&prot->rcu, tls_prot_free); + } + spin_unlock_bh(&tls_prot_lock); + rcu_barrier(); +} + void update_sk_prot(struct sock *sk, struct tls_context *ctx) { - int ip_ver =3D sk->sk_family =3D=3D AF_INET6 ? TLSV6 : TLSV4; + struct tls_prot *prot =3D ctx->prot; =20 + if (!prot) + return; + + /* Ensure sk->sk_socket->ops is not visible before icsk_ulp_data. + * Pairs with the rcu_assign_pointer() release in tls_ctx_create(). + */ + smp_store_release(&sk->sk_socket->ops, + &prot->proto_ops[ctx->tx_conf][ctx->rx_conf]); WRITE_ONCE(sk->sk_prot, - &tls_prots[ip_ver][ctx->tx_conf][ctx->rx_conf]); - WRITE_ONCE(sk->sk_socket->ops, - &tls_proto_ops[ip_ver][ctx->tx_conf][ctx->rx_conf]); + &prot->prots[ctx->tx_conf][ctx->rx_conf]); } =20 int wait_on_pending_writer(struct sock *sk, long *timeo) @@ -314,6 +353,16 @@ static void tls_write_space(struct sock *sk) ctx->sk_write_space(sk); } =20 +static void tls_prot_put(struct tls_prot *prot) +{ + if (refcount_dec_and_test(&prot->refcnt)) { + spin_lock_bh(&tls_prot_lock); + list_del_rcu(&prot->list); + spin_unlock_bh(&tls_prot_lock); + call_rcu(&prot->rcu, tls_prot_free); + } +} + /** * tls_ctx_free() - free TLS ULP context * @sk: socket to with @ctx is attached @@ -327,6 +376,11 @@ void tls_ctx_free(struct sock *sk, struct tls_context = *ctx) if (!ctx) return; =20 + if (ctx->prot) { + tls_prot_put(ctx->prot); + ctx->prot =3D NULL; + } + memzero_explicit(&ctx->crypto_send, sizeof(ctx->crypto_send)); memzero_explicit(&ctx->crypto_recv, sizeof(ctx->crypto_recv)); mutex_destroy(&ctx->tx_lock); @@ -968,35 +1022,34 @@ static void build_proto_ops(struct proto_ops ops[TLS= _NUM_CONFIG][TLS_NUM_CONFIG] #endif } =20 -static void tls_build_proto(struct sock *sk) +static struct tls_prot *tls_build_proto(struct sock *sk) { int ip_ver =3D sk->sk_family =3D=3D AF_INET6 ? TLSV6 : TLSV4; - struct proto *prot =3D READ_ONCE(sk->sk_prot); - - /* Build IPv6 TLS whenever the address of tcpv6 _prot changes */ - if (ip_ver =3D=3D TLSV6 && - unlikely(prot !=3D smp_load_acquire(&saved_tcpv6_prot))) { - mutex_lock(&tcpv6_prot_mutex); - if (likely(prot !=3D saved_tcpv6_prot)) { - build_protos(tls_prots[TLSV6], prot); - build_proto_ops(tls_proto_ops[TLSV6], - sk->sk_socket->ops); - smp_store_release(&saved_tcpv6_prot, prot); - } - mutex_unlock(&tcpv6_prot_mutex); - } + struct proto *proto =3D READ_ONCE(sk->sk_prot); + struct tls_prot *prot, *cache; =20 - if (ip_ver =3D=3D TLSV4 && - unlikely(prot !=3D smp_load_acquire(&saved_tcpv4_prot))) { - mutex_lock(&tcpv4_prot_mutex); - if (likely(prot !=3D saved_tcpv4_prot)) { - build_protos(tls_prots[TLSV4], prot); - build_proto_ops(tls_proto_ops[TLSV4], - sk->sk_socket->ops); - smp_store_release(&saved_tcpv4_prot, prot); - } - mutex_unlock(&tcpv4_prot_mutex); + prot =3D kzalloc_obj(*prot, GFP_KERNEL); + if (!prot) + return NULL; + + spin_lock_bh(&tls_prot_lock); + cache =3D tls_prot_find(proto, ip_ver); + if (cache) { + spin_unlock_bh(&tls_prot_lock); + kfree(prot); + return cache; } + + prot->ip_ver =3D ip_ver; + prot->prot =3D proto; + refcount_set(&prot->refcnt, 1); + build_protos(prot->prots, proto); + build_proto_ops(prot->proto_ops, + sk->sk_socket->ops); + list_add_rcu(&prot->list, &tls_prot_list); + + spin_unlock_bh(&tls_prot_lock); + return prot; } =20 static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], @@ -1046,10 +1099,13 @@ static void build_protos(struct proto prot[TLS_NUM_= CONFIG][TLS_NUM_CONFIG], =20 static int tls_init(struct sock *sk) { + struct tls_prot *prot; struct tls_context *ctx; int rc =3D 0; =20 - tls_build_proto(sk); + prot =3D tls_build_proto(sk); + if (!prot) + return -ENOMEM; =20 #ifdef CONFIG_TLS_TOE if (tls_toe_bypass(sk)) @@ -1062,13 +1118,16 @@ static int tls_init(struct sock *sk) * to modify the accept implementation to clone rather then * share the ulp context. */ - if (sk->sk_state !=3D TCP_ESTABLISHED) + if (sk->sk_state !=3D TCP_ESTABLISHED) { + tls_prot_put(prot); return -ENOTCONN; + } =20 /* allocate tls context */ write_lock_bh(&sk->sk_callback_lock); ctx =3D tls_ctx_create(sk); if (!ctx) { + tls_prot_put(prot); rc =3D -ENOMEM; goto out; } @@ -1265,6 +1324,7 @@ static int __init tls_register(void) static void __exit tls_unregister(void) { tcp_unregister_ulp(&tcp_tls_ulp_ops); + tls_prot_cleanup(); tls_strp_dev_exit(); tls_device_cleanup(); unregister_pernet_subsys(&tls_proc_ops); --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 75CAD390CBE for ; Thu, 28 May 2026 09:27:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960449; cv=none; b=p4zWQPAuE1sTw4/oYjOR1M51lbPu8+5+nIeCtkVyvAw+/GMIKQxIPoXst6KjYUXoGH3BqUVCFZ57oXCXKcbWgaKhhDUd/knzjR6xWvak0R/QW0Pcj6V0tJt14hf0tgkuwEQO6CEP3+ImE4EC5bVS74p87NeMB3OZWa/xcfxezaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960449; c=relaxed/simple; bh=6nX6SJToyNKmEUrZFGmCPsbJrhIG0LjnaRKHVSYGxJ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pNHJSMxCrUMEyBCEAnYBbuLxi9M1CymG5uoY70xcfqff8Uc1iycW+m/4FBTc98n/HbmzGGMwqKkOhCTeO3CdscJzo7KJIOMEqEd9+IR9lDYYT1/O1NxiPOPilXmVkd1dua+SHBvXnA6H93J5Bj8J50DBu/j57JS0N8GQqVQLJAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MoijBE4i; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MoijBE4i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92B341F00A3A; Thu, 28 May 2026 09:27:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960446; bh=+UZQJ9J/7I0LG7y1qkdwM3mNF4ONn+jRy1AoQn0X/v0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MoijBE4iyTP6QlTl9gtGCAhAnl2K9SfhFhlqMKtAKn3nILsG61vOwJIO74nMC6Hf5 kMnQz5fTbPGWYDt8+Z4rOXLfL8hkmYD9caL7M+nR7DzxuCiiur19hm2uqKCWPErvmN NeiakNMbe9be8RBG7WLgqkLZ1WX4y1oFs9D2t8xDuw6fSPw57R1JhKmuu0uJ4yRpuW b5D2Y5+pKs2Taof8K1sKxLyPkJ0tSFfJjA/RDmwk+Kggz8s0YPyDsx2xZItp4tuUcQ h4dqzYNfScxiQdsUeAVaAqksD+OJb5/YdT3oVzQIICk5illoHdboUFagbzMLrAoLtN gpzUKAJLUwQ0A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 02/18] tls: add prot parameter to tls_ctx_create Date: Thu, 28 May 2026 17:26:53 +0800 Message-ID: <05c29605c2c31008e99b3645241fdaf9d2e2d3bb.1779959644.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 Add a struct tls_prot *prot parameter to tls_ctx_create() and tls_toe_bypass(), and store the pointer in tls_context. This allows protocol-specific TLS operation tables (e.g., for MPTCP) to be passed down. Also add WRITE_ONCE(sk->sk_prot, ctx->sk_proto) in tls_toe_sk_destruct() to restore the original socket protocol before freeing the TLS context. This is necessary because the socket may have been switched to a TLS protocol variant; on destruction we must revert it to avoid use-after-free or stale function pointers.. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/tls_toe.h | 2 +- net/tls/tls.h | 2 +- net/tls/tls_main.c | 7 ++++--- net/tls/tls_toe.c | 6 ++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/net/tls_toe.h b/include/net/tls_toe.h index b3aa7593ce2c..f1de7d2498cf 100644 --- a/include/net/tls_toe.h +++ b/include/net/tls_toe.h @@ -69,7 +69,7 @@ struct tls_toe_device { struct kref kref; }; =20 -int tls_toe_bypass(struct sock *sk); +int tls_toe_bypass(struct sock *sk, struct tls_prot *prot); int tls_toe_hash(struct sock *sk); void tls_toe_unhash(struct sock *sk); =20 diff --git a/net/tls/tls.h b/net/tls/tls.h index 12f44cb649c9..b9a41e1b8f8c 100644 --- a/net/tls/tls.h +++ b/net/tls/tls.h @@ -136,7 +136,7 @@ struct tls_rec { int __net_init tls_proc_init(struct net *net); void __net_exit tls_proc_fini(struct net *net); =20 -struct tls_context *tls_ctx_create(struct sock *sk); +struct tls_context *tls_ctx_create(struct sock *sk, struct tls_prot *prot); void tls_ctx_free(struct sock *sk, struct tls_context *ctx); void update_sk_prot(struct sock *sk, struct tls_context *ctx); =20 diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index e87e298ebd85..0778e2dc9f53 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -964,7 +964,7 @@ static int tls_disconnect(struct sock *sk, int flags) return -EOPNOTSUPP; } =20 -struct tls_context *tls_ctx_create(struct sock *sk) +struct tls_context *tls_ctx_create(struct sock *sk, struct tls_prot *prot) { struct inet_connection_sock *icsk =3D inet_csk(sk); struct tls_context *ctx; @@ -975,6 +975,7 @@ struct tls_context *tls_ctx_create(struct sock *sk) =20 mutex_init(&ctx->tx_lock); ctx->sk_proto =3D READ_ONCE(sk->sk_prot); + ctx->prot =3D prot; ctx->sk =3D sk; /* Release semantic of rcu_assign_pointer() ensures that * ctx->sk_proto is visible before changing sk->sk_prot in @@ -1108,7 +1109,7 @@ static int tls_init(struct sock *sk) return -ENOMEM; =20 #ifdef CONFIG_TLS_TOE - if (tls_toe_bypass(sk)) + if (tls_toe_bypass(sk, prot)) return 0; #endif =20 @@ -1125,7 +1126,7 @@ static int tls_init(struct sock *sk) =20 /* allocate tls context */ write_lock_bh(&sk->sk_callback_lock); - ctx =3D tls_ctx_create(sk); + ctx =3D tls_ctx_create(sk, prot); if (!ctx) { tls_prot_put(prot); rc =3D -ENOMEM; diff --git a/net/tls/tls_toe.c b/net/tls/tls_toe.c index 825669e1ab47..e92853c106da 100644 --- a/net/tls/tls_toe.c +++ b/net/tls/tls_toe.c @@ -48,13 +48,15 @@ static void tls_toe_sk_destruct(struct sock *sk) struct inet_connection_sock *icsk =3D inet_csk(sk); struct tls_context *ctx =3D tls_get_ctx(sk); =20 + WRITE_ONCE(sk->sk_prot, ctx->sk_proto); + ctx->sk_destruct(sk); /* Free ctx */ rcu_assign_pointer(icsk->icsk_ulp_data, NULL); tls_ctx_free(sk, ctx); } =20 -int tls_toe_bypass(struct sock *sk) +int tls_toe_bypass(struct sock *sk, struct tls_prot *prot) { struct tls_toe_device *dev; struct tls_context *ctx; @@ -63,7 +65,7 @@ int tls_toe_bypass(struct sock *sk) spin_lock_bh(&device_spinlock); list_for_each_entry(dev, &device_list, dev_list) { if (dev->feature && dev->feature(dev)) { - ctx =3D tls_ctx_create(sk); + ctx =3D tls_ctx_create(sk, prot); if (!ctx) goto out; =20 --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 46208390CBE for ; Thu, 28 May 2026 09:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960450; cv=none; b=I7MPsaGJ+TMV0IpTrFVQDeD/ll8ds3oA/ue38B1RBFnGSljfqbBArPbvVVICV0JfKmm0c5+C6/UgklWciFvZW8H0n1LQYLdQx7YGxFNZYg+4e5LKfNdiq+OJEXrdqjTvFsHb2fZOaIGlQp5e/2oef29OEFpKlog+ZRk2HIoYFus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960450; c=relaxed/simple; bh=rpj0dsGJQYuFL5xVW+hldbuPpoV6oeQg+DUv8OfZs/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QK++prBIldmhY9ar+NFeuwhx7mxMeq5Lqnf1Vk5YBcjqhYbpQodpKaC/PtCTv9xwkz9n/2Bhe18T2ufXIBd2Fe6n/QbAJMMIdXVrQHr/jaKHqXziMyajcSb9UmhSs7W8PoGSJmowfAllb+1XnuFN5zVfLdu883+PJlhQp544k5g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h6c7sdYO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="h6c7sdYO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EAF01F00A3C; Thu, 28 May 2026 09:27:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960449; bh=7B4GcIr0x1kQSOJEVf0KosnOzLq/muG+LQaACs7h0/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h6c7sdYOv13krlOo6tg/catPEVUrpY4r6h82ILAYGdqRuGfHPd6SJWr2suJWWKteE 3LvbkqhJLmUdBIUpAwp7dWroArvCKoo371idOiO04uGE6ue1FUTdS4NskWkSD+g+j0 y8IthMpAx/y1yc82RHOZYPSWaoeJ44VFH7PcEpSni6s2/iKprGnT6VSKR6KyJLx0wm WtjkRdYazWrci2zqAnS5S/VM7PZAgNURsAcdID3qyHAb++m7FVRw6Htw5Wz3u+oEaW V9Iqjs9aBUP3IeeXCk4zIrL+Huvbae8JNUE8AxIxktOmgaiPnOUM5Rm/kr33t7gHVB 0iCzHlotVu/XQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 03/18] tls: introduce tls protocol ops structure Date: Thu, 28 May 2026 17:26:54 +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 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_register(). Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/tls.h | 20 +++++++++ net/tls/tls_main.c | 105 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 1 deletion(-) diff --git a/include/net/tls.h b/include/net/tls.h index 7ff4d4566d41..83c9ce6c36f8 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -220,6 +220,26 @@ struct tls_prot_info { u16 tail_size; }; =20 +struct tls_prot_ops { + struct module *owner; + int protocol; + 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); + bool (*lock_is_held)(struct sock *sk); + 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_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_prot { struct rcu_head rcu; refcount_t refcnt; diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 0778e2dc9f53..9669a3acff00 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -120,6 +120,7 @@ CHECK_CIPHER_DESC(TLS_CIPHER_ARIA_GCM_128, tls12_crypto= _info_aria_gcm_128); CHECK_CIPHER_DESC(TLS_CIPHER_ARIA_GCM_256, tls12_crypto_info_aria_gcm_256); =20 static LIST_HEAD(tls_prot_list); +static LIST_HEAD(tls_prot_ops_list); static DEFINE_SPINLOCK(tls_prot_lock); static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], const struct proto *base); @@ -161,6 +162,22 @@ static void tls_prot_cleanup(void) rcu_barrier(); } =20 +static struct tls_prot_ops *tls_prot_ops_find(int protocol) +{ + struct tls_prot_ops *ops, *ret =3D NULL; + + rcu_read_lock(); + list_for_each_entry_rcu(ops, &tls_prot_ops_list, list) { + if (ops->protocol =3D=3D protocol) { + ret =3D ops; + break; + } + } + rcu_read_unlock(); + + return ret; +} + void update_sk_prot(struct sock *sk, struct tls_context *ctx) { struct tls_prot *prot =3D ctx->prot; @@ -1296,6 +1313,85 @@ 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->lock_is_held || + !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_bh(&tls_prot_lock); + if (tls_prot_ops_find(ops->protocol)) { + spin_unlock_bh(&tls_prot_lock); + return -EEXIST; + } + + list_add_tail_rcu(&ops->list, &tls_prot_ops_list); + spin_unlock_bh(&tls_prot_lock); + + pr_debug("tls_prot_ops %d registered\n", ops->protocol); + return 0; +} + +static void tls_unregister_prot_ops(struct tls_prot_ops *ops) +{ + spin_lock_bh(&tls_prot_lock); + list_del_rcu(&ops->list); + spin_unlock_bh(&tls_prot_lock); + synchronize_rcu(); +} + +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 bool tls_tcp_lock_is_held(struct sock *sk) +{ + return sock_owned_by_user_nocheck(sk); +} + +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 { + .owner =3D THIS_MODULE, + .protocol =3D IPPROTO_TCP, + .inq =3D tcp_inq, + .sendmsg_locked =3D tcp_sendmsg_locked, + .recv_skb =3D tls_tcp_recv_skb, + .lock_is_held =3D tls_tcp_lock_is_held, + .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; @@ -1308,13 +1404,19 @@ static int __init tls_register(void) if (err) goto err_pernet; =20 - err =3D tls_device_init(); + err =3D tls_register_prot_ops(&tls_tcp_ops); if (err) goto err_strp; =20 + err =3D tls_device_init(); + if (err) + goto err_ops; + tcp_register_ulp(&tcp_tls_ulp_ops); =20 return 0; +err_ops: + tls_unregister_prot_ops(&tls_tcp_ops); err_strp: tls_strp_dev_exit(); err_pernet: @@ -1325,6 +1427,7 @@ static int __init tls_register(void) static void __exit tls_unregister(void) { tcp_unregister_ulp(&tcp_tls_ulp_ops); + tls_unregister_prot_ops(&tls_tcp_ops); tls_prot_cleanup(); tls_strp_dev_exit(); tls_device_cleanup(); --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 17BC63ADBA3 for ; Thu, 28 May 2026 09:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960454; cv=none; b=PSRmBI2M44+zUDLWeUSh5ZUwT0YaGtCm5V9uLbttNNyRmiFd5BfwgMyfT9qR8AzPA2gWLMbEqvXn6I8GsIlF+5GDBm6I5hskQZd1/4KiOhFJatnLbfX33ti5s6+LWnjkSi4f8OnqVyUqT2DgiD0WaHoiEwQ2rfM+TiJywbs4Sxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960454; c=relaxed/simple; bh=3r4/HrLSOKgFkCKe+mpLvoM7nQMlqUyUwBZ0Ryrbs4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XelO5389z4lsA5qBomwt7tYeLHB3ThyZaRaS2w66ib7zuOn0yAWar9C8NVN5vLl7AQOY+mhHl3Q+FQgQ5CimVOPWlxPtC7m+ksXZKX6+guqI58kQC09mZjQZjbBUMDm1164yxqESDK+J/utPRyQsnQBWGRuu5chz7jUA0PvqSPI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qr4uakQC; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Qr4uakQC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 818C31F000E9; Thu, 28 May 2026 09:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960450; bh=UzmcisxeoFQDNkWmGR3ysbJf0q0FkP93GgxceaTkAqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Qr4uakQCmu3Bvv3HRM0c2wSh3a0LgvsgNOA8RHRVIBUvVYrBntT5lKe0YikDximcx fgN2IsIoBF8HhlQ2H8FbABRPHNsvOQupGhPlClyRr+RUsZhZL99RaExTl1rdWw6i+Z CXLuAUkPEJCtTh9DVVztYm3Pmb2aiTmCkQDWTDjokBBxtMA/OGLLEl9+9KsM9ym4UL LHrq1vjdapYZw5USqYxi2/EwAPE3k3DaDk3maythxMvPIWKLMMNn/luv8U0SiLP5i9 /pl8IRpdEXwPIWq/2xYmJQ0IoMz9wtliawwQvcCM6Nxw4zScE8nS29+vYyajwdf2yi +ueC6LXXGFuVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 04/18] tls: store protocol ops pointer in tls_proto Date: Thu, 28 May 2026 17:26:55 +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 A pointer to struct tls_prot_ops, named 'ops', has been added to struct tls_prot. The places originally calling TLS-specific helpers have now been modified to indirectly invoke them via 'ops' pointer in tls_prot. In tls_build_proto(), prot->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 | 33 ++++++++++++++++++++++----------- net/tls/tls_sw.c | 6 ++++-- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/include/net/tls.h b/include/net/tls.h index 83c9ce6c36f8..de7a80eaadfe 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -246,6 +246,7 @@ struct tls_prot { struct list_head list; int ip_ver; const struct proto *prot; + const struct tls_prot_ops *ops; struct proto prots[TLS_NUM_CONFIG][TLS_NUM_CONFIG]; struct proto_ops proto_ops[TLS_NUM_CONFIG][TLS_NUM_CONFIG]; }; diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 9669a3acff00..dab69488214b 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -156,6 +156,7 @@ static void tls_prot_cleanup(void) spin_lock_bh(&tls_prot_lock); list_for_each_entry_safe(prot, tmp, &tls_prot_list, list) { list_del_rcu(&prot->list); + module_put(prot->ops->owner); call_rcu(&prot->rcu, tls_prot_free); } spin_unlock_bh(&tls_prot_lock); @@ -244,13 +245,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->prot->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->prot->ops->sendmsg_locked(sk, &msg, size); =20 if (ret !=3D size) { if (ret > 0) { @@ -376,6 +377,7 @@ static void tls_prot_put(struct tls_prot *prot) spin_lock_bh(&tls_prot_lock); list_del_rcu(&prot->list); spin_unlock_bh(&tls_prot_lock); + module_put(prot->ops->owner); call_rcu(&prot->rcu, tls_prot_free); } } @@ -1045,6 +1047,7 @@ static struct tls_prot *tls_build_proto(struct sock *= sk) int ip_ver =3D sk->sk_family =3D=3D AF_INET6 ? TLSV6 : TLSV4; struct proto *proto =3D READ_ONCE(sk->sk_prot); struct tls_prot *prot, *cache; + struct tls_prot_ops *ops; =20 prot =3D kzalloc_obj(*prot, GFP_KERNEL); if (!prot) @@ -1058,8 +1061,16 @@ static struct tls_prot *tls_build_proto(struct sock = *sk) return cache; } =20 + ops =3D tls_prot_ops_find(sk->sk_protocol); + if (!ops || !try_module_get(ops->owner)) { + spin_unlock_bh(&tls_prot_lock); + kfree(prot); + return NULL; + } + prot->ip_ver =3D ip_ver; prot->prot =3D proto; + prot->ops =3D ops; refcount_set(&prot->refcnt, 1); build_protos(prot->prots, proto); build_proto_ops(prot->proto_ops, diff --git a/net/tls/tls_strp.c b/net/tls/tls_strp.c index c72e88317627..c88cb966649b 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 =3D tls_get_ctx(strp->sk); struct sk_buff *skb; =20 if (strp->copy_mode) @@ -132,7 +133,7 @@ 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->prot->ops->read_done(strp->sk, strp->stm.full_len); strp->copy_mode =3D 1; =20 return 0; @@ -376,6 +377,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 +385,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->prot->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 +401,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->prot->ops->epollin_ready(strp->sk))) return 0; =20 shinfo =3D skb_shinfo(strp->anchor); @@ -434,12 +437,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->prot->ops->get_skb_seq(first); =20 /* Make sure there's no duplicate data in the queue, * and the decrypted status matches. @@ -449,7 +453,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->prot->ops->get_skb_seq(skb) !=3D seq) return false; if (skb_cmp_decrypted(first, skb)) return false; @@ -460,11 +464,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->prot->ops->recv_skb(strp->sk, &offset); if (WARN_ON_ONCE(!first)) return; =20 @@ -483,6 +487,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 +495,8 @@ 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->prot->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->prot->ops->inq(strp->sk); if (inq < 1) return 0; =20 @@ -556,6 +563,8 @@ void tls_strp_check_rcv(struct tls_strparser *strp) /* Lower sock lock held */ void tls_strp_data_ready(struct tls_strparser *strp) { + struct tls_context *ctx =3D tls_get_ctx(strp->sk); + /* This check is needed to synchronize with do_tls_strp_work. * do_tls_strp_work acquires a process lock (lock_sock) whereas * the lock held here is bh_lock_sock. The two locks can be @@ -563,7 +572,7 @@ void tls_strp_data_ready(struct tls_strparser *strp) * allows a thread in BH context to safely check if the process * lock is held. In this case, if the lock is held, queue work. */ - if (sock_owned_by_user_nocheck(strp->sk)) { + if (ctx->prot->ops->lock_is_held(strp->sk)) { queue_work(tls_strp_wq, &strp->work); return; } @@ -583,10 +592,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->prot->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 964ebc268ee4..4cac7a90851a 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1987,7 +1987,8 @@ tls_read_flush_backlog(struct sock *sk, struct tls_pr= ot_info *prot, 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_get_ctx(sk)->prot->ops->inq(sk) > max_rec) return false; =20 *flushed_at =3D done; @@ -2516,7 +2517,8 @@ int tls_rx_msg_size(struct tls_strparser *strp, struc= t sk_buff *skb) } =20 tls_device_rx_resync_new_rec(strp->sk, data_len + TLS_HEADER_SIZE, - TCP_SKB_CB(skb)->seq + strp->stm.offset); + tls_ctx->prot->ops->get_skb_seq(skb) + + strp->stm.offset); return data_len + TLS_HEADER_SIZE; =20 read_failure: --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 198013AE195 for ; Thu, 28 May 2026 09:27:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960455; cv=none; b=XS4zM++T7aav8tTZbE/gNxeaSomfkr5mmqxTzuEHCOcyqg+uqzSFwk2QtvwjDuScT9wopE01fO1je4qoZxev1i9aeRtO8W4OuvjW5VJ3bvoYemESvOwoevQ0Tr3W2ZOglg43/V5kMXwDmkz/hcJNHkHuu5Krlxyn7gXeEaNB7mU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960455; c=relaxed/simple; bh=IK0C/GZlOHo0QcI8yuMhPUHQEt0Y/udby3W879D/eAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uPoDVVxPXMNsSAwA4p/IEU5uXGp0L9d3jg/kmz0enBkR/zioimtWks5OhHipDw6NH/Jor/liGD5yVECLS+zaXS00iENrA7hWfWVBw0mkjoHTqZ1yYiWAgYabvY0qAb6BRVYP7HOV11sNliHtsespUvHl4BofbwpxA++voWwzvyk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I1snOsEH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I1snOsEH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 335051F00A3A; Thu, 28 May 2026 09:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960452; bh=7B4d8pf6FvYKR3lgfy1IJmPLFaTmVxB3JmqsO6iCS8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=I1snOsEH/bvbFC5i9+vc1Y+Wp93/ssVzMojqIpHUHwcGZJRrilPe0A88KuQ4EKV7h DpPaGmidva7C2fhz9+UjobjwPWXIO1Miu5fNgL/Rrm0DmL2sjDvZ8RJINLAHqZh/6Y 3l/m3s4mFK2e9nA2kdVq5XdF2/JDs1fJR4/U7LpmfIe7Z6I+TftI6a2lBhme+Q7gI+ xEQ754MJ1RZvwX4WZ0ho/NOH27t3cyQlNc+ccyh9BdSAPb1hNdrDh7KM3dr/3sQhgb qGDl5FLMQE2iP7L38im5WMmEiuK0w1eBwWThaXKSy56IINFziU03XMnJGlZnwhtQmi PLwMpqARdB8cw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 05/18] tls: add memory barriers for lockless accesses Date: Thu, 28 May 2026 17:26:56 +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 Add smp_rmb() barriers in tls_sk_poll() and tls_sw_sock_is_readable() to ensure proper ordering when reading the TLS context. These pair with the smp_store_release() in update_sk_prot(). In tls_sk_poll(), replace the direct call to tcp_poll() with an indirect call via tls_ctx->prot->ops->poll. This allows the correct poll function to be used for both TCP and MPTCP sockets when TLS is enabled. Also add a NULL check for tls_ctx in tls_sw_sock_is_readable() to safely return false when the context is not yet initialized. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/tls/tls_main.c | 11 +++++++++-- net/tls/tls_sw.c | 17 +++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index dab69488214b..b463c9fc2908 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -482,14 +482,21 @@ static __poll_t tls_sk_poll(struct file *file, struct= socket *sock, u8 shutdown; int state; =20 - mask =3D tcp_poll(file, sock, wait); + /* Paired with smp_store_release() in update_sk_prot(). + * Ensures that the read of icsk_ulp_data (tls_ctx) is ordered after + * the read of sk->sk_socket->ops inside tls_ctx->prot->ops->poll(). + * Prevents seeing a new ops pointer but a stale (NULL) ulp_data. + */ + smp_rmb(); + + tls_ctx =3D tls_get_ctx(sk); + mask =3D tls_ctx->prot->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 diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 4cac7a90851a..f944a22b7873 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2451,11 +2451,24 @@ int tls_sw_read_sock(struct sock *sk, read_descript= or_t *desc, =20 bool tls_sw_sock_is_readable(struct sock *sk) { - struct tls_context *tls_ctx =3D tls_get_ctx(sk); - struct tls_sw_context_rx *ctx =3D tls_sw_ctx_rx(tls_ctx); + struct tls_sw_context_rx *ctx; + struct tls_context *tls_ctx; bool ingress_empty =3D true; struct sk_psock *psock; =20 + /* Paired with smp_store_release() in update_sk_prot(). + * Ensures that the read of icsk_ulp_data (tls_ctx) is ordered after + * the read of sk->sk_prot in sk_is_readable(). Prevents seeing a new + * sk->sk_prot (TLS ops) but stale (NULL) icsk_ulp_data. + */ + smp_rmb(); + + tls_ctx =3D tls_get_ctx(sk); + if (!tls_ctx) + return false; + + ctx =3D tls_sw_ctx_rx(tls_ctx); + rcu_read_lock(); psock =3D sk_psock(sk); if (psock) --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 7FDB8390CBE for ; Thu, 28 May 2026 09:27:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960456; cv=none; b=Lbm5iIkJmA2Evmbs2nnWEpnAPuLk3N5tc55enN09Xtv1GEDErU1bPg2iRgYN8xazRy4mwnnuD4kH8K9c61FaolM+Z38k7kLd4D2gBGH/hyLV9dZUhMBoBBHXpQbGXf/sDMlZX4bPDqBBJquYLZ7KFMwcJ1tfc5ts5BgkuPyC2fQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960456; c=relaxed/simple; bh=KCU7YwIvtG4/+w7KZqpnHpRPfcJZP1pjKvbBm5J7oLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iQ/2ce/3IcQvGQOK8H8EFrU2jxAwFcttIsEpmbjeJiD+8qfknIyU97W0qT+24oplF1jWDggQ6mcEiHAH9rXkA9BK+PZFHztc1axSwe7nJ58Vp5BgRwwfNesqZc9CanXBvOL+083xkOVs3lx4DjDsWrkfeaI1i5wTuaxQD1KtlT0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SNNp6Jec; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SNNp6Jec" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCC391F00A3C; Thu, 28 May 2026 09:27:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960453; bh=8H7BUdeSDcR41hXnsnfzQUdPkXFX2J39t8GM9DTZxxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SNNp6JecxaxLQ4oOPXgH/hYR/vJP6k43JC/Q0Or3JSYnudC1aJI4H8S5APNqdmVk+ TPuUs+iHS1kzAJtxNO8ojCScDp4QT2IBHHTGNyk576d8mdOFHaVgRrjGWBEGtS0UkM NYQoblFqxU5arD9xKZK58Nx2J2q8A+ykGRTrqRh17fY/lmvv+GmKmmI4VPwtUidwud Ed0H7OmLKxxhBXlSiDzf9Efm8vRoDREQ2xeiplCF0w9fs2Ep/Cx5Cj+SRpB3MfjonE ONUWaPsqrTl7DgOXWZMliS16yvGFU3uJEd5B9qv4MFNnqfrNWsu2RDLjGBSj600UCP cj1b4r0YyGSJQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [RFC mptcp-next v21 06/18] mptcp: update mptcp_check_readable helper Date: Thu, 28 May 2026 17:26:57 +0800 Message-ID: <0c44d14e94050fb5ac4206d705e1c909cd42ee49.1779959644.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 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 1d67728d4233..366ad42eb0a7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3284,9 +3284,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) @@ -4350,7 +4352,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 Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 F121E3ACA59 for ; Thu, 28 May 2026 09:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960458; cv=none; b=V4/8ewiQJRuOP3sOVgcJeyUfgiSj5E+3RdXDgZnNXE6cEmUTXNVDyoBpy+6M+9ph6Rsxl9BLX/MHVQty80FkTI08uP0AYJpvhyxGCGzaOwARPwhteFEFpZ+UHaS3CjMwHkI7K9QKknPqTnidCz5f1uFSAby3H0AKthL7a1R61NI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960458; c=relaxed/simple; bh=uMjucMdLtC0zoG0SHtmL1C6TWacW8dDXfEGGrHF8bY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hu67vIde5bDEZRBYcEVhOHysmkIeeDx4btLu+FRrV/FOXqf2IGw1mkTtRMI/SVLjxne59MGlzWjSUyOxYo0Di1bfEMz4XM7cBx29xBnRcTe6Xr9L2wcvNXrmzQqNiz9lSh5lsiSyts0wKmDXMIZ/IThiQOEIwP4bPkTxJeJjTRc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mFc8NJn7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mFc8NJn7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DFC61F000E9; Thu, 28 May 2026 09:27:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960455; bh=M8YjcrTerKkw3bygxFp1w1ocMXAdRf7wPwxMInMxB58=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mFc8NJn7WH4VbiID1IFWz9xwlTZVATD/Cd1ZrDfcJFxa37OBvCb49pClQl7qAiiou QUxLv/DbJUsfHUcCla66Qk1QKYSwAquuArN35hWd+sBSj+HN8zWHOTW1h0wqcTzE2T nhDhl4ZXcbIRDFmTAZQo4Gj/ZSi+RZQqxHdm/1oJcbeV5l4c5PdMUd9SGG6ECoZHnC y7WCq7QrHgTZMjWh6F6XaXeGX2yKwFXNXG9ZYzP9p4GLwTD7bynKoC2mkSoW/EFUQ/ 8kSDgXI9lVM9K5G+1t9buDBGBgRDrEzMGNoSJ36uNaA8Y2K5+3aVPB6CPLWdHR1+LL rOXtld96HTUEg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 07/18] mptcp: implement mptcp-specific tls protocol ops Date: Thu, 28 May 2026 17:26:58 +0800 Message-ID: <31d432be24b27757d4b99acb5e4c74843170a2a1.1779959644.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 implements the MPTCP-specific struct tls_prot_ops, named 'tls_mptcp_ops'. 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. When MPTCP implements lock_is_held interface, it not only checks sock_owned_by_user_nocheck(sk) as TCP does, but also needs to check whether the MPTCP data lock is held. This is required because TLS may call lock_is_held from softirq context with bh_lock_sock held. Checking both conditions ensures TLS always defers to workqueue when the MPTCP data lock is held, avoiding deadlock. 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 | 121 +++++++++++++++++++++++++++++++++++++++++-- net/mptcp/protocol.h | 1 + net/tls/tls_main.c | 13 +++++ 6 files changed, 141 insertions(+), 6 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index aef2dbeb847b..75a30c70c6e1 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -128,6 +128,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 f063eccbbba3..1c8201f69ef1 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -849,6 +849,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 a058f350a759..bdad459e6605 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1097,9 +1097,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 && @@ -1112,6 +1112,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 366ad42eb0a7..e68846b8eeb4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "protocol.h" #include "mib.h" @@ -1909,7 +1910,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; @@ -1921,8 +1922,6 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) msg->msg_flags &=3D MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_FASTOPEN | MSG_EOR; =20 - lock_sock(sk); - mptcp_rps_record_subflows(msk); =20 if (unlikely(inet_test_bit(DEFER_CONNECT, sk) || @@ -2038,7 +2037,6 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) } =20 out: - release_sock(sk); return copied; =20 do_error: @@ -2049,6 +2047,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) @@ -4734,3 +4743,107 @@ int __init mptcp_proto_v6_init(void) return err; } #endif + +static int mptcp_inq(struct sock *sk) +{ + const struct mptcp_sock *msk =3D mptcp_sk(sk); + const struct sk_buff *skb; + + if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) + return 0; + + skb =3D skb_peek(&sk->sk_receive_queue); + if (skb) { + u64 answ =3D READ_ONCE(msk->ack_seq) - MPTCP_SKB_CB(skb)->map_seq; + + if (answ >=3D INT_MAX) + answ =3D INT_MAX; + + /* Subtract 1, if FIN was received */ + if (answ && + (sk->sk_state =3D=3D TCP_CLOSE || + (sk->sk_shutdown & RCV_SHUTDOWN))) + answ--; + + return (int)answ; + } + + return 0; +} + +static bool mptcp_lock_is_held(struct sock *sk) +{ + return sock_owned_by_user_nocheck(sk) || + mptcp_data_is_locked(sk); +} + +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_seq(struct sk_buff *skb) +{ + return MPTCP_SKB_CB(skb)->map_seq - MPTCP_SKB_CB(skb)->offset; +} + +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 { + .owner =3D THIS_MODULE, + .protocol =3D IPPROTO_MPTCP, + .inq =3D mptcp_inq, + .sendmsg_locked =3D mptcp_sendmsg_locked, + .recv_skb =3D mptcp_recv_skb, + .lock_is_held =3D mptcp_lock_is_held, + .read_sock =3D mptcp_read_sock, + .read_done =3D mptcp_read_done, + .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/mptcp/protocol.h b/net/mptcp/protocol.h index 2321ad4d845d..1d8fcd742eb9 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -380,6 +380,7 @@ struct mptcp_sock { =20 #define mptcp_data_lock(sk) spin_lock_bh(&(sk)->sk_lock.slock) #define mptcp_data_unlock(sk) spin_unlock_bh(&(sk)->sk_lock.slock) +#define mptcp_data_is_locked(sk) spin_is_locked(&(sk)->sk_lock.slock) =20 #define mptcp_for_each_subflow(__msk, __subflow) \ list_for_each_entry(__subflow, &((__msk)->conn_list), node) diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index b463c9fc2908..f5abee635fb2 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -1426,6 +1426,12 @@ static int __init tls_register(void) if (err) goto err_strp; =20 +#ifdef CONFIG_MPTCP + err =3D tls_register_prot_ops(&tls_mptcp_ops); + if (err) + goto err_tcp; +#endif + err =3D tls_device_init(); if (err) goto err_ops; @@ -1434,6 +1440,10 @@ static int __init tls_register(void) =20 return 0; err_ops: +#ifdef CONFIG_MPTCP + tls_unregister_prot_ops(&tls_mptcp_ops); +err_tcp: +#endif tls_unregister_prot_ops(&tls_tcp_ops); err_strp: tls_strp_dev_exit(); @@ -1445,6 +1455,9 @@ static int __init tls_register(void) static void __exit tls_unregister(void) { tcp_unregister_ulp(&tcp_tls_ulp_ops); +#ifdef CONFIG_MPTCP + tls_unregister_prot_ops(&tls_mptcp_ops); +#endif tls_unregister_prot_ops(&tls_tcp_ops); tls_prot_cleanup(); tls_strp_dev_exit(); --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E1CC33A1684 for ; Thu, 28 May 2026 09:27:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960461; cv=none; b=tDjPB/kyyK8pGlx3R0wTbmhDJW0zWfu65I9O5aIAqbk7XyeqnRRIVNFxV0c4keZi1RzIU2IJi9nx09BqDD+0S0Dtnhjc7TJ9IN4c2iP89+JIq9qnr6lr6GBMQvJ0VelWQ1+xfrBdrWNtcWc2TWiBNEYKXMAYBn22fzxOfBYrs9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960461; c=relaxed/simple; bh=hrtN9uQddVM0lcmO9wc2o6AU3IK9pMQ70Z6iH5TPITU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tlPKwh0Ye4uuc1PLXjcPUnmXS1XNCGkJJyse5+1r4+esV07S+fSVvokMKvl3ha2Sdb0IAcre3tffVdWjA5Tr/BQzc71ZYnSpnJlCORajP20TQJbOaKND9c4xdowdE9v3FYvl8eLDFVe6xno96gJ//exK7shAk/xSVtvEPNidFX8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hUiFU3zc; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hUiFU3zc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4B041F00A3A; Thu, 28 May 2026 09:27:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960457; bh=NkVnihIy31dIAYz2JOSqK3T3ETJqUTTxorUyuRboKN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hUiFU3zctHzPjGmNXEB9jBwK7Dbc0qUmyGT+E3nx64W/elUGLiYSACqGefVNNDPya bqw+Y81P4FnQOEnWuz5bxgcn3Se5xcA6pLVFLYQVe5oW3/bkcV2xzzMzzjMNGsRco4 Z9kl5xF/MIb/czEmIX+tkQeKoD3yPvpA90CsFR5wttKmEcPFdkykT2dW8Gyp/Bx91X H3PkYYKGfsStTx+xoZD//WmkegWUtODf1v1wYzHS6ATwVdyjctGJTeIqiUfBWloVml JjBnBfY1x+k1vvbMijj5BlBFYENCAZt3y17giNreHGro5nsq+sBIlaauUug9DkQEbp C/8q/+PQzJsSw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 08/18] tls: disable device offload for mptcp sockets Date: Thu, 28 May 2026 17:26:59 +0800 Message-ID: <54c690a3cb104d125a29380d09e5fecb7de39cf6.1779959644.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 741aef09bfd3..06f45edffb5f 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 Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 610463AE195 for ; Thu, 28 May 2026 09:27:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960461; cv=none; b=dgSWZ+R4qNCgmJJJ8Yy1BLmsfzJamnmEOWAeIRieVLRcBXM16P/cYyD2S6LzEKoLzMwgY8dhovr784NXRXY1sope5aSUf8dZg+PUBFbH7RPgKl/cYYApcfgoX4KlR2kIkQqxsDTY0tL75SMaLpc+pb44ZTqv+kyZBTV36NpNSAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960461; c=relaxed/simple; bh=PRsRtQMbqPSJTuLPkh6J0qJ8JmoMlCxZRynscVYYKZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jB+AdnVpbldGD57WDNCIQm8E2jxf+Z06l/rZ/NnRUwO+vLKayG47pAlUxvFAxG8+CSkrzalJPv2Dupp9f42WrDP8hd5jV/U7Molx3ozIG7jPIAuH/j/ADdBRY3jxfYNCaMzWVP0aKM7rj3k/1kV+YNQcnpT1It10c8uO94+ju6Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iD0LmQp2; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iD0LmQp2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D33541F00A3C; Thu, 28 May 2026 09:27:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960458; bh=yeBAIObCCD0rLzFh95LhJ65L8e7GY3s3EbDpIRbF86c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iD0LmQp2C9PsOAqYnxSisfH3yIHLoGTA2SI7SHCWlIlXbCVQLKgE1kFChEbqq6bdw AAlJinbKPRW0pQKKYOgxx6bojGSSgIcu7qDBb978cINYS66YcCgkl37baxC7oqkF3W 3qw4WVcHPU+5XRWFmJ8WYe6dBMpyHdsjc9oRK7OfBbINZ6gGdCtuoF1XHHya5XWgBz viyeb+6dP1vqim7pc3mMvqxJy4RZO5FS3oG1ugYDWD+NIKnSmlPzevIf01BZSgOpPy AAC+YfL1W9vb8kklyvQkofX3PB/lvUXTg9kZ3561UExWv6bKJtkpp9z5ZFhJKqF7F9 cklVCgofJkOeA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 09/18] mptcp: update ulp getsockopt for tls support Date: Thu, 28 May 2026 17:27:00 +0800 Message-ID: <1d08ccd25cd34fcd9279e639c4040222772a5e81.1779959644.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 | 18 ++++++++++++++++++ 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 8a6807082672..0026b6798b2f 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 bdad459e6605..8e41ce029985 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4486,6 +4486,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) { @@ -4595,20 +4616,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 87b5796d0135..ee1e71c178fa 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1403,6 +1403,23 @@ 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, len; + + if (copy_from_sockptr(&len, USER_SOCKPTR(optlen), sizeof(int))) + return -EFAULT; + + if (len < 0) + return -EINVAL; + + 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) { @@ -1410,6 +1427,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 Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 633E43ADB92 for ; Thu, 28 May 2026 09:27:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960463; cv=none; b=cHFY75AblIvWf+KtdpHZkoW7HsejISTzn8clo9PQ2W+l7LfRvq6qCHd4PsMpDcjoihMYvgT7qxvHAXhQtLg1XUctMiremZSYgX8LBBdLIYz5hedQi3uxMFRvwCMPwAXFNMHFfsdQHor4I1+xVA0VYfBvdFK2OR1yDj5HXC6mo20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960463; c=relaxed/simple; bh=KSWWdmAA+QU4+/n0sv9CJVFtFQxUxOQtVSAKMC0D6io=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JblTyBqkDovBav5TZOO9K1P2AzEd6MwUKInjjfyE2Qb/yDisE/6F5ESsDaCi25F5EDBc4+UCAfJhZFJSlOcfY6RU3ZxXp2WAE3ADPwffMkTDeKY8U7JJdV7+dDMKSsbzS3ZY8f9O99cVOoCF35vHXTDQceBGI2/11U/2MmmWCXM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fCPywUbT; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fCPywUbT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70E7D1F000E9; Thu, 28 May 2026 09:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960460; bh=83X1Bc2I/hubj/a7TLvgtRFFBoGoYUs9UrdLsKsBUWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fCPywUbTa2r7NI0gNVpuFeRDyn/N2lVCa40ItoTk2gmbe+iJis1/IPwqU3OfzADt3 1iWvw+4y2vv8Cf20nJZIQPdZvB9bwxTk7WkJvrURAIcZTlvhwdTSS0rFzIQBU9eiJJ TDVDrtbexpdIzyRrfnqATRAK7MupoFkARWIp75W/nu/xb/fqzlDyj7dxn2ZA6qRDy8 5vUyZTuPvRIKJvBswlZgVLi5UNc5sOOqWfndlwo93jY2yG+/ogBuQopetMIN4twQSK e9KXp+NHM7fUpO+3dc9VZXEDMNu0YEztdEvjH4qIvDMeyQ5NDGsNBCns7kuhyBLu5D n1ciijbF9kCfw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 10/18] mptcp: enable ulp setsockopt for tls support Date: Thu, 28 May 2026 17:27:01 +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 Allow MPTCP sockets to set the TCP_ULP socket option to enable TLS. Add mptcp_setsockopt_tcp_ulp() which validates the socket state (must not be CLOSE or LISTEN), only accepts "tls" as the ULP name, and then calls tcp_set_ulp(). Include TCP_ULP in the list of supported options in supported_sockopt(), and handle it in setsockopt_sol_tcp() instead of returning -EOPNOTSUPP. Call tcp_cleanup_ulp() in mptcp_destroy_common() to release ULP module's reference count. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 1 + net/mptcp/sockopt.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e68846b8eeb4..c8e3dd367342 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3648,6 +3648,7 @@ static void mptcp_destroy(struct sock *sk) /* allow the following to close even the initial subflow */ msk->free_first =3D 1; mptcp_destroy_common(msk); + tcp_cleanup_ulp(sk); sk_sockets_allocated_dec(sk); } =20 diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index ee1e71c178fa..a9fa3af9efcc 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 @@ -573,6 +574,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 @@ -825,6 +827,42 @@ 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) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + 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; + + if (strcmp(name, "tls")) + return -EOPNOTSUPP; + + sockopt_lock_sock(sk); + if (__mptcp_check_fallback(msk)) { + err =3D -EOPNOTSUPP; + goto out; + } + if ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) { + err =3D -ENOTCONN; + goto out; + } + err =3D tcp_set_ulp(sk, name); +out: + sockopt_release_sock(sk); + return err; +} + static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -833,7 +871,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 Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EF3EC364043 for ; Thu, 28 May 2026 09:27:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960464; cv=none; b=CUPGFIfXEYMPoJoeVHY6CQRrbB190U17iJL4Ole+ORvYPTILv8RuBLw9jIdAv7+jEKHax0uXRwl02CRlRTkQ42zkJszZWoCfGtTQzL+q0CPHv8XecQ0x17Dzr1ndoYuEErRUcgGBLiZ8JHfdRPiWXfoO4cT+FfCJ5twnWuxisMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960464; c=relaxed/simple; bh=3gl0K9I5PyXXoykIdu26iq4G+91su8cvRW6scifbKT8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lj1dLAnExyUv/SIMGhSC8aYGdg+MLsogMt2yEqH45Rss9J96LrVVm60PjXQ0mmZdW5xEFsTra93CUEFvLDFQ8VXLssRPe7C5ipccvcH+CTlZUWSRbc6ZBi5BvYc+6loq5IID0b8nNs4DiX+NxxKPBE2t57WHS1u5iz0Q0EekiKU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c/Ne4sK0; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c/Ne4sK0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E30AD1F00A3E; Thu, 28 May 2026 09:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960461; bh=i1r228t++8Jx2HzWD9Lh3NCKCbWjqFm66UQqWx4jVMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c/Ne4sK0Wfj2rPpP8W8NN86bv8Z43fs+hBzKVEaGiTfce6ZXdjn88dVJt5QkbZdNH /yix1F4pCxIpUpGmWRO5D6UIwBjD9oK5Grlk1Cby7gxhojFryos/LG9Wyit9mTP807 b9LKjvHZuGaa2PpKwVsrobPsMnPn+MvdvSuAlqXVt9ZGOjEYdTU0xstbJXX13zB9Y1 R6Qb7Xkb6wT175ntrtrgF0VgcTVo4m5CuYTdrm9q5MEfE97XjP+B0B6wFPnrsN3Myo NUFZvYvN8vRw7D8fksKf6yPSKVulHvbbzoOY8AFhlyXqEI8YVFHH408DBu2k4H11Bt 6P3DBY5ZgZPRg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 11/18] selftests: mptcp: connect: use espintcp for ulp test Date: Thu, 28 May 2026 17:27:02 +0800 Message-ID: <027eee165419222950d9eedc8168cd2c7a04b9b2.1779959644.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 | 4 ++++ tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 59051ee2a986..f48bd5183fb3 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -34,3 +34,7 @@ CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_TPROXY=3Dm CONFIG_SYN_COOKIES=3Dy CONFIG_VETH=3Dy +CONFIG_INET_ESP=3Dy +CONFIG_INET_ESPINTCP=3Dy +CONFIG_INET6_ESP=3Dy +CONFIG_INET6_ESPINTCP=3Dy diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index cbe573c4ab3a..299a7a02d6f5 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -285,11 +285,11 @@ static void sock_test_tcpulp(int sock, int proto, uns= igned int line) if (buflen > 0) { if (strcmp(buf, "mptcp") !=3D 0) xerror("unexpected ULP '%s' for proto %d at line %u", buf, proto, line); - ret =3D do_ulp_so(sock, "tls"); + ret =3D do_ulp_so(sock, "espintcp"); 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 Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8D66F3ADB92 for ; Thu, 28 May 2026 09:27:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960465; cv=none; b=O7UHhr/pVS/MhhDUqO/Pl3s3txUNOMfZjYwFXzkf8MB6tErWaWwD1JgEcCl8mkwYx94t/sr42lJ0j7Knh+lpZsIAOwKz5CFWbKlhqPaJSa+abH5J8SfZ/GvVrT6HyiPY5twCvfluEqush4bCI/dy4zAsy1359gga07BiGNoxLF8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960465; c=relaxed/simple; bh=Mqrz92JEPCE1o6xkBk8ggU4pOInHHunzS838mGSLmuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sZUjNV1I0kvYytP6+lC6puOmyqPuS3Unl2OCAbHytdnxb+jHkMsU7LXZMVdtVVnEZzAGq+poYd1ShlC1rPYLdPCrHJUUaaCP1NhQN0zZCDkXJnETGSEx4CjGmUDiBjSYn03A6Qys4ZxQPnBquIwtpm0jABOLzjIDSwuU83IPgR0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H01iStbZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H01iStbZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AA9A1F00A3A; Thu, 28 May 2026 09:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960463; bh=MAO1CzgHEProwfI+nczP+M5IuY8I7OjS+4gtXMDKNlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H01iStbZmYv3ij+1pHLTY8TNSvMTjIKiK+5xsYinEvMPU9LGDri/GKRemYt1D6guF AxJwJEIJIPlxYAH+HGAapmuZy+L1OJdQueveOsqNvA4N0+nfQKBakZHno/br3I+djV gKO2A/d30JLUmtyxTVwwHnZc2MhVwLKsxd8lhlTNp59Mh3mqPSXBZTkcYFwQHrR/6N PzEvGjhu+vunxIjVbz5i6L2NOtmNCJsMRM3BTDfKhRy6x/czQGEtWgwpN+0iCSmD1G Hw7F/i1ktdkwiBCy8orSeouuIkQgi4BiKQ4WyWByme0sSgtU61DDf/DpTOFOrUANAX McjIpwOd/dPjg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 12/18] selftests: tls: add mptcp variant for testing Date: Thu, 28 May 2026 17:27:03 +0800 Message-ID: <2c01e2dbba08c6eef6546dbafd6a10d887ba23ca.1779959644.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 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. Add is_mptcp_enable() helper to check MPTCP support. Used in FIXTURE_SETUP(tls) to skip MPTCP variants when MPTCP is not enabled. Also accept EOPNOTSUPP when setting TCP_ULP on MPTCP sockets, as they may return this error in addition to ENOENT. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 46 +++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index 9b9a3cb2700d..fed83918cd9d 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 { @@ -108,8 +112,9 @@ static void memrnd(void *s, size_t n) *byte++ =3D rand(); } =20 -static void ulp_sock_pair(struct __test_metadata *_metadata, - int *fd, int *cfd, bool *notls) +static void __ulp_sock_pair(struct __test_metadata *_metadata, + 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); @@ -143,7 +148,7 @@ static void ulp_sock_pair(struct __test_metadata *_meta= data, =20 ret =3D setsockopt(*fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls")); if (ret !=3D 0) { - ASSERT_EQ(errno, ENOENT); + ASSERT_TRUE(errno =3D=3D ENOENT || errno =3D=3D EOPNOTSUPP); *notls =3D true; printf("Failure setting TCP_ULP, testing without tls\n"); return; @@ -153,6 +158,12 @@ static void ulp_sock_pair(struct __test_metadata *_met= adata, ASSERT_EQ(ret, 0); } =20 +static void ulp_sock_pair(struct __test_metadata *_metadata, + int *fd, int *cfd, bool *notls) +{ + __ulp_sock_pair(_metadata, fd, cfd, notls, 0, 0); +} + /* Produce a basic cmsg */ static int tls_send_cmsg(int fd, unsigned char record_type, void *data, size_t len, int flags) @@ -310,6 +321,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) @@ -395,6 +407,23 @@ FIXTURE_VARIANT_ADD(tls, 12_aria_gcm_256) .cipher_type =3D TLS_CIPHER_ARIA_GCM_256, }; =20 +static bool is_mptcp_enable(void) +{ + char buf[16] =3D { 0 }; + ssize_t n; + int fd; + + fd =3D open("/proc/sys/net/mptcp/enabled", O_RDONLY); + if (fd < 0) + return false; + + n =3D read(fd, buf, sizeof(buf) - 1); + close(fd); + if (n <=3D 0) + return false; + return (atoi(buf) =3D=3D 1); +} + FIXTURE_SETUP(tls) { struct tls_crypto_info_keys tls12; @@ -404,10 +433,15 @@ FIXTURE_SETUP(tls) if (fips_enabled && variant->fips_non_compliant) SKIP(return, "Unsupported cipher in FIPS mode"); =20 + if (variant->mptcp && !is_mptcp_enable()) + SKIP(return, "no MPTCP support"); + 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; --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 191AD3ACF1E for ; Thu, 28 May 2026 09:27:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960468; cv=none; b=ntGDxuDxbsxyJ/JryY919OZD6q0Wls6sZHox8cwjVbG9IyaEFC17SMxdxsabEB4F/ZU/khHkW63DO7OfCtmo5lTwm386o2CB/RJ5IN7ulzoomXf6c0ZMIsNCvsxjJ7uAb9+/v3xtxvLEt94MO7xyexoIeA/+1TPKRSjHYBMQQjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960468; c=relaxed/simple; bh=iqV0zSaCNXM8wzAhRBNqtu6qJvXxNa7FekUqOtiqHWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yev6mVjQLBkjzhqSAqd3799GJo56uZJgK14e5gS1CBa5ZM1cjgA5WHm9p99xZGVEgTE6qxqpocvgpO7RYByUC3VnSnVYOJOQjvcn/XRCIGt894DRymXBBz5T+KNCCdxHUwoqsZMN0GywckHHy/t1QNUvysO0X1CvQgqhYTIOvEM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=knINEaDK; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="knINEaDK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D91331F000E9; Thu, 28 May 2026 09:27:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960464; bh=VqJYDhrdfYG8x1P+nVzqyFokwQq12zc8vWSKIl8WGmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=knINEaDK+WJaBDEdUvGnRTyAX4LJSfdlSsREQhOnFmXe+CZu+0aOQIsM/7+dvgFTa 61D0hj4h2sOAhda2ppkf4LFu64GL8tZFbuLApvaanCm6YaO0kdi6nC1CxV29u6yHQI OpTJ+6FtqQSXZ/xQiGpNy6rIaDz5q+obWpdWwtO76Q332/yPlphvtW6jnZ1EldWuco atimFYwXfARDm0lWRSO1hp0KT7RTUO8mIe5BKIe+fSd+JwH3hmemtubRbhEwDolho/ OytUlEcWwYyOgUtGN57gZeWYZgfQyAbrCeL8h1LNkm4OET7GrLULTiDQv5pQgp3r7H /2wRZ1JFeFdgw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 13/18] selftests: tls: increase pollin timeouts for mptcp Date: Thu, 28 May 2026 17:27:04 +0800 Message-ID: <17ca2687b9513c0f22c47365a2313f1fba7589e8.1779959644.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 requires longer timeouts in pollin test due to subflow establishment delays and slower state transitions. Increase timeout values to prevent false failures: # RUN tls.13_sm4_ccm_mptcp.pollin ... # tls.c:1411:pollin:Expected poll(&fd, 1, 20) (0) =3D=3D 1 (1) # tls.c:1412:pollin:Expected fd.revents & POLLIN (0) =3D=3D 1 (1) # pollin: Test failed # FAIL tls.13_sm4_ccm_mptcp.pollin not ok 357 tls.13_sm4_ccm_mptcp.pollin Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index fed83918cd9d..5a6c5ee2757f 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -1362,6 +1362,7 @@ TEST_F(tls, bidir) =20 TEST_F(tls, pollin) { + int timeout =3D variant->mptcp ? 100 : 20; char const *test_str =3D "test_poll"; struct pollfd fd =3D { 0, 0, 0 }; char buf[10]; @@ -1371,11 +1372,11 @@ TEST_F(tls, pollin) fd.fd =3D self->cfd; fd.events =3D POLLIN; =20 - EXPECT_EQ(poll(&fd, 1, 20), 1); + EXPECT_EQ(poll(&fd, 1, timeout), 1); EXPECT_EQ(fd.revents & POLLIN, 1); EXPECT_EQ(recv(self->cfd, buf, send_len, MSG_WAITALL), send_len); /* Test timing out */ - EXPECT_EQ(poll(&fd, 1, 20), 0); + EXPECT_EQ(poll(&fd, 1, timeout), 0); } =20 TEST_F(tls, poll_wait) --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 848E63AE1B9 for ; Thu, 28 May 2026 09:27:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960469; cv=none; b=Z2HuWMlqh5bj10mP8NaCLVmpVRl+SlwWPvB1EYsYWOgkFRGCJ5LNPD4aWhTxfeq/eh1TOanJQFwtTZ9yVRuNuLjh57RxvBFgjOCvsD/niwWZj2U5zMQgxn5TjAhQx/RSOQ5vqPvvnNPB//W5DiSd1kcEDHp/3Drw7W/haLcHIPs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960469; c=relaxed/simple; bh=C8Alr9wHDA1wyvNjYB2Q8LN7wGjGU3z/KZAEUgOKn0E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LVdOndwyxqte6Gknoc6d1uDHJw/ffQ/uujRYJq3jI07gmMnveYeVN0UTNA+tam8y+VgrGFnXX8rx05uLF2c+PPi8ReIOwsAl6IibI2aPO6w25GuS8tt6qsQKqBQEqgi8kz9Yup/zrYpln4I4IA696RUCbzQPhoVCNO5UsCE5pag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WrmDfg9G; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WrmDfg9G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 509961F00A3C; Thu, 28 May 2026 09:27:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960466; bh=WEViAPywuZzQo7Al26/ts5tn23+npYf3//x6bxmYZBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WrmDfg9Gj0X9GiRIhSDibcHDkYHFpa+cyV9jDnqZIzMzyrLmuXVX7tTsDDsTAc6Pw f1WXtn0PmQKiIisKjAf629slFTJFb2azWl7msoGG4lW5QTJ/kV/WRON9tfJkmkwhp8 P+C6CeUsS0iCRgo0/rj6l0bKmf4cZxRh/wzXoXENu0xFlc50uS2pJFKN2LpANhj7Dd dMZilRvQoXI4JYb/Gr7ZP74YRGGRwAxa7r1XhvjvWFRQc120OqgSC7extD1cWCSDcF YLRJY66QaJggSTDNLrlUVIQ5uJznQwaUx7xwhgUGKJMrzSKp11VYiK5NRcNV2mmB7c wGhX1aCUaGV3A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 14/18] selftests: tls: increase nonblocking data size for mptcp Date: Thu, 28 May 2026 17:27:05 +0800 Message-ID: <01994f816b9a3d5bf46a3b70748b024cbee58abc.1779959644.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 Increase 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 5a6c5ee2757f..64aad661a1b4 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -1468,6 +1468,9 @@ TEST_F(tls, nonblocking) int flags; int res; =20 + if (variant->mptcp) + data *=3D 4; + 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 Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3FE403AC0D0 for ; Thu, 28 May 2026 09:27:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960471; cv=none; b=j0hIMAgbLIK9mSUgqiZwemjfXftS/1YfKiX01yoMi/PvOW/8Gif82SaMrv3igZt5q6jaiQyA17uo4l6iE4m2t9KJP+aUAVL0J/0Wka+ozs3/c6aVbrw7IFtapnJhifwZKhNV7wBbhl9APTQEk/WdCOFt+hX64lPZhRFgWPRwqDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960471; c=relaxed/simple; bh=tObZAo0LS5jMzz2TR2El2jbzErgrvVlRvmtiCiaFxJA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=beWGIdlqDHSM1tUngq0Tpqt7JnV1EvJ5X+9kbF61F3sP8RO/0KZjmfX6kvk4ESYudzMBxO4goMaqVRsTYp7AmB3Gv4DQ5tuYvDQ71TErK1jAMR3bJbnFZ7/tA4f38MBkqNXlBmPdFrByIlDgs1DkGCDbIifAh+J6de6L8IW5iqM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dvON+Vl4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dvON+Vl4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D60131F00A3D; Thu, 28 May 2026 09:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960467; bh=KBTULavDNo0rDYPoW2s6IkaqCZ+B1f0yBJdFI74edPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dvON+Vl4ra9CM0f8314S6bCjHr7vVROvDkbFjdGvPwWdBiW2alxniOWkXCFfnppbY 2nhZgURVyJyBPMOZ7GHg7gHcNQ+M4hpNIo8H0WulXtEfyLXwxvITmGGNkxk3XwRxh3 Xm57CYOjP7TWNX2C7ZFei2EhTE+7BSg+O7Nz2jdfn/YxQw5yDO5ljv7n++C3EBjwoU N6pUGev2Bg5F+QL4OaPihqsVOqgwMvCTMHnAvrCvtUz/ocU5HMy8TBwYiOGqHHfB4B 1VV0TbaA9OyWiZcPeYJNEzjs4oc57wRAbIADb9TDZucLzCT0EfWBRPYZMR1m7GKb8c Hc533R4cFbtiw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 15/18] selftests: tls: retry bind on EINVAL in shutdown_reuse Date: Thu, 28 May 2026 17:27:06 +0800 Message-ID: <09e714c34a2fc6ae41e23a800532b73747f6a92f.1779959644.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 In the shutdown_reuse test, after shutdown and close, bind() may fail with EINVAL for MPTCP sockets due to asynchronous state transition of the top-level MPTCP socket. The subflow may have reached TCP_CLOSE, but the MPTCP socket state hasn't been updated yet. Retry bind() on EINVAL for up to 1000 iterations (1 second) to allow the MPTCP socket to complete its state transition. This fixes the following intermittent failures: # 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 This is only done for MPTCP variants to avoid slowing down plain TCP tests. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index 64aad661a1b4..4ae7505846f9 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -1744,6 +1744,7 @@ TEST_F(tls, shutdown_unsent) TEST_F(tls, shutdown_reuse) { struct sockaddr_in addr; + int i =3D 0; int ret; =20 shutdown(self->fd, SHUT_RDWR); @@ -1754,7 +1755,13 @@ TEST_F(tls, shutdown_reuse) addr.sin_addr.s_addr =3D htonl(INADDR_ANY); addr.sin_port =3D 0; =20 +retry: ret =3D bind(self->fd, &addr, sizeof(addr)); + if (variant->mptcp && + ret < 0 && errno =3D=3D EINVAL && i++ < 1000) { + usleep(1000); + goto retry; + } EXPECT_EQ(ret, 0); ret =3D listen(self->fd, 10); EXPECT_EQ(ret, -1); --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E16403AE191 for ; Thu, 28 May 2026 09:27:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960472; cv=none; b=ZEN5fSyqV/v3g+Ieq7d/5ogyeNOqrE76y66MGSYpeHfTUt53r4Xq6Hb6vGAZLxl2nBnr/DceNF+E2RH4LHlBD+6h5i/ovtlmARSrz3qVkq81TgQxtcLcDdamCIkBTwScRQpCPNejrDHa7l+AcFgV3gznwg5gJLpjGT2rYTzA0YA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960472; c=relaxed/simple; bh=oqContIvSwDjBBUvCDlGJnboNlniQ4AqWa16l/Stl9A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oaETOrlqSvm5fX+sqWbktLNHC5xabOUZ6ctcjHX/jay++xjgcXajVj6Qkh/SEUOj9JALN22fWm6I2aYcODDdiG7DMBIuJGkHiAP/o6OTs+Zn2AWjZZjrHFDLZSfcGPF1dpURh+88+kNAjNBuQkT1RGWIQT/1aJo0hPsDrkQGrdM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NF3cl75d; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NF3cl75d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 643221F00A3A; Thu, 28 May 2026 09:27:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960469; bh=jNixIy30UgWwxn53isZSW3yVS4d5nxvceDL4X9ngrNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NF3cl75dKT7TwwR3V68KEn0mUmPUetmSNiFT5bu2d6BAkfJuUdwldgB2mvzBMN1/+ 8Vj8l1Z2Ppy5JIxhx7x4tBHJSyRq0gWEkgYSOJb5SifS7APm6z6ll7p6lYH00HXwK9 TNJYBCe2Daj20H4vSJijsjJ7oN7baHxeWzmuD6H7+F348lNN58vzdwdcaU+ta/e/k4 ITs92hrYyFNgSfmD59vNSYzFE39BLUn4wDNIPOU9avq/d6p4V90dzIDOlFMVeaj/3Q zhXEx2oCbsyIGX1yjgU+xwVoevNLJjiAQ49OBQ4NkAqtMIzIifckdkhDeRWCQYM8mb Wg9ROXH32lZQA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni , Gang Yan Subject: [RFC mptcp-next v21 16/18] selftests: tls: set timeout for multi_chunk_sendfile Date: Thu, 28 May 2026 17:27:07 +0800 Message-ID: <1b1d2b622b0361bfc1aab7755e515fa39e30e983.1779959644.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 multi_chunk_sendfile test can time out with the default 30-second limit when run on certain configurations (e.g., MPTCP). Add a 240-second timeout using TEST_F_TIMEOUT to prevent failure: # multi_chunk_sendfile: Test terminated by timeout 30 # FAIL tls.13_chacha_mptcp.multi_chunk_sendfile not ok 204 tls.13_chacha_mptcp.multi_chunk_sendfile Suggested-by: Paolo Abeni Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- tools/testing/selftests/net/tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index 4ae7505846f9..6f51da27ef1e 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -536,7 +536,7 @@ static void chunked_sendfile(struct __test_metadata *_m= etadata, close(fd); } =20 -TEST_F(tls, multi_chunk_sendfile) +TEST_F_TIMEOUT(tls, multi_chunk_sendfile, 240) { chunked_sendfile(_metadata, self, 4096, 4096); chunked_sendfile(_metadata, self, 4096, 0); --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 BB25F3ADBA5 for ; Thu, 28 May 2026 09:27:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960474; cv=none; b=b7Wd4b+lklIjWZgiLH0uyKUOgYYLEDsOOmuVSmC2ryxUXhbJHDsmBJt6P/Kd2XlA5PKmvSgMTViHNyyvPHIxlAya6fvPDetSADLpP8PwxqxEbFAO3DhT3DEHAHQCOVs7rMCAPX9sKCMDLPORUsQVou7mGSpMBxLI2e2Dus8Az8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960474; c=relaxed/simple; bh=82iGtqlHP03QmuWGf0VaMBINawAW0bVgPGIo/n8dCzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YzgLgdEIyW5Oro20K2nsB+eOOxZnekIfRl8VKewfb9bhRmXfxgT782sk8m+z9qSpqtCYvgA01MP8XGVG4E6RHkeJQS8R3a/8pBUo2c49JjfgfjW1esYrMZc7zjBHLEgo6nN4LfdbjMMRQAg+nD0plXy4SZf3yr0pLlyKGT0+Tck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BRv2Efgb; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BRv2Efgb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A4FA1F000E9; Thu, 28 May 2026 09:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960471; bh=sD3L1RTJjtvETcJNDdakdqHvduVfdS94pHrk3pmxhy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BRv2EfgbiP+wSRYJSpp7nW/dmDJg+B09bD8LaAF/QFIHAkQGbdcYsjox3uXjecyzD ckp+Ceok16tvlF0KfA9ZDg87GKAdnv6x5La3Fc8KqsAnfy3+9YZlM4KAAqYiyiieHC 20+lfX63ZZVfcsDCjoM2dSUsgTeVtg99FebU17tEjH4e/pAmyD5YKqXKgS1jxoNdC1 GMc5mrRtfCCLhXksHQmM5XwDC06nXl2gwht7XlXRQZE1v44d/WXylyEFLcVocqaUko SEz/SzcR14feSDUUS/XDEQooQldtZFZ96j8T30YxQ75mPMGlpVyTEzHVvHXCTzQ/nT GTN+aPiz40dSg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 17/18] selftests: tls: add mptcp test cases Date: Thu, 28 May 2026 17:27:08 +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 6f51da27ef1e..83cdb06da587 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -407,6 +407,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, +}; + static bool is_mptcp_enable(void) { char buf[16] =3D { 0 }; --=20 2.53.0 From nobody Mon Jun 8 15:37:16 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 04E7A388391 for ; Thu, 28 May 2026 09:27:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960476; cv=none; b=G6G5oD4sxPuNJ14mo2sjKuyOtYNnowbSaxHkQoqCfpGW2vvK+V+6EZUbffPIwgr0jwnLhcDCaLx7aYTVMQcXkm5oD/p5KouXy3Y+/jT/+kFasyYE3gJnB4JnuKsvcqJ9442IZvp8UEhy1/s2Op/u2LARJs6+tk8FwG1BTT8g0Zk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779960476; c=relaxed/simple; bh=MfwgpW+hIEPmOfhHRBe/eTs9pYMSS0BB0ZSqeix4TkA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HZjI49IvdMVzbABjVbww7kf8GUldSbwAl8FWVRvUU5ZLXrK18OUlhRbhsu92fmz15Ps5ty2Hm7RsloxGJ1DKoZb8VoIeCKSYoEO/+L3WwNIQAXVAjiwGSatvARehXelTWZzu2AzeJbJFdRTwdBOm/+l1WTkGWzRsRoQz2hTLTdg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L28sd7wQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L28sd7wQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B768A1F00A3C; Thu, 28 May 2026 09:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779960472; bh=wOF0gg5UP08UXXcpb9XbWKkq3MAqIOFUsB1RqmWC9ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L28sd7wQ++WBcba+M4k4tB1z7wyGPjQkIlyheEzlysaXUL3U1gv8Hvhx7rTdJc1pl szuQaIcZOIUnS0uORb6lyWUD5WhSau63kqgHR+xVSMMPMwidJydEvBASW4N+ZUMzIx PFDq91y3T7NDFBar026lg3CFsg6PG5TB8wNHHvSEwmMi+orVXplOX+BXzkDWKGPUfe u7YHeSN9TZwA4yxTykiwaiK/KTOkrdNAt83d/V6GMBabSfVXP6t1lNhxMCnGaGX2cR Y0kam8XsR+OSd8+fvcwWhNOm1VAJu+fjAMQYITGEpX9KG6lLJv1aFBrNYIbsxbYhoC RhcsjvorKxQqg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v21 18/18] selftests: mptcp: cover mptcp tls tests Date: Thu, 28 May 2026 17:27:09 +0800 Message-ID: <13f981d2bbae3495a2470ca0772f531057cd6762.1779959644.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/.gitignore | 1 + tools/testing/selftests/net/mptcp/Makefile | 2 + tools/testing/selftests/net/mptcp/config | 5 ++ .../testing/selftests/net/mptcp/mptcp_tls.sh | 64 +++++++++++++++++++ tools/testing/selftests/net/mptcp/tls.c | 1 + 5 files changed, 73 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/.gitignore b/tools/testing/s= elftests/net/mptcp/.gitignore index 833279fb34e2..f6defec6eeb5 100644 --- a/tools/testing/selftests/net/mptcp/.gitignore +++ b/tools/testing/selftests/net/mptcp/.gitignore @@ -4,4 +4,5 @@ mptcp_diag mptcp_inq mptcp_sockopt pm_nl_ctl +tls *.pcap 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 f48bd5183fb3..bfc26bde0501 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -38,3 +38,8 @@ CONFIG_INET_ESP=3Dy CONFIG_INET_ESPINTCP=3Dy CONFIG_INET6_ESP=3Dy CONFIG_INET6_ESPINTCP=3Dy +CONFIG_TLS=3Dm +CONFIG_CRYPTO_ARIA=3Dm +CONFIG_CRYPTO_CCM=3Dm +CONFIG_CRYPTO_CHACHA20POLY1305=3Dm +CONFIG_CRYPTO_SM4_GENERIC=3Dm 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..04a0cb6ab0f3 --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_tls.sh @@ -0,0 +1,64 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +. "$(dirname "${0}")/mptcp_lib.sh" + +ret=3D0 +ns1=3D"" +pid=3D"" + +# This function is used in the cleanup trap +#shellcheck disable=3DSC2317,SC2329 +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() +{ + local max=3D"${1:-4}" + + mptcp_lib_ns_init ns1 + + mptcp_lib_pm_nl_set_limits "$ns1" "$max" "$max" + + local i + for i in $(seq 1 "$max"); do + mptcp_lib_pm_nl_add_endpoint "$ns1" \ + "127.0.0.1" flags signal port 1000"$i" + done +} + +mptcp_lib_check_mptcp + +trap cleanup EXIT + +# Temporarily set max to '0' to disable multipath testing, +# as it depends on "mptcp: fix stall because of data_ready" series of fixe= s. +# It will be re-enabled together with that series later as a squash-to pat= ch. +init 0 + +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