From nobody Mon Jun 8 04:25: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 CC9DB31F986 for ; Tue, 2 Jun 2026 02:33:07 +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=1780367589; cv=none; b=cRr45orWMslSiuLB5rDOZfIsboLYYiGh1FdMW+j+FibbX4EiN9l9GkPa/rMvCJJMT5vl2/ditP0+npRAjdDjsTKH3ImTFIQX5fFy3OEAKvFuUSZlBwjbhwHKVaKSFYv3tim05w82nmxeAdJQwjqykZ/iKoRiWs4mIYa0CahgHfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367589; c=relaxed/simple; bh=4T3RHNG5vZtSlYhs1ZKwxxzNano2JPi07+uJJ5k5Yko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MFkBLtAmP4XWQrz0Dc7F+6kcvRV8JbTUnIw3pFHoybiWYCSDp6VyTia2kSUQm71l6Iu1APLJAc4bpOaC5/GepIaQtRGncVCrh9HW/VaMCCZZJjx3/sC7qKZ/6ChO2OdDwB7VtkQ9r6yWRtF8Dbah+0piGA/aFQBSuMpauoS+ytM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NjR93MQ1; 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="NjR93MQ1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4EAD1F00898; Tue, 2 Jun 2026 02:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367587; bh=ZQySIIRUBxC+1u0PnYlXT8dj7AADFvexwsZcMlkzAns=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NjR93MQ1MefL5TmLlmHz8I8i+tSmjUaPKtwaSset4yk1UdFPxc3+9mddBGAxWzEsG u2w3Vof17b5eX5xnsW3ti3JVig7Et0bWtOt0+aT/FIxCnLSwp32ttf8LXlaHwqYuB+ HekWrbvmx6E7SvbA1iOMVG7NnU94n7ThWY2Fq23qb1ooFfUAN8zZkxLwHtAxeo1L8+ +N5gL/BztdF7FKAZYeJPdvHz6WTi29WD3v9ImQu73gw+mKF5VZgNVgWzdeGM7wlGXL VYxmzxA7jbTJ7mimUyC9hkrFcu5HxZABn7WfaLP+0NuFf7ZsY92V+fN5R1e2wINUNF Vtp3oUUCtpAew== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 01/16] tls: add per-protocol cache for mptcp support Date: Tue, 2 Jun 2026 10:32:42 +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 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. 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. 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(). 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 --- include/net/tls.h | 12 ++++ include/net/tls_toe.h | 2 +- net/tls/tls.h | 2 +- net/tls/tls_main.c | 162 +++++++++++++++++++++++++++++++----------- net/tls/tls_sw.c | 18 ++++- net/tls/tls_toe.c | 6 +- 6 files changed, 155 insertions(+), 47 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/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 fd39acf41a61..62426f478ce0 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -119,23 +119,66 @@ 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 - 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]); + if (!prot) + return; + + /* Ensure sk->sk_prot is not visible before icsk_ulp_data. + * Pairs with the rcu_assign_pointer() release in tls_ctx_create() + * and with smp_rmb() in tls_sw_sock_is_readable(). + */ + smp_store_release(&sk->sk_prot, + &prot->prots[ctx->tx_conf][ctx->rx_conf]); + /* Ensure sk->sk_socket->ops is not visible before icsk_ulp_data. + * Pairs with smp_rmb() in tls_sk_poll(). + */ + smp_store_release(&sk->sk_socket->ops, + &prot->proto_ops[ctx->tx_conf][ctx->rx_conf]); } =20 int wait_on_pending_writer(struct sock *sk, long *timeo) @@ -314,6 +357,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 +380,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); @@ -409,6 +467,14 @@ static __poll_t tls_sk_poll(struct file *file, struct = socket *sock, u8 shutdown; int state; =20 + /* Paired with smp_store_release() in update_sk_prot(). + * Orders the read of tls_ctx (icsk_ulp_data) to ensure + * we see a fully initialized context after the new socket + * operations are installed. Without this barrier, we might + * observe a stale or NULL tls_ctx. + */ + smp_rmb(); + mask =3D tcp_poll(file, sock, wait); =20 state =3D inet_sk_state_load(sk); @@ -910,7 +976,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; @@ -921,6 +987,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 @@ -968,35 +1035,41 @@ 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); + if (!sk->sk_socket) + return NULL; + + cache =3D tls_prot_find(proto, ip_ver); + if (cache) + return cache; + + 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,13 +1119,16 @@ 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)) + if (tls_toe_bypass(sk, prot)) return 0; #endif =20 @@ -1062,13 +1138,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); + ctx =3D tls_ctx_create(sk, prot); if (!ctx) { + tls_prot_put(prot); rc =3D -ENOMEM; goto out; } @@ -1265,6 +1344,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); diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 964ebc268ee4..8c5eeb92d017 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2450,11 +2450,25 @@ 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() + * for sk->sk_prot. Orders the read of icsk_ulp_data + * after the read of sk->sk_prot in sk_is_readable(). + * Prevents seeing a new sk->sk_prot but a stale + * 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) 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 04:25: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 39BCD364047 for ; Tue, 2 Jun 2026 02:33:09 +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=1780367591; cv=none; b=kQ8VYk3SMXjBY7ayE051m9NaAW0Ub25ZOf8B98ejkZzVgft7BqyQMNML4Gv5FYnLyzEuSY+Oqhn/2ESo/O7wc7k7OZ3w3gB/DVFdtSSzcyDOK/pO8m2XcdnYI11TDn15Ah5nQOdSOeSyCd6XeLGDQchVKAQxv2CT9RsgMk8qmiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367591; c=relaxed/simple; bh=NJlCxUoipiMwT1O1ydtV/uuW6N7EzKcAi/lfMtRGgq0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WKCq00QJHeYXK9wcH7yXLQ4RS4B6C/MclHFLXT1RvV1BWOK20VzEo2PpDpdCoeFcfmRdrXpK1+UlB3T0J6IwVQsCH1ITeYO66bbk3E57hUFz2EM15wDxBx2VcnlV/Vgoy/Ttq46mbdvyEsfOeJkGO7/xt4QpRGo9ZgCWbb6rFCE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IKSp/Ju0; 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="IKSp/Ju0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FC641F00893; Tue, 2 Jun 2026 02:33:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367589; bh=v+wvuwJEEQWQpNhJD324Fh9ICKitTj+YV2r36JFozqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IKSp/Ju0sFof0j0TcIFlNTq8iY/j4Gy4FKXn/CjXpvAq6Img6R5lbxoEKtqu0l8cR NaffxRzhX2jjyGIF20PAof5wQ7Vrp0Oot2l8bTf+Kc+u8xO+erWIYvEsLJdnKvWhl5 QeoUR68A+LMW7cV4+j0047rIyb0GxEBPdcpX3ZXcoC7AtgnWTZPATxupHCweDhOyug UOJDgWc9e9jwwhZk/ruBJihYncJKstCrvEqxP/40lVf3yZEdwTvBw9wa+IA0QqGXU5 b5vQ7kkxpRvz7hdTv0RykHUA6Dbm1A4LIsRTLsQWHJk8ACPtSVYWrMZ+wLpkaVCItc vweBQQAWhRnVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 02/16] tls: introduce tls protocol ops structure Date: Tue, 2 Jun 2026 10:32:43 +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 | 22 ++++++++++ net/tls/tls_main.c | 106 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/include/net/tls.h b/include/net/tls.h index 7ff4d4566d41..e13894c054ad 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -220,6 +220,28 @@ 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); + int (*skb_copy_bits)(const struct sk_buff *skb, int offset, + void *to, int len); + __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 62426f478ce0..8fe9529ba4e8 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; @@ -1315,6 +1332,86 @@ 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->skb_copy_bits || + !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, + .skb_copy_bits =3D skb_copy_bits, + .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; @@ -1327,13 +1424,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: @@ -1344,6 +1447,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 04:25: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 2BD4C2045AD for ; Tue, 2 Jun 2026 02:33:12 +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=1780367593; cv=none; b=TDhIHjt3t2UBOJQAR1VYC0wqLDgYdrz4/mLjrRDMTSZ7aYzuMm0fkVNT24AgiwIqYfGlUiyQK0rNyc2+MyeajLSigQ8IvrpBX6VNDQqVh98DW6PTJtSAm89m1+8s9rU8zjiWJqvlxeKECfkBX/l4dLPogpkoNzoUS4Qtetx4JMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367593; c=relaxed/simple; bh=VvGU8mv55RzRk7rta2wuBwIjUKYIi0Qs/CxY6g0Pa0s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f7uN/D0ynE5rOxcDiCMDnsNQsFE8er435bJNg0owa6EyevSt5NtE2zmsANX+jtRzTXh1zIwPyGGQgGUM3rqJeSsFCuB1+BvNQTecClI6/6ktWw1AHJBX11rDpeAZT2kv8vgmDSAwfCErfhulMslCIndQwxDf7oPJ+gCdYPi986k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dw0XcBkv; 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="dw0XcBkv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70A781F00898; Tue, 2 Jun 2026 02:33:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367592; bh=7c1jxtjuA3AIgLuDBgQqhTtk6ztCnGWbhh8YDxVVWaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dw0XcBkvttWuZs83rS+brpMTC8faJmRJHk2VrXh7qB9zZgK7DuSdY5Ir/jTDXa1c6 vuM+Jd0/YuRbAh3/F0/UqnrmAFF2jJxEAdieG4GHRjuf7/wOq6H1rU2VwupZCio+TI XjhJ3rrpzFaBhU5I/3Becpz/UM9cqTfSs7jaOl921Af7muM7arsDa6CqQQWC+z90f9 xR+ApYy44dsiXZ4TQ5vc48ZVy5ayFlgHIQKl+oQ3dOWdQm86GgRgtfr9TywrKUb4i3 BD5pCq8EQDBgBeQULDvNoMWevwnsFpxliH+6i2sv3nxWQLaI5Kmzp4GHgSWTWCgEzA JJptIgL6q2RLg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 03/16] tls: store protocol ops pointer in tls_proto Date: Tue, 2 Jun 2026 10:32:44 +0800 Message-ID: <353cd0c6cd57594755bfd32ae5088716f4ed04d8.1780362942.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang A pointer to struct tls_prot_ops, named 'ops', has been added to struct tls_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 | 19 +++++++++++++++---- net/tls/tls_strp.c | 33 ++++++++++++++++++++++----------- net/tls/tls_sw.c | 9 ++++++--- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/include/net/tls.h b/include/net/tls.h index e13894c054ad..9ea199328070 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -248,6 +248,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 8fe9529ba4e8..c452318f2394 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); @@ -248,13 +249,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) { @@ -380,6 +381,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); } } @@ -492,14 +494,14 @@ static __poll_t tls_sk_poll(struct file *file, struct= socket *sock, */ smp_rmb(); =20 - mask =3D tcp_poll(file, sock, wait); + 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 @@ -1057,6 +1059,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 if (!sk->sk_socket) return NULL; @@ -1077,8 +1080,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 8c5eeb92d017..437662598756 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; @@ -2499,7 +2500,8 @@ int tls_rx_msg_size(struct tls_strparser *strp, struc= t sk_buff *skb) } =20 /* Linearize header to local buffer */ - ret =3D skb_copy_bits(skb, strp->stm.offset, header, prot->prepend_size); + ret =3D tls_ctx->prot->ops->skb_copy_bits(skb, strp->stm.offset, header, + prot->prepend_size); if (ret < 0) goto read_failure; =20 @@ -2530,7 +2532,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 04:25: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 A53412C234A for ; Tue, 2 Jun 2026 02:33:14 +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=1780367595; cv=none; b=mMQBaL2S7fC9ma8OBuT99SwNsCV+jauDGjgF9+HZ60ZmMGQ1OFsYY6DIwxgNmEbFNVxorSL4Sy6P2SngMlayqmMRjjB7yZ0/heDEkpTtr5CRTJ0Kce3h8V4B+AA3MOrw8CIl4K3n2klwpv6zq497erZPzF0CJDB3mzpYn3MI1V8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367595; c=relaxed/simple; bh=+JQVOl96ECamJsqouYmqcp9F3wpxk7t2HlN8ghsQMgs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HnbV9iz2jQud0MOjSv1SEV+TiIc4A0MPzvHkZV7lJL6UNd7ACnQVaR+wDSj8FWf0q6K+vdNNYuWpVnwO7qMrE08mjWr1XtKjEMnWcuMOo1Fw+445XkyFrWAqF3rsjX9MAbxGQf/fFnTZE9HjcHmvppA0iRw4o5LqccpApsmDU+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kN1RfbWb; 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="kN1RfbWb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B02141F00893; Tue, 2 Jun 2026 02:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367594; bh=YptEY7JszF1atx6+IwVbZvwpCUwjJrxVe8ZBhhToby0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kN1RfbWbp9beuEjGmAoW4heB0Q3QCDYbSciK7riFntEMbik6XcQGmm4qcEp0VvWZV 65zJPEzAiHyjQyYqIJvR8hh2mRnrjaPsX7A47v46KlFKk6vFiViGIuBjO4XEG1NToL UcTplj2CAAC97W/9zoBqkbm0ta9VRVBgEeINTvTv6Owv/nU3SZxR6Yc3XqXfsFm0P+ 9OxXO/zZhWjfsZTqEqaPVN6TuxQNeHRU1jHqdB4IAJbnNGBUyCepwk6gN83gEBf8q6 GG8XIPn3QXeJUQI8VVj3KYE1mhzBqdpj8JFSlXmo5q3NXw+ilkmTXVhomYHbzM2Ii1 HMHn5N27tYw2A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [RFC mptcp-next v23 04/16] mptcp: update mptcp_check_readable helper Date: Tue, 2 Jun 2026 10:32:45 +0800 Message-ID: <5e7b5b20e620017ec8432e9cf2a3e0f3cf11f217.1780362942.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 f1d74d4b28cf..5446e8a841f9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3334,9 +3334,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) @@ -4400,7 +4402,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 04:25: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 8D80C364047 for ; Tue, 2 Jun 2026 02:33:16 +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=1780367597; cv=none; b=cKaYLCend5i3zbOe30ANCw7CWseQyEZ1qCKorScM7+Xx/CGqERgw7DrcalISjDZy97Y01eKnkGDTZbsWk6jWG5oe2I37GdbunN02zW4+Cj21uG8z5x3/9Qyq60V/h2VpQzKlGVtWeMVwqtE92rEv1N9QwfS6JI2Y0aGk8TBfTSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367597; c=relaxed/simple; bh=fwkPwbQirZj5iCzDGDuzlApRZlp+1/Nid6KVPZzd4Eo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OqXG5Z3AdRnJTdktWQcQafMxGRI8+YZ2wMG+dDlTFqhWgCYvwKVzfKERzKKAN3MEntkTXKmbeG6P618iSEjSxLw0C11gXM5k5ZGDuAa2ksEjO/GcyfN02ubAEexPQG3uZmXZweaRwJBMKjyy+PH+3Szrqfxoiml/wCyL6MOmsH0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GSkGebKZ; 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="GSkGebKZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E85DB1F00898; Tue, 2 Jun 2026 02:33:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367596; bh=EWZjv8Wf/zN6P9RyFM/njILpMpH2wkBenjKvS6AMKRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GSkGebKZWoHdXcX7xX44/hPSn4H7lfRrEFwYkpwgwK1RAbQlQ+V8mxgu/HqhvIVF8 40BF2tZiI2wjDsvdJ38nJIHYxtcpFjYuqgqH1/t+tYtLPJJbA0ebyPfODHyMOkKeXF 2nRnmxVylss/m7UelnYHrk2Chzt9Lm96WcT/vET70q7ZUB91vOFy7J/9Arnfv0Uq9c EgWEIpeGn/3diaH9izqWmdpZZVKzuMndGlQ431Dwhtv3U/DdqfQGgOoVGp8Hjdfv7l YN5gvAd3BtnqrQtyYkQ0j4/Aae2thlvCGsGajwfQnTnygGh5+eQ+yuHutH/f+bKk70 UUHwHo9bmzirA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 05/16] mptcp: implement mptcp-specific tls protocol ops Date: Tue, 2 Jun 2026 10:32:46 +0800 Message-ID: <3d64917b93105a30091fe4be4985245270e9cc56.1780362942.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. Implement mptcp_skb_copy_bits() to handle fragmented MPTCP skbs when copying TLS record headers. 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 | 160 +++++++++++++++++++++++++++++++++++++++++-- net/mptcp/protocol.h | 1 + net/tls/tls_main.c | 13 ++++ 6 files changed, 180 insertions(+), 6 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index d1227b71b217..80ae3dfd676e 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -131,6 +131,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 5446e8a841f9..d7dd26c4664a 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" @@ -1974,7 +1975,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; @@ -1986,8 +1987,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) || @@ -2103,7 +2102,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: @@ -2114,6 +2112,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) @@ -4786,3 +4795,146 @@ 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 int mptcp_skb_copy_bits(const struct sk_buff *skb, int off, + void *buf, int len) +{ + const struct sk_buff *iter =3D skb_shinfo(skb)->frag_list; + int copied =3D 0; + int ret =3D 0; + + if (!iter) + return skb_copy_bits(skb, off, buf, len); + + /* Make absolute to positive */ + off -=3D MPTCP_SKB_CB(iter)->offset; + + while (iter && copied < len) { + int skb_off =3D MPTCP_SKB_CB(iter)->offset; + int data_len =3D iter->len - skb_off; + int count; + + if (off >=3D data_len) { + off -=3D data_len; /* MPTCP skb avail data */ + iter =3D iter->next; + continue; + } + + count =3D min((int)(data_len - off), len - copied); + ret =3D skb_copy_bits(iter, skb_off + off, buf + copied, count); + if (ret) + break; + copied +=3D count; + off =3D 0; + iter =3D iter->next; + } + + if (copied < len && !ret) + ret =3D -EFAULT; + return ret; +} + +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, + .skb_copy_bits =3D mptcp_skb_copy_bits, + .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 b63571400c6a..1576426d3517 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 c452318f2394..9d5365df2b49 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -1439,6 +1439,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; @@ -1447,6 +1453,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(); @@ -1458,6 +1468,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 04:25: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 E46823612F6 for ; Tue, 2 Jun 2026 02:33:18 +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=1780367599; cv=none; b=RCQOPM+w+IZ+uvzosDIL9/c3hipvhAqBIjL6pFSDLd8c0pawdx9QfuFfbTtwF8y7TQ0ZbrfL8BVcWT6fsAVH0KpZuUyyIHj4r+TVHWX21qX51hT7Co1U2EjggeOyncTGqaB1wMxh6fnGOZXQtFp7gSbEAIksDwVxjgWkcMEvEkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367599; c=relaxed/simple; bh=hrtN9uQddVM0lcmO9wc2o6AU3IK9pMQ70Z6iH5TPITU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kJ+iFKYDd2LDcJcoU9nIoy8TCvcPXpC5jtDYl/K79kSDyD8gYeYeFnnJnchsIa1i0WHsR97WebVHWXqsEQAt79+aG0jX8uhoDSxHjN/V0QaMpNr+0P0o+9HA1gPWEQiyyMrhtccjANP2l46x7K/49xCFpxnlH5tfRySPMyReIkI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Sv9+Plyn; 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="Sv9+Plyn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B23D1F00893; Tue, 2 Jun 2026 02:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367598; bh=NkVnihIy31dIAYz2JOSqK3T3ETJqUTTxorUyuRboKN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Sv9+Plynncd2+fv3g1vuJTVZnqfBVBQfSGL5e24kKuoz8jJWILv+FAupv/FTIH8KV A6y1rzJeiS5xgQhqUBnRSEs93dhqHRFtf7bgB4oHYyZITQBGVLpSYmMFGzHuFLfEjr ZwYXXVXKf9cHnp0xfEBIPaRPjkKJLQhexQGymasIFvLwshroZwgZb4r1FSs+zTFtoI 1Mm9hBF/4jiYOJKz/RoR3keCAUpUnBSg6nzNht4Bn8JNdNKk+H+c1O/zUgcJbOd9/X EqkFDX3XrkM5oh4KyYC8glNhyI3k4tK0+9v968Jk/tGXbTCZVnWmQouZBX2zmuDMsq Q0/fO7GL1pqlA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 06/16] tls: disable device offload for mptcp sockets Date: Tue, 2 Jun 2026 10:32:47 +0800 Message-ID: <8f1aff39dbd80ed95fe1ae269fa538a7b310ee20.1780362942.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 04:25: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 7185C362120 for ; Tue, 2 Jun 2026 02:33:21 +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=1780367602; cv=none; b=fi000w7qBZ6/SD4k8w6Uj7+lRg0pImG1xln7x6P6R3Aht1Ch7sVksV+gwrHgIg6jUcB9uDYAizd3mN2SeMJoN1zJBEqVFbmNOg2ati/JcVVxe3R2XRpPNW+4lMEvptQxNsBwanosQCZO7bvWkkSQIupx9Bu0Abyo9bdd8aPxEoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367602; c=relaxed/simple; bh=EZRqF6eE9zEwYBVGPqqRDvTyGjmL25NcAp2roqLcPNo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RFRMwwjCPCWwcv+/KayL1rJ1m79AgjFZkm7GEGz6+iGFfMb3iwqwsJUuceEE/6Q2r5EzcEGxFSscc1Kq3+EAowR6B4Rld2aeOyDjPjJnUevu+I7yR59ZnfiI/b3PB4Biz1LDCV/ie30tI5DYLCuIzQPN93J8UjbbcGt35yIRIcU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kVfz3Dw+; 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="kVfz3Dw+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A99C81F00898; Tue, 2 Jun 2026 02:33:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367601; bh=jw+BUPncgkSN+kg2iVhsourrdt2Sz8wQXostv6EkgbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kVfz3Dw+FTldw5qIddOqOBeV86NRsE1TQNYcxWICnBIFLMWrn7bKNqJRgyuz/8LS2 F+CJyIBnP2EQAsWQKZgCawWjfusFRix+GTeFTf7EEuA1ElLgwUVCsmpodPgd/+6i1r g1Ap3pWe9LHT4xkyZp3QbbrKc/+yQ13l3Cvq/xpCmXJgGOn9juJbIvXCiTmgNCd0oC ON7MMTJboYfHx1fcyPg/1rYkHUUBW7S8scBtJQbDitAzIa7gdkuC1/Z/nUCuqsJUbb ILvWp3RD/nV93Hf1Mm83f5hIk00cZxrHWFHt7YFO5wnsdhkd/tng2DZwP9t7T6TpAg jmjT1t1T7Nafg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 07/16] mptcp: implement ulp getsockopt for tls support Date: Tue, 2 Jun 2026 10:32:48 +0800 Message-ID: <2e60d214719247d2e0919d25006f0cc16fa76029.1780362942.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 mptcp_getsockopt_tcp_ulp() to handle TCP_ULP getsockopt on MPTCP sockets. The helper reads the user length once, checks for negative value, takes the socket lock, caps the length to TCP_ULP_NAME_MAX, and copies the ULP name (or sets the length to zero if no ULP is attached) to userspace. The lock ensures safe access to icsk->icsk_ulp_ops. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/sockopt.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index fcf6feb2a9eb..cc45491cd3b2 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1408,6 +1408,39 @@ 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) +{ + struct inet_connection_sock *icsk =3D inet_csk(sk); + int ret =3D 0, len; + + if (copy_from_sockptr(&len, USER_SOCKPTR(optlen), sizeof(int))) + return -EFAULT; + + if (len < 0) + return -EINVAL; + + lock_sock(sk); + len =3D min_t(unsigned int, len, TCP_ULP_NAME_MAX); + if (!icsk->icsk_ulp_ops) { + len =3D 0; + if (copy_to_sockptr(USER_SOCKPTR(optlen), &len, sizeof(int))) + ret =3D -EFAULT; + goto out; + } + if (copy_to_sockptr(USER_SOCKPTR(optlen), &len, sizeof(int))) { + ret =3D -EFAULT; + goto out; + } + if (copy_to_sockptr(USER_SOCKPTR(optval), icsk->icsk_ulp_ops->name, + len)) + ret =3D -EFAULT; +out: + release_sock(sk); + return ret; +} + static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname, char __user *optval, int __user *optlen) { @@ -1415,6 +1448,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 04:25: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 028B63612F6 for ; Tue, 2 Jun 2026 02:33:23 +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=1780367605; cv=none; b=CU6rPmIq+ND6zbZo43aOcbSNaggF3K8RT0W3HvDVcB2eSgw4mleU+kLvOpouXCGTIAEfg4n7GVYVwM7WwuaFpoJjvxa6oSOTWW8dzqZSeXYGuMIlDiY0xIBpIOUnrAUe1WIAt1EVvSladCwbfRmpkY0mQ8CWAXph5/GccG3Sljc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367605; c=relaxed/simple; bh=NX2Vus9+M5DGR6/XLM8t0b+7S3FE6l7K/VmlgYUMolA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RmZlnUIzOlNEv88vfou6KSTae/VhVoiIucGYX82JSyqVBxNZCElRVyQWa50OTXToHq274nCvn0u1GEV6re4xB4jkCorhA4OhRHl/E/wpez2B6QJWD6JvWLZgodUamtPRK//jOL+WmNAoO27EA3NuizJYUW5BSUia+8FphQt0vi0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l2ub0qQU; 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="l2ub0qQU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 055921F00893; Tue, 2 Jun 2026 02:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367603; bh=HFao//rS4N9CFaoW/BLYiwmfc8WnzhYn3Yw9IwWo2Tc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=l2ub0qQUGDbLMW73B0GaHpORzDA5isrjMwWPI3PFUoNTVFS1DYhDi5H9NvFlJAhP9 lVtD3OtYXFyfkH1EBZ7kE5N7hl42RjJzPXR9VwFaNKpOzO5Ux/92fKvug6KDiN5faw NCj7Bgc8L8MSarCmcNFL+vJ+93OK/AvVNqbpTy3drHhsK0eq9EHqtK48d7SIGt+SBW f2PuKYOiq18zSawTk9ZhDw5/mK2Qy6ms4QHFEUSixkX/KGOKscQ8ByxJ99SpcrFYar x2x/0CdMmhaxIvoy7mWAjV7Wcvxc6V9ezls2Sba5zhFPNi9iPUezxjefFzv4D+UTQN kz1FjULr3Vv/w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 08/16] mptcp: implement ulp setsockopt for tls support Date: Tue, 2 Jun 2026 10:32:49 +0800 Message-ID: <4915f39e66939458adf2989b005350bc3f31f744.1780362942.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 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. On a fallback MPTCP socket, the ULP is already set to "mptcp". Setting "tls" will fail with -EEXIST, so no special handling is needed. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 1 + net/mptcp/sockopt.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d7dd26c4664a..d930d0751f3d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3698,6 +3698,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 cc45491cd3b2..e84b7a654248 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 @@ -577,6 +578,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 @@ -830,6 +832,37 @@ static int mptcp_setsockopt_all_sf(struct mptcp_sock *= msk, int level, return ret; } =20 +static int mptcp_setsockopt_tcp_ulp(struct sock *sk, sockptr_t optval, + unsigned int optlen) +{ + char name[TCP_ULP_NAME_MAX]; + 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 ((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) { @@ -838,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 04:25: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 3C66530E0F5 for ; Tue, 2 Jun 2026 02:33:26 +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=1780367607; cv=none; b=EEYfFJbRhqftNGbzYFwHXJ4crrUV64QFwN2KAro28Bbujxka+651J0JODwDIfPs9W+qABsIk8Yj+yaGxf20h7A6dzJ4HCRrSzwpig25TXi0VgZDS5mYIqfeIu0XaaT7f9USeOBVzofHIurtpNbaqFRwbsxd8Mk6LqLC0d3/7iRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367607; c=relaxed/simple; bh=3gl0K9I5PyXXoykIdu26iq4G+91su8cvRW6scifbKT8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tt7V/cFE1isLC3GIxtd0NmhcVGVKqU6M5Zva8H8BJ6EpvbEEQUH/IHTfvNOP2MWAfhAo8SLtLjHc28WxjKD7/YKXfkhlu3I7YB1kDP7RogEsndZeOpWY3Rj8JXWjYVQ1jc96ZXaDSVPB7gOSXTojVLgZ3boMHmcHohg1C8mpwz8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jLcGdTXb; 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="jLcGdTXb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4233E1F00898; Tue, 2 Jun 2026 02:33:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367606; bh=i1r228t++8Jx2HzWD9Lh3NCKCbWjqFm66UQqWx4jVMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jLcGdTXbNJGSPx5PwiFZFYCcVW9X2N7bwPu/I4Lokl7yzDUBsRniwS3yLGGqRTGMj uOAid+690G+l6I9soUjwtA6Q/XEE1b9T9JUoT4jGSsOQfNXYh2aUFF8E0JO93ZUS3X q157fKn4IszpFs1oL/bGll4ZeMj8uDdUIvWHLTeUS5NT32iLvAOkETdNOfA74wRxjY QYY3Ir66T97cDBjAqNE0vmUI1xidFIpdS8Jb2kZR5jpC2WOkTWySTPaCQMuAiM1sh+ bFqxS00dqBPXio43Dxju7O3P49phMnuXoMSQX0fm7LAcU6gES33G9zPtMsw2ttGr5S IYmQGy7iS72kg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 09/16] selftests: mptcp: connect: use espintcp for ulp test Date: Tue, 2 Jun 2026 10:32:50 +0800 Message-ID: <9e1f02433c4164fac011b86eb2339322ea41ef9d.1780362942.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 04:25: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 8C9232045AD for ; Tue, 2 Jun 2026 02:33:28 +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=1780367609; cv=none; b=fXhyNREccYgRo55Oq8s1M89JREPHP/1hUHsB0FLkELjcPEldNBk+yDLkqVScIRY3HpVn/FUivWYIIzR9CZD19pWSC4CCoOxk6HucFrvst0H7tS0loKAm3FDDBRtMBpmePyspia9ww4wBMJMdJJPo4fntX//Rba0580Qbv5SxahU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367609; c=relaxed/simple; bh=Mqrz92JEPCE1o6xkBk8ggU4pOInHHunzS838mGSLmuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IPMfIsjoqtU2zu7hVCL1cQlYlURpDFgU2GSY2pUdPnxZO1PriqKZeJ8AqDu02NYX61ZS+/qSZhh9dL/uoUnho3TvayitpvPWW/iTnqHY7mOOhvA6WyTAx0CmC4FEvUHDRPT8UQDfpaEfFTvVDI1BMeK0l1SQOu35U44RnUZTCW8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cNhAdURr; 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="cNhAdURr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD71A1F00893; Tue, 2 Jun 2026 02:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367608; bh=MAO1CzgHEProwfI+nczP+M5IuY8I7OjS+4gtXMDKNlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cNhAdURrj5McqqHYLYjbetjhcRhKl90etQ/xwC8THz3Iy7D8k9TE5xM+Cx8EElhms PEvgsSOUDHOhm1mGO8wSsLP9U31CeERX7Q1qA69sdGmysx3lVa3b9TD8yM3r1qOvxx VEtrTagBhg1sTD4W4024U2tVMDqr064k+U7kxLoAzAJH8eC2qhezqZ0/MlxmLRYVxK K738xaBPRfLQw3VVCZfPocro9zzjSYsnwXf31mJ5XIRV9WZhAcJkVAdxRYiuWQ7C2t FwqkyeTkpVfpLODeTSpSC7+awE65sYv+UVfP53VbfcOzWmLNU3n5HDJb7Ai5kTvaOu f/wcrD5BQZ8+g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 10/16] selftests: tls: add mptcp variant for testing Date: Tue, 2 Jun 2026 10:32:51 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang To enable easy MPTCP socket creation in MPTCP TLS tests, two protocol parameters (cli_proto and srv_proto) have been added to ulp_sock_pair(). These are passed as third arguments of socket(): 0 creates TCP sockets, IPPROTO_MPTCP creates MPTCP sockets. A new variant "mptcp" is added both in FIXTURE_VARIANT(tls) to control whether to create MPTCP sockets or not for tests. 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 04:25: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 3CCF63624C9 for ; Tue, 2 Jun 2026 02:33: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=1780367612; cv=none; b=O2Xx5MXsjx1GSUFkMVo5SpqySPBjig2TaynHQy1b39eXA9p2ovUhHx8Z3wZZpoWhgCNeZk1UouH8qFahaEB/3YHxNiej/GmdfVFwbnzufwDXnFma7aPG+BQsAnm1+ZXjj68qtd26YxGCUf6Z5KrO/XZKPsDRKRGHuqepm4C6uAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367612; c=relaxed/simple; bh=iqV0zSaCNXM8wzAhRBNqtu6qJvXxNa7FekUqOtiqHWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JsvJ75PYxTc9qG32DTNVbG5i9SiwUSSrzFXWrMqxylCnyGjzH/lg5wPJ0Nr3VkGFIb/CnW0qPW0W2M7Vqbl37z3OxDpoKdf60DIwBuuX7DZw4YbWoUTFbafbKlhsDy1+zLwVWSHt8ZXcJ7OYPcbdPg/pRlWNKD1d4FUrCJWL4u4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dpVz7w14; 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="dpVz7w14" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B0F81F00898; Tue, 2 Jun 2026 02:33:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367610; bh=VqJYDhrdfYG8x1P+nVzqyFokwQq12zc8vWSKIl8WGmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dpVz7w14484UwgkEO3/ZzQdmw+B8cFl0f/Yf2zJK2QPlEBNBKeHw0xZCBm8W+kF32 hQNftHB/Z+3g84rGw24sutMfv7K6WADPmixfqLcSNKQCObeibGvRKpYm/cVCKZGSPS 6zGed6qHdOgj/Scd4eTRrZtku0Fuxs3k47Gdgjft/obbGkwaDW4Hjpgdqvkc/wva7v 57pqob/1MpDlq7kzB8o3yhMuAZHmeRH19/bnzKXQukhpV4kTPAurvqM2MjZC/zENLb 56WzUi9AjliCbkwdw2wgLe0o0kLdtMGoLfqFbOp4CYvMtOOmyBfz+AlxAiwOVI5nPD IAxU5d11RQc1w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 11/16] selftests: tls: increase pollin timeouts for mptcp Date: Tue, 2 Jun 2026 10:32:52 +0800 Message-ID: <4e89382196a2d87eb48977e6600d78a31813b1df.1780362942.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 04:25: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 5819C33B6E3 for ; Tue, 2 Jun 2026 02:33:33 +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=1780367614; cv=none; b=J8Bm9dyzTV0kyOT85zgzLNHCTxPEMdCqS2ag5N3gdFJcvapXb9ok/JoEnLqL3VOIjdeziYg88E/dWDetQZnmr47usk7cN7JZOKbiWeHAyatYplnN9H26SLILsNQk97i3b2EL/vzt+hoBglWx+OM2NyiLD59nZT3YD2WqE3QV3ww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367614; c=relaxed/simple; bh=C8Alr9wHDA1wyvNjYB2Q8LN7wGjGU3z/KZAEUgOKn0E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h0BA2EGd3qSprHlBjNkwR+DlxS4rf7ye38J8aDrWqPEkONWbI+ZMGpcBF9YwbtSy9rE8u1st7Wwqr2t5b2HpuspSl3Ydj/Khps/E/peB+Ek9JwO7QYR0MK9INLUn4Hmaaehvj4FOvWIhBiwHW6XZwitzwJPmwqetWGDbk0q2G0I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZOg3FykK; 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="ZOg3FykK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CD4D1F00893; Tue, 2 Jun 2026 02:33:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367613; bh=WEViAPywuZzQo7Al26/ts5tn23+npYf3//x6bxmYZBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZOg3FykKpEkP+rh3+lKvsZEDUPrC7NngEdjKE2PihFOSEJQTiQH4lF7nrg7SyVwtv H4oNrwL5yy6scTY89L2fvynezlsW+Y2QOZ0Hhe9w21ha8jjc3uKS5KBnfUSLzR9C+Y 1yl+IDEo2YKosZZnro7+TDhhnKL/hLI5wzNqgq0E9EuLCLZkREZMpG5sDulgM+bae3 zyXhKz7K9mhj9iix+cKsT8jldPTdUVEZiLMUH6fKlmdi8Ce/TqH8stC3h6U1pA6JPm 0js9nLxF9p1ljz6bdkmItTRCOZw9P37czJzMnYiE/XTeqSAr48qOniF1wQ59oe7kGf DCkbVYj8yyteA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 12/16] selftests: tls: increase nonblocking data size for mptcp Date: Tue, 2 Jun 2026 10:32:53 +0800 Message-ID: <209d458b80fa6d5d6e3fa6000a85a5ccf2032a7c.1780362942.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 04:25: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 76876360EEA for ; Tue, 2 Jun 2026 02:33: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=1780367616; cv=none; b=nw97pncQR9utyR1NvFuaZwAc2MptoAQ61kUDi4D8+l3sLBI4xsJrZ9bzxjlR2F4m09b5agUaCutPSqWCwqOG7sMml9sliF9nTm0XyNIq9wIWh+pwaBqOqrWk+0Gwr7kEw+BiZwhZCEqUegJ4E68+67D3zvISi089uCxRxK0LUDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367616; c=relaxed/simple; bh=x++q9UrygcGpWHorzTl/tCCzY48BIP0kiZ0SE56jM4o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dvyQAxgtZjHjbo3U9zU6hVeLA5rSSD98A+8zEmICK0Kfg2023ZwxsLM7sNVqxHd4/SWRa0ESkNjOsIyzzZ3dZhVgegbUcZT2460llKxBTJfe1UmbK2zPNIQcx1lFaeBFoJfjp/3aPGrhbleDVouYrT1x7a0QBK7vgGFmH+hsOTg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IxLfMFZ7; 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="IxLfMFZ7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC1011F00898; Tue, 2 Jun 2026 02:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367615; bh=fKDRQclkJ626atSWNQktztDQZTZsZwJhifMsbK6XASA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IxLfMFZ7YOM6x/6CTgT6cGha/neZTEt0XT5csdO1sxzRE2mTPGhFUjeggLCW/BUqz Jpsnj/9teML8gtLL7YWvz/1lb52UwqGSbJkFTiyrAsS1zNAj3Se1zZgy8ujeR9ghq6 CJ3x9uAKmsh4Ccccd/wkNWGhXycIznSGUdGQCPoXFgL+HmbyuTPMXN1Uk825ouDNUP XIFI7T8wTtg0ndvEyaq+cLz7Jjxuk56a8XBFiKWqAvSUjSqv/YRqTTcTZr74+Zy6Q7 jCrs6SYcNApTUScD6nxJ6/PXB6lV1D4BxC3sxqrDM0MKO2Oj5x1XzAd/cFsnAiMlI3 wNQvYmGq8Us5Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 13/16] selftests: tls: retry bind for mptcp in shutdown_reuse Date: Tue, 2 Jun 2026 10:32:54 +0800 Message-ID: <4696b2cf5ab78ed77f6a1b39f99c922bc7a1b868.1780362942.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. 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 04:25: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 B04122045AD for ; Tue, 2 Jun 2026 02:33:37 +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=1780367618; cv=none; b=scmCAx+l6NYI7Ykiu2pvGtXScxnHUXpY/2DsemsykwvxSjmQlSFa/c+y807N/fBCpHdzLRqYpHrT+m8Bsi+2ADsTUqLVJUWm9z9hFZKaLoXn98bn200bOsbXWsjmWn2wOrNqJwhlYE3V6ahcRGLiDJiUpwc0O86Y1ZJznGw01EQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367618; c=relaxed/simple; bh=oqContIvSwDjBBUvCDlGJnboNlniQ4AqWa16l/Stl9A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AKY4cOW5yMA9aOuy1ZrY9rR4b83/mHzVwlUTuQw45MVQ0YnTK4O0DR0FI+oga/HZmVnOubt4jwpn5GnK9OHpQFEXSSkf9cNgAzllyI0G34H5wXFwYwG5aLnNVSqQLkHXahlw1kcTvopjGPR3o6yGELJAJB7Vn5nIID4GXjrtm+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ed4oFoKW; 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="ed4oFoKW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EF271F00893; Tue, 2 Jun 2026 02:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367617; bh=jNixIy30UgWwxn53isZSW3yVS4d5nxvceDL4X9ngrNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ed4oFoKWOESoyW7fZBxG5fyynmgqlM93ahGpeJHDv2z1XMfD16zUlwTJJLfigzGIL hhs+Q10/rdPlngTf8rk77zisDNGoMVLbS07lUgXshljxy1SKXBJwPy2RWoD9N+gZHE QQ3/wW9Ejih3LSVkI5pVCpJMfQ8+xE5ze4u6aHWkqiShpwKDt0znPXCtyBfzuAKifl imyz25BeNLHshqNKCqlt1fXu6A4yAbTD11x0n988rsatS+eojEkxWFMLrA73Pt/PaO pG3B0KOcHl6mKF2YH0HGLlQG0NJiOwd8CLuupRe4dZLMkLjvC4XWhxEDwwqxd2r/oU RguNFELHumCOQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni , Gang Yan Subject: [RFC mptcp-next v23 14/16] selftests: tls: set timeout for multi_chunk_sendfile Date: Tue, 2 Jun 2026 10:32:55 +0800 Message-ID: <160f75478206467e0237da501ca0fbede80e9bac.1780362942.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 04:25: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 F38E733B6E3 for ; Tue, 2 Jun 2026 02:33: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=1780367620; cv=none; b=eN/KkGcPOBouH2K8AGJ2Flx/H+523D2S+y27Ye+ok4BylpvmlI5Crq0hoCVymQ2RVcOZncbBpTHVbK8PGm6hWWSN8NFh8Ul10C4GGINme3LMsm4+IXUswYBQsOjF41ASphg4y78nvwZkF2fiWcUamzRSXVeBsKrTVbghSPsFS3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367620; c=relaxed/simple; bh=82iGtqlHP03QmuWGf0VaMBINawAW0bVgPGIo/n8dCzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b8rhP8sHDLyEE6im8e5Bre304hyk2KjpGsZbqem4TrLdoToTzJ1NMEPeg7wbmf9hsnFghjwASYheM1Zth8zTrrSnxvupvfgemdE7S/tGNtvxFy/DALWB7rpUES/aNv7gBA5/8YqCjbOE2CJNpe4FixhVkwriUnO3OiHv6CA/XB0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EgC70hlR; 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="EgC70hlR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E7881F00898; Tue, 2 Jun 2026 02:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367619; bh=sD3L1RTJjtvETcJNDdakdqHvduVfdS94pHrk3pmxhy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EgC70hlRYNopdR5XVaCwARTiauX/tBlOeabaYDPSs3fANTW+fGhgMMBEPUvsSK3Q8 h0KJE51G0UsKpaaMzzuCZPL+RC0cu5LvoOw7VZGGmPVDWe3NHTXh2qEtTmXf0XpBPs 0Fw4KYbgkxYgUDKhGQcHUhrJ3k73/XyFiIaxBxR/rE/oKHL67Ym+XBS5s6pczGSX26 J0b2tu+URTU5kNjt8WvQnkIay9g7ORpJ3+qOBl6XEQfbSlAvkNnQILTlxyJoDsDGR9 ZBr+TROXAuXPXDhPSMiBRFjOxpx5GJIqOvMu+YZB+Rkc4rI3DsUwwJvZFC1OhDGuJK Fkk9hj3seLPJw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 15/16] selftests: tls: add mptcp test cases Date: Tue, 2 Jun 2026 10:32: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 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 04:25: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 4F595360EEA for ; Tue, 2 Jun 2026 02:33:42 +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=1780367623; cv=none; b=hmbIEoEXcrTe3h2eCBEI3lsH5Kxh+Fo3ESnTAvWl/BJaArYMhzb0y7Htew+MZnhnY59TTiqZGUHC9FpmTlLElkGoLrrOrfmiMcSnkS+xWhvKDHeejDUV9HaE8otLNlI1q4GZbonuEnjGjGvqWxPitjeEPAexom4wcFbcMBRB3bE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780367623; c=relaxed/simple; bh=92H9x9yFNkbJgJjQ0eKxqkSzeLXxSN34dHUm+ZBI/Ec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BtmNSVNyEvlgCbUZC1uIUNVEllXvgBNM7fcDFik+0QhZMP08skPUnG+Dl7y5i8LJbOo2if5QT4227dFdyyQ73DzGyH2vIhpA5iP6+oBrR+HuWpFcZp+ciDyc8FCUecFq+uakt/UbWElUOoOAzn7iKXJAfBcRV17xVjHJ/TXE+Ig= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fL77tvE3; 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="fL77tvE3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 842E71F00893; Tue, 2 Jun 2026 02:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780367622; bh=EToo3lVyscBNTbcRYQRhh2LBDC9LSekOmA85iyM/VrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fL77tvE3XmmgO7YUJA9jf2MSL0R+nZGqDFbO9IsZafytBAE5FNmsOjlUfwnvMkwCt ZsP6Kg3qtExQM5sd9P7cIiYiOFaN1Vt6udh7YB8RDhp4Y2hqMflKOxspzR+AXPmCfF gPSviMaHkCpnVVNXKrn/QezkaaDO7Oq2anEoh+nswH85lamcs1giQhSoC5gTxufc3o D4I4Bw3BjuEC7zSRr6n85MpJyGwGio47T6WAka11t6r9ZiRdcRwQWOZS2r7ZBBiUav t/biOR6wNlerYXn4K6OjsLKXx+W3/83rg575sDHf0vK5HZ6JD90k/U0dFFKm2wytX0 V+FVDh7mAQxVQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v23 16/16] selftests: mptcp: cover mptcp tls tests Date: Tue, 2 Jun 2026 10:32:57 +0800 Message-ID: <5f95903d2649119f41745951ac586e5c58d416d5.1780362942.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 | 61 +++++++++++++++++++ tools/testing/selftests/net/mptcp/tls.c | 1 + 5 files changed, 70 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..79d120cd4b16 --- /dev/null +++ b/tools/testing/selftests/net/mptcp/mptcp_tls.sh @@ -0,0 +1,61 @@ +#!/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 + +init + +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