From nobody Wed Jun 24 16:13:07 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9ADF38B7D9 for ; Fri, 24 Apr 2026 10:39:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777027149; cv=none; b=uw66JL834orhOyJ82zV+v7PhRIltBye9hBYbGDDEeGsB7NtukqXh2AudzFNQtdTznwELhz1aqgmJp+EuSVW4LaGJrfx3PxHB9bWlWcW2zeC9Zzgz0WC5Hs+/WGg++WHrVzbnr+pBYpQiwwFoSy9NwCoBFl8qqEReZXHMAl1IFKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777027149; c=relaxed/simple; bh=leynI1uootdYkoucXXJ+84CciTlN6t7Pxuqn09cL5mo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tM0w4FR3I6gJIzOSl6QRQmql0jupvgv3iIdY9GGiWGx0LInAjiFOMHAf+lZ3S10N8f7mJjh18JkHdrZb9XgeU79UFqnsBu0k33GancUbxN6Zxil2VHaD7D5BW1JRYfM98J5MoAryb2lS2DLLMALiAHKsaWT58vSv3rEI04LPSE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iLia3hBG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iLia3hBG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47283C2BCB4; Fri, 24 Apr 2026 10:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777027149; bh=leynI1uootdYkoucXXJ+84CciTlN6t7Pxuqn09cL5mo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iLia3hBGgcraJWfks6Mss2+xIdvuw/HqiPGsZNUyZun7nIvFQOpRg4RQ+fNQFoc6Y XgRs7lNzdfRnYzkedR69lWLal0ZlBQY2gTJmND/xrGEEDxuxD7SQDID5LzvWL4uQOg +SspFhLUHUYA/fauFfkHpY4ws0wWBQwiNK8YEBBCIGMmN7J91Kmf1YV4TXnS1IVoJ4 zycUIvItK2Wg9SZZX7yUl1mbHb/hdzDmkMGRW8d8ScisN0lfOslZNdqxiqjgu31jhq L6e214nct6obzcrd0ztiAoKLfY56DEIt4sVw5ArK22I0UNKwRrF+21HShYWAbspvK4 r80aPJU/9JePQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v17 08/15] mptcp: enable ulp setsockopt for tls support Date: Fri, 24 Apr 2026 18:38:32 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Allow MPTCP sockets to set the TCP_ULP socket option to enable TLS. Add mptcp_setsockopt_tcp_ulp() which validates the socket state (must not be CLOSE or LISTEN), only accepts "tls" as the ULP name, and then calls tcp_set_ulp(). Include TCP_ULP in the list of supported options in supported_sockopt(), and handle it in setsockopt_sol_tcp() instead of returning -EOPNOTSUPP. Call tcp_cleanup_ulp() in mptcp_destroy_common() to release ULP module's reference count. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 1 + net/mptcp/sockopt.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9d20170614fa..d1987958ff2e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3635,6 +3635,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 11e071b0994e..1059efbd4f8f 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "protocol.h" =20 #define MIN_INFO_OPTLEN_SIZE 16 @@ -567,6 +568,7 @@ static bool mptcp_supported_sockopt(int level, int optn= ame) case TCP_FASTOPEN_CONNECT: case TCP_FASTOPEN_KEY: case TCP_FASTOPEN_NO_COOKIE: + case TCP_ULP: return true; } =20 @@ -815,6 +817,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) { @@ -823,7 +856,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