From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D145E19ABD8 for ; Tue, 18 Nov 2025 04:01:51 +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=1763438512; cv=none; b=IKyvI+T0egaqhJwVfTx6THN2Uj4OBSjWjpuh2LGzC13CH5LbheEdmLmwnS3WX75U/ineQAB6lfgs7c4HPCcONNgLmWv4lc8FkjT8FkeKWIhM1JoQHDOod9anUpDRR2nu/GnLnofdJVFZlfkSIa28OXcBUVYrPjqTlOC/C3OZjqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438512; c=relaxed/simple; bh=mhcKCnPpm4791oDOPR7omwuP+5PqPb18qXF68Pm8uns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DZ/d4sjPKRwyfweePlM0DfM096fmHdMV6KAzqiZz96nR3nR/rbhFeQj5IjfyoR11ULT088B0/uct4lCE0uQejfC5BNafsMgtFfmm+dU6aDOF55wkDXoenOW0xj/ZWs0cbDLZuQv8pFxUsKuTin9MPeBZKGRwOWGPx4ceaUEDnnM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U5w9SHez; 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="U5w9SHez" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6475EC4CEF5; Tue, 18 Nov 2025 04:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438511; bh=mhcKCnPpm4791oDOPR7omwuP+5PqPb18qXF68Pm8uns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U5w9SHezUYMBCdUe8/0JfetLgSDG9BbThdIIGrxJEQ7w3+h7eihPmzB6FM8YH/wyP 2V8Gu1iKx6fFrJZtpRS47E1dA/e0weYqwcxzVkDRs+ljTD31HRzAKIRDJQpnGy/toc voakrCqvgjerWq2v5iRjXLgx2UgtjbDBxGQx+lN1KLDDr3Cb7IMKFUZvGCWWlX4pDb p5z8u5UTODvigDc6Hij+bXDf1FJdXkXmBzD3REAsfhpBiXB98fwgm8IeBwj0jZyWNq zQuSsmRiAlzuze+116rETTfH8ormoRf9mfGAxwu67H1a6Ije09mek+A9Iyg8p/Y+bv ufEYnvFN22TcA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 01/10] selftests: mptcp: sockopt: add protocol arguments Date: Tue, 18 Nov 2025 12:01:22 +0800 Message-ID: <769aee1b6b69a401b0a871864d1feff3f2fd0a0c.1763438045.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add -t and -r options to specify tx/rx protocols (TCP/MPTCP). This increases testing flexibility by allowing explicit protocol selection for both transmission and reception paths. These codes are from mptcp_inq.c. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 286164f7246e..e4752f848f08 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -27,6 +27,8 @@ #include =20 static int pf =3D AF_INET; +static int proto_tx =3D IPPROTO_MPTCP; +static int proto_rx =3D IPPROTO_MPTCP; =20 #ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262 @@ -135,7 +137,7 @@ static void die_perror(const char *msg) =20 static void die_usage(int r) { - fprintf(stderr, "Usage: mptcp_sockopt [-6]\n"); + fprintf(stderr, "Usage: mptcp_sockopt [-6] [-t tcp|mptcp] [-r tcp|mptcp]\= n"); exit(r); } =20 @@ -201,7 +203,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, hints.ai_family =3D pf; =20 for (a =3D addr; a; a =3D a->ai_next) { - sock =3D socket(a->ai_family, a->ai_socktype, IPPROTO_MPTCP); + sock =3D socket(a->ai_family, a->ai_socktype, proto_rx); if (sock < 0) continue; =20 @@ -259,11 +261,22 @@ static int sock_connect_mptcp(const char * const remo= teaddr, return sock; } =20 +static int protostr_to_num(const char *s) +{ + if (strcasecmp(s, "tcp") =3D=3D 0) + return IPPROTO_TCP; + if (strcasecmp(s, "mptcp") =3D=3D 0) + return IPPROTO_MPTCP; + + die_usage(1); + return 0; +} + static void parse_opts(int argc, char **argv) { int c; =20 - while ((c =3D getopt(argc, argv, "h6")) !=3D -1) { + while ((c =3D getopt(argc, argv, "h6t:r:")) !=3D -1) { switch (c) { case 'h': die_usage(0); @@ -271,6 +284,12 @@ static void parse_opts(int argc, char **argv) case '6': pf =3D AF_INET6; break; + case 't': + proto_tx =3D protostr_to_num(optarg); + break; + case 'r': + proto_rx =3D protostr_to_num(optarg); + break; default: die_usage(1); break; @@ -776,10 +795,10 @@ static int client(int pipefd) =20 switch (pf) { case AF_INET: - fd =3D sock_connect_mptcp("127.0.0.1", "15432", IPPROTO_MPTCP); + fd =3D sock_connect_mptcp("127.0.0.1", "15432", proto_tx); break; case AF_INET6: - fd =3D sock_connect_mptcp("::1", "15432", IPPROTO_MPTCP); + fd =3D sock_connect_mptcp("::1", "15432", proto_tx); break; default: xerror("Unknown pf %d\n", pf); --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A88319ABD8 for ; Tue, 18 Nov 2025 04:01:53 +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=1763438513; cv=none; b=fViEt/6DPouDleMNd9oZR+OQq/E5s4SBE8ymWkCqjVvwQIQMlWidz1hygkGs0beanWJlnKWWEXT6w0/02hX2DrfGsADuDsMM2fFHfaCazvK0y48MYwczkm+RK6eNyc4agYG8MvVwfSxWL1BACtKlj3HUpAqynbukp3mZEDmy8Lg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438513; c=relaxed/simple; bh=J86OKn5xH0aCyfgFj2LrEaddfYLxe76BkBFI2DuoDYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dvCXjMWoP5A/ilsOOxSdefAHNY7oXI/yJv3xy4WZuYjHmvAU9h5A8Q9BgazTuLH+tvha0XKkhutU0uN/4hw7DRoMKyjuRTZewwwqBMa6JZ9f5jEp2Kkq6ej067Ba1YiRU3ghg+nQH4LhwlNZMzcxRKB5LMe8ht9PXhyGqF0xaFo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EnzYfTrD; 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="EnzYfTrD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEFCBC4CEF1; Tue, 18 Nov 2025 04:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438512; bh=J86OKn5xH0aCyfgFj2LrEaddfYLxe76BkBFI2DuoDYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EnzYfTrDxXEHk65LqAYU2Au2zbSytjuPYSi+TT2j2u77aYPJ8H/bkA2epJ10zTJQ8 rgV3J3tOVuV6lXjsSAbnPlXvNtCZgL0oegUyViIY4GWPlxDaEbS46fCb8WTRb/IRpa 9SwQ0ZcDaDmAqP//nhA8iA1OeqTKI9py0to+Pmt7vARhrqQjnSOtCMaJ+Bou59yysZ XAfQQisbXIJ6X6yt1bB46kS+4rgnTA0pxkcvLVD0fSGSjEKdr2fhgKtCktWKsJu8Rd y8PRtRODxqgRl+u4cBiieZ9LM93xk4LU9FR3zePj3KJt7sFjWxQfiEU1JCU7gFyP4T kHXXeYmrVsjXw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 02/10] selftests: mptcp: sockopt: skip mptcp getsockopt for tcp tests Date: Tue, 18 Nov 2025 12:01:23 +0800 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Skip mptcp getsockopt checks during tcp tests since MPTCP socket options are not available for them. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index e4752f848f08..59c07eda12cd 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -384,7 +384,7 @@ static void do_getsockopt_mptcp_info(struct so_state *s= , int fd, size_t w) ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_INFO, &i, &olen); =20 if (ret < 0) - die_perror("getsockopt MPTCP_INFO"); + return; =20 s->pkt_stats_avail =3D olen >=3D sizeof(i); =20 @@ -415,7 +415,7 @@ static void do_getsockopt_tcp_info(struct so_state *s, = int fd, size_t r, size_t =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_TCPINFO, &ti, &olen); if (ret < 0) - xerror("getsockopt MPTCP_TCPINFO (tries %d, %m)"); + return; =20 assert(olen <=3D sizeof(ti)); assert(ti.d.size_kernel > 0); @@ -470,7 +470,7 @@ static void do_getsockopt_subflow_addrs(struct so_state= *s, int fd) =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_SUBFLOW_ADDRS, &addrs, &olen); if (ret < 0) - die_perror("getsockopt MPTCP_SUBFLOW_ADDRS"); + return; =20 assert(olen <=3D sizeof(addrs)); assert(addrs.d.size_kernel > 0); @@ -540,13 +540,8 @@ static void do_getsockopt_mptcp_full_info(struct so_st= ate *s, int fd) olen =3D data_size; =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_FULL_INFO, &mfi, &olen); - if (ret < 0) { - if (errno =3D=3D EOPNOTSUPP) { - perror("MPTCP_FULL_INFO test skipped"); - return; - } - xerror("getsockopt MPTCP_FULL_INFO"); - } + if (ret < 0) + return; =20 assert(olen <=3D data_size); assert(mfi.size_tcpinfo_kernel > 0); @@ -650,7 +645,8 @@ static void connect_one_server(int fd, int pipefd) if (eof) total +=3D 1; /* sequence advances due to FIN */ =20 - assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); + if (s.mptcpi_rcv_delta) + assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); close(fd); } =20 @@ -685,7 +681,8 @@ static void process_one_client(int fd, int pipefd) xerror("expected EOF, got %lu", ret3); =20 do_getsockopts(&s, fd, ret, ret2); - if (s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) + if (s.mptcpi_rcv_delta && + s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) xerror("mptcpi_rcv_delta %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, s.mptcpi_rcv_delta, ret + 1, s.mptcpi_rcv_delta - (ret + 1)); =20 --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D4B1212D7C for ; Tue, 18 Nov 2025 04:01:54 +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=1763438515; cv=none; b=EjcsRF0AK7jhZXm7PhfrpiXTvI0GlpbHjbtNyumOshZ1E3TGRTjaVJGcj6Zn5AqODgz2ejnuw2l3XxKF9zw1Mz21hpDwkmm0cm0zfnUk3LJs2mEjBMCvNw0laS6RSAqxVi4+ttcEzGgmCfM/lBBw56nLJ0QvbBHLwo5ymEhiBX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438515; c=relaxed/simple; bh=jZXTChXKlKg7CC8Jt02v1JCwe+yTQJEtC0Q/sce1WVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lIxDMttbpa5I1NAUJiAyDHsi0RRyaYALLMWeezxMr1C5Nu3bNqbl5ZRyQdfp+AQFKJVExQGkCceyJnOt+HpVZnML+cR3JHKQK9AgbnrYBxss+rRInYPQ1d8tm1PN2MKpIbaiaTNv4zxnlehcNLjpys4feHNztl8VewishLVlsmo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BtqB3AaV; 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="BtqB3AaV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F420C16AAE; Tue, 18 Nov 2025 04:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438514; bh=jZXTChXKlKg7CC8Jt02v1JCwe+yTQJEtC0Q/sce1WVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BtqB3AaV3ocyeVm1bfO+wpXF+cZW8baReVr/I9rn4zdnqtYaKbN2klyNrCcTniUQn yL2zn0FwSuskWnXYsUAFN7VziKa91IjaJiFs5CCXQrOsXXgHfaW/PnabHc2riVIoCx JjtWv3A0Gu+B2KVKGzS2RMmVIpDPqv3zUJnpr8iJcc9PteBHMWa4MHkgp20rkoHnCh pn6L9LadBZNp/d/UhcLDtwfVovZHGfqrwwnS0SD/UBoz7AFLx0J7xpjFvswLy5oYSG vITXMnUCpB1IhNaNBNNnFy4cEUKGhbUVf9vFYANfrlksVGWKP4utlvYn7CeTSzzB95 Sa5anmYxxBLEA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 03/10] selftests: mptcp: sockopt: add TLS argument support Date: Tue, 18 Nov 2025 12:01:24 +0800 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add a new command line option '-c' to the mptcp_sockopt test program to enable TLS testing functionality. This prepares for subsequent TLS-over-MPTCP test implementations. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 59c07eda12cd..5e1e441c959d 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -29,6 +29,7 @@ static int pf =3D AF_INET; static int proto_tx =3D IPPROTO_MPTCP; static int proto_rx =3D IPPROTO_MPTCP; +static bool tls; =20 #ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262 @@ -137,7 +138,7 @@ static void die_perror(const char *msg) =20 static void die_usage(int r) { - fprintf(stderr, "Usage: mptcp_sockopt [-6] [-t tcp|mptcp] [-r tcp|mptcp]\= n"); + fprintf(stderr, "Usage: mptcp_sockopt [-6] [-t tcp|mptcp] [-r tcp|mptcp] = [-c]\n"); exit(r); } =20 @@ -276,7 +277,7 @@ static void parse_opts(int argc, char **argv) { int c; =20 - while ((c =3D getopt(argc, argv, "h6t:r:")) !=3D -1) { + while ((c =3D getopt(argc, argv, "h6t:r:c")) !=3D -1) { switch (c) { case 'h': die_usage(0); @@ -289,6 +290,8 @@ static void parse_opts(int argc, char **argv) break; case 'r': proto_rx =3D protostr_to_num(optarg); + case 'c': + tls =3D true; break; default: die_usage(1); --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4DA719ABD8 for ; Tue, 18 Nov 2025 04:01:56 +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=1763438516; cv=none; b=oLxXITXMgALUOen/wwsc5H7qznVg/Hu9Re5EeOTdlpPSc48I75irzXl5X0v8lIsDHb64zERaKrqBojYrdVZYZ32ZK1OsPp9ZL2y1SWq1xCZa5haz4wFSb2aO1xDl9SryVL6O1X0oCkHgF9EfANeBJuNUIu2L8u6Fh9OCFs4IIls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438516; c=relaxed/simple; bh=5nBADwq3TOV9MoRUmH063c6U1u3JIvKaftJAdxNWaTs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BH8bMys4d4QmVhqKqRsFST25JpI1uwR0uWd/hnI5wBBsFB3KJslZxyebuBeO5i5158T1RqqHkuk3/zVNoDEU380VXDsimiL08bDYctHXYT4J9pbI2acPGqXchKXKvsaV1dm/0JKfksm3pjkFKQPUMestMiV6IJdY2+Q5StBA9dA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bO+sI3JJ; 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="bO+sI3JJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68AE1C2BCAF; Tue, 18 Nov 2025 04:01:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438516; bh=5nBADwq3TOV9MoRUmH063c6U1u3JIvKaftJAdxNWaTs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bO+sI3JJXAkvXHCtnprxVJqCfZ4UdNA1+IKqCBZJbuR6TPikjEfvxtNY390GD6t0I M8eMyS2s7j4uqPoEGeephswiL1YVnfNiaM4vmGgkicmkpalk2oQnQ8w8Rq80Eo9FLR EHBVhLUHzaVgN7vfpdcl5bgN615T+EbUkhx43hvpSW2NzfCiD8u9w4bot9mCZY3zxH YQMHq0wn6nEMcnehiJnIpoLTfT/NWmQ5qk0vt+ysFbwAu7peZaYx1rTOMES7JhsEdy JePUkb7RIl0vb5Tvo1t2QamhB47/dHrD9C+INp259OecuNwF8JCWRlmtMtuH3pVv49 mJXCrj7biYizA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 04/10] selftests: mptcp: sockopt: implement TCP TLS tests Date: Tue, 18 Nov 2025 12:01:25 +0800 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add Kernel TLS (KTLS) testing infrastructure to mptcp_sockopt, including: - TLS socket option configuration helpers - TCP-specific TLS test cases for both IPv4 and IPv6 - Required TLS header includes and configuration updates Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 1 + .../selftests/net/mptcp/mptcp_sockopt.c | 56 +++++++++++++++++++ .../selftests/net/mptcp/mptcp_sockopt.sh | 35 ++++++++++++ 3 files changed, 92 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 59051ee2a986..18bd29ac5b24 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -34,3 +34,4 @@ CONFIG_NFT_SOCKET=3Dm CONFIG_NFT_TPROXY=3Dm CONFIG_SYN_COOKIES=3Dy CONFIG_VETH=3Dy +CONFIG_TLS=3Dy diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 5e1e441c959d..8058b1fd5a35 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -25,6 +25,7 @@ #include =20 #include +#include =20 static int pf =3D AF_INET; static int proto_tx =3D IPPROTO_MPTCP; @@ -37,6 +38,9 @@ static bool tls; #ifndef SOL_MPTCP #define SOL_MPTCP 284 #endif +#ifndef TCP_ULP +#define TCP_ULP 31 +#endif =20 #ifndef MPTCP_INFO struct mptcp_info { @@ -185,6 +189,52 @@ static void xgetaddrinfo(const char *node, const char = *service, } } =20 +static int do_setsockopt_tls(int fd) +{ + struct tls12_crypto_info_aes_gcm_128 tls_tx =3D { + .info =3D { + .version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_128, + }, + }; + struct tls12_crypto_info_aes_gcm_128 tls_rx =3D { + .info =3D { + .version =3D TLS_1_2_VERSION, + .cipher_type =3D TLS_CIPHER_AES_GCM_128, + }, + }; + int so_buf =3D 6553500; + int err; + + err =3D setsockopt(fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls")); + if (err) { + perror("setsockopt TCP_ULP"); + return err; + } + err =3D setsockopt(fd, SOL_TLS, TLS_TX, (void *)&tls_tx, sizeof(tls_tx)); + if (err) { + perror("setsockopt TLS_TX"); + return err; + } + err =3D setsockopt(fd, SOL_TLS, TLS_RX, (void *)&tls_rx, sizeof(tls_rx)); + if (err) { + perror("setsockopt TLS_RX"); + return err; + } + err =3D setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &so_buf, sizeof(so_buf)); + if (err) { + perror("setsockopt SO_SNDBUF"); + return err; + } + err =3D setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &so_buf, sizeof(so_buf)); + if (err) { + perror("setsockopt SO_RCVBUF"); + return err; + } + + return 0; +} + static int sock_listen_mptcp(const char * const listenaddr, const char * const port) { @@ -743,6 +793,9 @@ static int server(int pipefd) alarm(15); r =3D xaccept(fd); =20 + if (tls) + do_setsockopt_tls(r); + process_one_client(r, pipefd); =20 close(fd); @@ -806,6 +859,9 @@ static int client(int pipefd) =20 test_ip_tos_sockopt(fd); =20 + if (tls) + do_setsockopt_tls(fd); + connect_one_server(fd, pipefd); =20 return 0; diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index ab8bce06b262..4d6ab4a63e3f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -351,6 +351,40 @@ do_tcpinq_tests() return $? } =20 +do_tls_test() +{ + print_title "KTLS $*" | head -c 53 + ip netns exec "$ns_sbox" ./mptcp_sockopt "$@" + local lret=3D$? + if [ $lret -ne 0 ];then + ret=3D$lret + mptcp_lib_pr_fail + mptcp_lib_result_fail "KTLS: $*" + return $lret + fi + + mptcp_lib_pr_ok + mptcp_lib_result_pass "KTLS: $*" + return $lret +} + +do_tls_tests() +{ + local lret=3D0 + + mptcp_lib_print_info "sockopt KTLS" + + # TCP KTLS + do_tls_test -c -t tcp -r tcp + lret=3D$? + if [ $lret -ne 0 ] ; then + return $lret + fi + do_tls_test -6 -c -t tcp -r tcp + lret=3D$? + return $lret +} + sin=3D$(mktemp) sout=3D$(mktemp) cin=3D$(mktemp) @@ -366,6 +400,7 @@ run_tests $ns1 $ns2 dead:beef:1::1 =20 do_mptcp_sockopt_tests do_tcpinq_tests +do_tls_tests =20 mptcp_lib_result_print_all_tap exit $ret --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BC5C2222D1 for ; Tue, 18 Nov 2025 04:01:58 +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=1763438519; cv=none; b=ghuF7GtvxdFbLyPjbefw12jbtxvhCKI3qDhOx8A/mkurATjrYaR4n1Yy5DdXfb0cco07Xt7hBrk5OWTziGMQHsxaVRe5Rc/BHuHgLe36lr/lQbUP7zHEixpqWihWEZCeMMbvFPQjd3kVP49uzmzIEq5HHlS3aQwKJ2bq8XEcRlI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438519; c=relaxed/simple; bh=zoyg5NDiQaKaJCwCEchfcn2pfpoRETFMehLiecMxx3c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DhhwiwW43eo0JC9v7pEp3tRKVPTTV5mfOyRmEnPmVgPmJCpb7UQ1AlirXMt/4GwalEjz7WQXkUClxcVZHzBOlIKtALgvqRps3Fp2Jaj7fIfVHti3PHHUYH3cyQj6PCzeL8e7lz+8tMzG2BTTf31gOA2U20b9wXOz93KLYXyqhrA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bsDsNdvi; 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="bsDsNdvi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42E6AC4CEF1; Tue, 18 Nov 2025 04:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438518; bh=zoyg5NDiQaKaJCwCEchfcn2pfpoRETFMehLiecMxx3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bsDsNdvinq6OEcV9tl/p0FrIW2z9uVFJHamHIg8TThYfbpLZ59xl6kHAuKxFBVl9s FWcJX/12uHkn5Kl70q7+7OlGNzWsoYCy6+tmvYS6bmbMl7KvbFHRWe2K6ujHkfJIz9 F0abwaDpvIZLAgKH7tPXH9ZSnsiz+Ib6bc0lL5o67WwvxfAEMxlXfCqsz6VTdqzUwd n0YJ/bM84uJtSAGtfbN/WPMouyGKKAvJgYHTQgZVzB9NRFFX6Z3dUavu41zeowihdf qyMqLEKe0eCH1Ei+kR8K5Fx1NNQkafTSkHxCMUQLS4pkykdnVsuJMb/UyVdqCoZcAv R2HVSj4fjWZww== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next 05/10] tls: add MPTCP protocol support Date: Tue, 18 Nov 2025 12:01:26 +0800 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Extend TLS subsystem to support MPTCP protocol by implementing MPTCP-specific versions of key operations: - mptcp_sendmsg_locked() for TLS record transmission - mptcp_inq_hint() and mptcp_recv_skb() for receive side handling - mptcp_read_sock() and mptcp_read_done() for data reading Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- include/net/mptcp.h | 34 ++++++++++++++++++++++++ net/mptcp/protocol.c | 61 ++++++++++++++++++++++++++++++++++++++------ net/tls/tls_main.c | 7 +++-- net/tls/tls_strp.c | 20 ++++++++++++--- 4 files changed, 108 insertions(+), 14 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4cf59e83c1c5..6efa70d93353 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -237,6 +237,17 @@ static inline __be32 mptcp_reset_option(const struct s= k_buff *skb) } =20 void mptcp_active_detect_blackhole(struct sock *sk, bool expired); + +int mptcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t len); + +unsigned int mptcp_inq_hint(const struct sock *sk); + +struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off); + +int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor); + +void mptcp_read_done(struct sock *sk, size_t len); #else =20 static inline void mptcp_init(void) @@ -323,6 +334,29 @@ static inline struct request_sock *mptcp_subflow_reqsk= _alloc(const struct reques static inline __be32 mptcp_reset_option(const struct sk_buff *skb) { retu= rn htonl(0u); } =20 static inline void mptcp_active_detect_blackhole(struct sock *sk, bool exp= ired) { } + +static inline int mptcp_sendmsg_locked(struct sock *sk, struct msghdr *msg= , size_t len) +{ + return 0; +} + +static inline unsigned int mptcp_inq_hint(const struct sock *sk) +{ + return 0; +} + +static inline struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off) +{ + return NULL; +} + +static inline int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor) +{ + return 0; +} + +static inline void mptcp_read_done(struct sock *sk, size_t len) { } #endif /* CONFIG_MPTCP */ =20 #if IS_ENABLED(CONFIG_MPTCP_IPV6) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 873c1a93b777..a9181e71bc66 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1861,7 +1861,7 @@ static void mptcp_rps_record_subflows(const struct mp= tcp_sock *msk) } } =20 -static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) +int mptcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t len) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct page_frag *pfrag; @@ -1872,8 +1872,6 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) /* silently ignore everything else */ msg->msg_flags &=3D MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_FASTOPEN; =20 - lock_sock(sk); - mptcp_rps_record_subflows(msk); =20 if (unlikely(inet_test_bit(DEFER_CONNECT, sk) || @@ -1981,7 +1979,6 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) __mptcp_push_pending(sk, msg->msg_flags); =20 out: - release_sock(sk); return copied; =20 do_error: @@ -1992,6 +1989,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) @@ -2223,7 +2231,7 @@ static bool mptcp_move_skbs(struct sock *sk) return enqueued; } =20 -static unsigned int mptcp_inq_hint(const struct sock *sk) +unsigned int mptcp_inq_hint(const struct sock *sk) { const struct mptcp_sock *msk =3D mptcp_sk(sk); const struct sk_buff *skb; @@ -4271,7 +4279,7 @@ static __poll_t mptcp_poll(struct file *file, struct = socket *sock, return mask; } =20 -static struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off) +struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct sk_buff *skb; @@ -4295,8 +4303,8 @@ static struct sk_buff *mptcp_recv_skb(struct sock *sk= , u32 *off) * Note: * - It is assumed that the socket was locked by the caller. */ -static int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, - sk_read_actor_t recv_actor) +int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor) { struct mptcp_sock *msk =3D mptcp_sk(sk); size_t len =3D sk->sk_rcvbuf; @@ -4453,6 +4461,43 @@ static ssize_t mptcp_splice_read(struct socket *sock= , loff_t *ppos, return ret; } =20 +void mptcp_read_done(struct sock *sk, size_t len) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct sk_buff *skb; + size_t left; + u32 offset; + + sock_owned_by_me(sk); + + if (sk->sk_state =3D=3D TCP_LISTEN) + return; + + left =3D len; + while (left && (skb =3D mptcp_recv_skb(sk, &offset)) !=3D NULL) { + int used; + + used =3D min_t(size_t, skb->len - offset, left); + left -=3D used; + MPTCP_SKB_CB(skb)->offset +=3D used; + MPTCP_SKB_CB(skb)->map_seq +=3D used; + + if (skb->len > offset + used) + break; + + mptcp_eat_recv_skb(sk, skb); + } + + mptcp_rcv_space_adjust(msk, len - left); + + /* Clean up data we have read: This will do ACK frames. */ + if (left !=3D len) { + mptcp_recv_skb(sk, &offset); + mptcp_cleanup_rbuf(msk, len - left); + } +} +EXPORT_SYMBOL(mptcp_read_done); + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 56ce0bc8317b..eb1842722267 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -194,7 +194,9 @@ int tls_push_sg(struct sock *sk, bvec_set_page(&bvec, p, size, offset); iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); =20 - ret =3D tcp_sendmsg_locked(sk, &msg, size); + ret =3D sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_sendmsg_locked(sk, &msg, size) : + tcp_sendmsg_locked(sk, &msg, size); =20 if (ret !=3D size) { if (ret > 0) { @@ -401,6 +403,7 @@ static void tls_sk_proto_close(struct sock *sk, long ti= meout) static __poll_t tls_sk_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait) { + const struct proto_ops *ops =3D READ_ONCE(sock->ops); struct tls_sw_context_rx *ctx; struct tls_context *tls_ctx; struct sock *sk =3D sock->sk; @@ -409,7 +412,7 @@ static __poll_t tls_sk_poll(struct file *file, struct s= ocket *sock, u8 shutdown; int state; =20 - mask =3D tcp_poll(file, sock, wait); + mask =3D ops->poll(file, sock, wait); =20 state =3D inet_sk_state_load(sk); shutdown =3D READ_ONCE(sk->sk_shutdown); diff --git a/net/tls/tls_strp.c b/net/tls/tls_strp.c index 98e12f0ff57e..3985e77f3351 100644 --- a/net/tls/tls_strp.c +++ b/net/tls/tls_strp.c @@ -132,6 +132,8 @@ int tls_strp_msg_cow(struct tls_sw_context_rx *ctx) tls_strp_anchor_free(strp); strp->anchor =3D skb; =20 + strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_read_done(strp->sk, strp->stm.full_len) : tcp_read_done(strp->sk, strp->stm.full_len); strp->copy_mode =3D 1; =20 @@ -383,6 +385,8 @@ static int tls_strp_read_copyin(struct tls_strparser *s= trp) desc.count =3D 1; /* give more than one skb per call */ =20 /* sk should be locked here, so okay to do read_sock */ + strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_read_sock(strp->sk, &desc, tls_strp_copyin) : tcp_read_sock(strp->sk, &desc, tls_strp_copyin); =20 return desc.error; @@ -464,8 +468,10 @@ static void tls_strp_load_anchor_with_queue(struct tls= _strparser *strp, int len) struct sk_buff *first; u32 offset; =20 - first =3D tcp_recv_skb(strp->sk, tp->copied_seq, &offset); - if (WARN_ON_ONCE(!first)) + first =3D strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_recv_skb(strp->sk, &offset) : + tcp_recv_skb(strp->sk, tp->copied_seq, &offset); + if (!first) return; =20 /* Bestow the state onto the anchor */ @@ -490,7 +496,9 @@ bool tls_strp_msg_load(struct tls_strparser *strp, bool= force_refresh) DEBUG_NET_WARN_ON_ONCE(!strp->stm.full_len); =20 if (!strp->copy_mode && force_refresh) { - if (unlikely(tcp_inq(strp->sk) < strp->stm.full_len)) { + if (unlikely((strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_inq_hint(strp->sk) : + tcp_inq(strp->sk)) < strp->stm.full_len)) { WRITE_ONCE(strp->msg_ready, 0); memset(&strp->stm, 0, sizeof(strp->stm)); return false; @@ -513,7 +521,9 @@ static int tls_strp_read_sock(struct tls_strparser *str= p) { int sz, inq; =20 - inq =3D tcp_inq(strp->sk); + inq =3D strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_inq_hint(strp->sk) : + tcp_inq(strp->sk); if (inq < 1) return 0; =20 @@ -586,6 +596,8 @@ void tls_strp_msg_done(struct tls_strparser *strp) WARN_ON(!strp->stm.full_len); =20 if (likely(!strp->copy_mode)) + strp->sk->sk_protocol =3D=3D IPPROTO_MPTCP ? + mptcp_read_done(strp->sk, strp->stm.full_len) : tcp_read_done(strp->sk, strp->stm.full_len); else tls_strp_flush_anchor_copy(strp); --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DE6919ABD8 for ; Tue, 18 Nov 2025 04:02:00 +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=1763438522; cv=none; b=T9OJYp6R/IK2I/1gzZgzp+5fh9HZSrwqaEVOvj9u1iOa1ZqIRoNkI+GCuPlbq2HNr6KpPQNxusehXk4PRynM9KVgaNLwqDcN8uFkM8fT74zCXuYW5OpUvLAeLjds7ahoVUFD2TFTAWPILdhBSgj4CiHBLZdvTQs9Me+eP6iVm4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438522; c=relaxed/simple; bh=W9cahuU0I7Ph94IaasA30gbJYlR40HUYX2bb/Tpkdy8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ULDJsT1ISRMeZwDX6j2vy/bBwv0dGyV2TxBeDxhEa5PSXwYgJ2adJ6HDkLuf/1flE2KSbEQ+6fVOcQ5Z0YSNTnxkrqaFhLcy4chl0+goMoe7e86NhiMv3csjl4E3JHWmI7731KQp92bWmYwJJqSheR/826/+0hgWt99Ux/r5Gzs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NwKhJPU4; 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="NwKhJPU4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 350F5C116D0; Tue, 18 Nov 2025 04:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438520; bh=W9cahuU0I7Ph94IaasA30gbJYlR40HUYX2bb/Tpkdy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NwKhJPU484UA4b73Ns5+KVJpobnTLoYcAK+BDic+JyaKTrCqeZ9y4NOimzFoGyxWb HUjzwRFJpawrE0jjdJOnQFg+afhzDS8tCb8upUb+AKugfgV7xAGFuP5RLHtOXDgUkE H5B05WNwUQWWPdNoLY6XwPgafnyKMpI+kGLPhQjMTRmxnnXT8eHqQ9H7fbXvoPvS5F wBWT1PrtjJ23iVAaDWdJJ7TWqLJpamGfu00Jvcr4D9hTqsOFj4SnKreRYZcr0OZ+D0 /M/0k4FoG4jtUebeJL7MDns2HUMfcjhDyhKpYXcH1T9/qTrThRnsuzTnO314DPkhcz 2LkTgfq1vE2yg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next 06/10] mptcp: enable TLS socket options Date: Tue, 18 Nov 2025 12:01:27 +0800 Message-ID: <56793a0ef12b64376651aefaabe67963728e8635.1763438045.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add support for TLS-related socket options in MPTCP protocol: - Allow TCP_ULP option with "tls" parameter - Support TLS_TX and TLS_RX options from SOL_TLS level - Delegate TLS option handling to underlying TCP implementation Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/sockopt.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index de90a2897d2d..6a5ce43e611a 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "protocol.h" =20 #define MIN_INFO_OPTLEN_SIZE 16 @@ -567,6 +568,7 @@ static bool mptcp_supported_sockopt(int level, int optn= ame) case TCP_FASTOPEN_CONNECT: case TCP_FASTOPEN_KEY: case TCP_FASTOPEN_NO_COOKIE: + case TCP_ULP: return true; } =20 @@ -576,6 +578,13 @@ static bool mptcp_supported_sockopt(int level, int opt= name) * TCP_REPAIR_WINDOW are not supported, better avoid this mess */ } + if (level =3D=3D SOL_TLS) { + switch (optname) { + case TLS_TX: + case TLS_RX: + return true; + } + } return false; } =20 @@ -819,11 +828,18 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock= *msk, int optname, sockptr_t optval, unsigned int optlen) { struct sock *sk =3D (void *)msk; + char __user ulp[4] =3D ""; int ret, val; =20 switch (optname) { case TCP_ULP: - return -EOPNOTSUPP; + if (copy_from_user(ulp, optval.user, 4)) + return -EFAULT; + if (strcmp(ulp, "tls\0")) + return -EOPNOTSUPP; + if ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) + return -EINVAL; + return tcp_setsockopt(sk, SOL_TCP, optname, optval, optlen); case TCP_CONGESTION: return mptcp_setsockopt_sol_tcp_congestion(msk, optval, optlen); case TCP_DEFER_ACCEPT: --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6339212D7C for ; Tue, 18 Nov 2025 04:02:02 +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=1763438522; cv=none; b=mUj9n6t8SrUVwebCdiVLQCkvdQhcrqFvGz5zkBPnGu9MUxbL0RHSlAi9pYjnp82nkn0G4sFUm7r+LYW/m95JCb0oy3EtK6c88pJqaxFSKFpoldU+bRZqcYCBxTWvgAWP2WfOyDZBj1axiSw41LjPKgMsfNRigrxMDCFBxnANKVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438522; c=relaxed/simple; bh=IkjJuAcYOdnHA8vEx/WZzPFOXoiX7pDk8Ed2WKaf6to=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UVVrYlyaXmg/OKd0xfxd3DChX2KzcJdp3inot0gcHl0os8kRlnBSgDgYXlw9kmyXesg2/AysH4BpWXnXGEOmJwiiqAT72xC2HJCXkngno1MVeVd5T48HUpOc5aQd7MYbu5Lxe1l+nKifwH/r2OwHA4+xdSDxkymkAUIF93p0yX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H75Uq9my; 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="H75Uq9my" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A69DC19421; Tue, 18 Nov 2025 04:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438522; bh=IkjJuAcYOdnHA8vEx/WZzPFOXoiX7pDk8Ed2WKaf6to=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H75Uq9myJDNxIzQAn9fctFf+XA7CpYIY5DWdnvP9TD52e+nG21bXMeRwyRpc6qX3X 5phU/DQMb0EeMSRR7OyyzsAJiRIdQte7DqtCoKuto9eKtYaoU2TpO15R5wv47GqvOr Rg/IIl2Vm70jCi3SjbdJYe+DDIMVDWQdsKoEAM6P5PBm+R1z1OQEFY1PKoGVvS6QR1 RVeDh2k0neAzL4mikE3h6uKjfDb0eOpv8y6GcOBP6bPGGGFTh+yOgBS+vutF3qKnb/ Ob6g9EN355qqz/XGUi1PxFDY+PmSOok68rnDTAoGQ0NXU0cBa0zRI7kdbeGl1FSyYL 4plLqY8BHClhA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 07/10] selftests: mptcp: connect: enhance TCP ULP testing Date: Tue, 18 Nov 2025 12:01:28 +0800 Message-ID: <173a27421099de5c9f79a2e8f2ac55c5bbab073a.1763438045.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Improve sock_test_tcpulp() function to properly validate TLS ULP setup on MPTCP sockets. The updated logic verifies that TLS can be correctly configured based on the socket protocol type and state. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.c | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index b82df82e0594..deafcff7a2c8 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -33,6 +33,7 @@ #include #include #include +#include =20 extern int optind; =20 @@ -272,7 +273,7 @@ static int do_ulp_so(int sock, const char *name) } =20 #define X(m) xerror("%s:%u: %s: failed for proto %d at line %u", __FILE__,= __LINE__, (m), proto, line) -static void sock_test_tcpulp(int sock, int proto, unsigned int line) +static void sock_test_tcpulp(int sock, int proto, int r, unsigned int line) { socklen_t buflen =3D 8; char buf[8] =3D ""; @@ -285,11 +286,11 @@ static void sock_test_tcpulp(int sock, int proto, uns= igned int line) 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"); - if (ret =3D=3D 0) + if (ret !=3D r) X("setsockopt"); } else if (proto =3D=3D IPPROTO_MPTCP) { ret =3D do_ulp_so(sock, "tls"); - if (ret !=3D -1) + if (ret !=3D r) X("setsockopt"); } =20 @@ -300,7 +301,7 @@ static void sock_test_tcpulp(int sock, int proto, unsig= ned int line) #undef X } =20 -#define SOCK_TEST_TCPULP(s, p) sock_test_tcpulp((s), (p), __LINE__) +#define SOCK_TEST_TCPULP(s, p, r) sock_test_tcpulp((s), (p), (r), __LINE__) =20 static int sock_listen_mptcp(const char * const listenaddr, const char * const port) @@ -325,7 +326,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, if (sock < 0) continue; =20 - SOCK_TEST_TCPULP(sock, cfg_sock_proto); + SOCK_TEST_TCPULP(sock, cfg_sock_proto, -1); =20 if (-1 =3D=3D setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) @@ -352,7 +353,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, return sock; } =20 - SOCK_TEST_TCPULP(sock, cfg_sock_proto); + SOCK_TEST_TCPULP(sock, cfg_sock_proto, -1); =20 if (listen(sock, 20)) { perror("listen"); @@ -360,11 +361,20 @@ static int sock_listen_mptcp(const char * const liste= naddr, return -1; } =20 - SOCK_TEST_TCPULP(sock, cfg_sock_proto); + SOCK_TEST_TCPULP(sock, cfg_sock_proto, -1); =20 return sock; } =20 +static int is_mptcp(int fd) +{ + struct mptcp_info info; + socklen_t optlen; + + optlen =3D sizeof(info); + return getsockopt(fd, SOL_MPTCP, MPTCP_INFO, &info, &optlen); +} + static int sock_connect_mptcp(const char * const remoteaddr, const char * const port, int proto, struct addrinfo **peer, @@ -388,7 +398,7 @@ static int sock_connect_mptcp(const char * const remote= addr, continue; } =20 - SOCK_TEST_TCPULP(sock, proto); + SOCK_TEST_TCPULP(sock, proto, -1); =20 if (cfg_mark) set_mark(sock, cfg_mark); @@ -425,7 +435,7 @@ static int sock_connect_mptcp(const char * const remote= addr, =20 freeaddrinfo(addr); if (sock !=3D -1) - SOCK_TEST_TCPULP(sock, proto); + SOCK_TEST_TCPULP(sock, proto, is_mptcp(sock)); return sock; } =20 @@ -1197,7 +1207,7 @@ int main_loop_s(int listensock) xerror("can't open %s: %d", cfg_input, errno); } =20 - SOCK_TEST_TCPULP(remotesock, 0); + SOCK_TEST_TCPULP(remotesock, 0, 0); =20 memset(&winfo, 0, sizeof(winfo)); err =3D copyfd_io(fd, remotesock, 1, true, &winfo); @@ -1371,7 +1381,7 @@ int main_loop(void) again: check_getpeername_connect(fd); =20 - SOCK_TEST_TCPULP(fd, cfg_sock_proto); + SOCK_TEST_TCPULP(fd, cfg_sock_proto, -1); =20 if (cfg_rcvbuf) set_rcvbuf(fd, cfg_rcvbuf); --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 683A219ABD8 for ; Tue, 18 Nov 2025 04:02:04 +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=1763438524; cv=none; b=I/QlxHP/AJMNxKDa9MJgl/pbsY8aIL75BwKXrW+BonbZ/7Bos3fvt3xh1XM8Ji/YNgC9RYcG9jUJ7rCREjl9QI4tnhQnci3Qeerna5h8llsz6IucPgIQN2QgZQROSe2MqRmTz96oqi7khAKyyTJHjfx21C0qPRsjBkcEbpwct34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438524; c=relaxed/simple; bh=Cq4iW++W7oDhQsSm0kqGrrk2eLbzHmcMQKCoPRF/5QI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g+wRerGN4saDz09QjHBFYOI6W44EqWkyvZ6LxZy/CLAG9cKEje+mDoLkTR5yY2EeoRO4Htt8DGPGl+dbz9GZHTzg057C8yYDGhk80Ee8E5ai1r+uV/OBZShjjL++5G8RpTRKqKRil744OhVWYz8w7JQxjYh1nn+mKpN+zSPNh04= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YnR2sz5Z; 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="YnR2sz5Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20623C116B1; Tue, 18 Nov 2025 04:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438524; bh=Cq4iW++W7oDhQsSm0kqGrrk2eLbzHmcMQKCoPRF/5QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YnR2sz5ZOxPyOtIemW1je/UiRCeJoVswmeFesUZ0oe8ddddf+HFu+cxT4HHiyXug4 wyvXJfh0MoqE0PPxIaQ+YBKtwKoJTT2BLXlf4vcvKDKy/yE8HdrlAIod7CWqyCBRlH BJsU8H5FpwQaQ4X+I8YBDjtEIdwZiOaWMIHeag115Q7MqIdMMGBiw9NQAzNxyuZIFw 5wFlapcRQ0cQ+wrwdB64+fbj3rSkESTYFHoCoDz4onmuvRP9hDjUCee+mH7IUJkUH4 bJykFiRViW0shjvgBtGc8unzsijqagCOQFvg6ESDIr3Sz2nFGLPxRqK9YhUHAiETdI SAuhUlqDZz34A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 08/10] selftests: mptcp: connect: skip TLS in disconnect tests Date: Tue, 18 Nov 2025 12:01:29 +0800 Message-ID: <0f303e07ce390055d0e68195530ae30ac33a2a5a.1763438045.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Modify disconnect test scenarios to bypass TLS socket configuration since TLS setup can interfere with connection teardown validation. Add cfg_disconnect flag to control this behavior. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index deafcff7a2c8..e43874610297 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -79,6 +79,7 @@ static char *cfg_input; static int cfg_repeat =3D 1; static int cfg_truncate; static int cfg_rcv_trunc; +static int cfg_disconnect =3D 0; =20 struct cfg_cmsg_types { unsigned int cmsg_enabled:1; @@ -434,7 +435,7 @@ static int sock_connect_mptcp(const char * const remote= addr, } =20 freeaddrinfo(addr); - if (sock !=3D -1) + if (sock !=3D -1 && cfg_disconnect =3D=3D 0) SOCK_TEST_TCPULP(sock, proto, is_mptcp(sock)); return sock; } @@ -1381,7 +1382,9 @@ int main_loop(void) again: check_getpeername_connect(fd); =20 - SOCK_TEST_TCPULP(fd, cfg_sock_proto, -1); + /* Don't let TLS break disconnect tests */ + if (cfg_disconnect =3D=3D 0) + SOCK_TEST_TCPULP(fd, cfg_sock_proto, -1); =20 if (cfg_rcvbuf) set_rcvbuf(fd, cfg_rcvbuf); @@ -1540,6 +1543,7 @@ static void parse_opts(int argc, char **argv) break; case 'I': cfg_repeat =3D atoi(optarg); + cfg_disconnect =3D 1; break; case 'l': listen_mode =3D true; --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBDB119ABD8 for ; Tue, 18 Nov 2025 04:02:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438526; cv=none; b=dUllG/fzOdw50Y9jcM34zViu2HaWiLibom30dSd2u5iPF/Qm6ISp7AJ6Q/RKvknboO0c6eZi/M9+bp1j0GrOnihchfrbqSEIkOoGGyDZNfuunBIpwonUPHLlhxQzwkMUvUkH7ciEvgY5lFhXBp/sqv/1+eVvcVrgHv6dgYDu2YQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438526; c=relaxed/simple; bh=NMrKwUzuSHwymPMcdQe3r5gTkA0dPPZWkr4RVkP0Sdc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oZ27gkdqttLh3aTHtzwWqLLURfUgnqQRBiloEYlWKLYb3Y9jXC+3UFr/w3KSb3fW0HJq/tNJDdgdJYDCnbqG6hqXsFg5QNm563olTsC8WOSgwmBHfaCT0JYRT6qfJyup8dVvkkTRi/Bm/IH1rg1ud7fxl62d63cMCXWIBErYwxE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nqy/Kzeu; 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="nqy/Kzeu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0165C19421; Tue, 18 Nov 2025 04:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438525; bh=NMrKwUzuSHwymPMcdQe3r5gTkA0dPPZWkr4RVkP0Sdc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nqy/KzeuRisaiIfI0I6BBadPgQkP1xMQn/d+3yFdA0zkJ7KFHTJWjU/ogEiyvKizT 91PL/NbWqiXan+Ytt+1d5rPVu+P0ULaO2B94rtbaw5HQAY/4agStwsfED4iI59Aksn z27c/m2T6Rxaw08LtZ5V+BZ8olCYpCqJf93la6ymFUiOKE8B9WQlcrNFSkcjCCtLeY 5F3pL+KJtI8Xzk6nHZiJZPsJIzWN1/lnpWnYYQWOV2JtQ2B/wly2S3rfJfTrTiiFZ1 0QvO77F8yfJMycjyqnfmXUic+G007SPNBuEk2YAE7VI2T01X6FkPImmNo+QgOBQguQ zxSKxbjMGRmYg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 09/10] selftests: mptcp: connect: fix uninitialized variable warning Date: Tue, 18 Nov 2025 12:01:30 +0800 Message-ID: <59284f02f42b31dbb2999eea2fbbeb1c2f9b4225.1763438045.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Initialize 'peer' addrinfo pointer to NULL in main_loop() to resolve compiler warning about potential use of uninitialized variable when handling repeated connection attempts. CC mptcp_connect mptcp_connect.c: In function 'main_loop': mptcp_connect.c:1415:37: warning: 'peer' may be used uninitialized [-Wmaybe= -uninitialized] 1415 | if (connect(fd, peer->ai_addr, peer->ai_addrlen)) | ~~~~^~~~~~~~~ mptcp_connect.c:1368:26: note: 'peer' was declared here 1368 | struct addrinfo *peer; | ^~~~ Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index e43874610297..bd46639edc92 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -1365,7 +1365,7 @@ void xdisconnect(int fd) int main_loop(void) { int fd =3D 0, ret, fd_in =3D 0; - struct addrinfo *peer; + struct addrinfo *peer =3D NULL; struct wstate winfo; =20 if (cfg_input && cfg_sockopt_types.mptfo) { @@ -1405,7 +1405,7 @@ int main_loop(void) =20 if (cfg_truncate > 0) { shutdown(fd, SHUT_WR); - } else if (--cfg_repeat > 0) { + } else if (--cfg_repeat > 0 && peer) { xdisconnect(fd); =20 /* the socket could be unblocking at this point, we need the --=20 2.51.0 From nobody Thu Nov 27 12:38:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4538619ABD8 for ; Tue, 18 Nov 2025 04:02:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438530; cv=none; b=ippVDieFtGPG81obWAjOKQuG1doNWyJTiF6W8ffEKWClQqKKnDS6hq8f0Rgq0yXlH6DeskIkmy20F5Y1sJz4o95V2XToYIITfE2CTsAr1Ns15s3f4qth0sAHjMoG9rg2+c/CvKOvLVPcA/MyV7wsv0sMQs99G3xfuGnO2dK6x50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763438530; c=relaxed/simple; bh=P9vErjI21uPXYmIYih8k3QLX5Sscexp8nsNnagepxBk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mmZrobwnL5hQYg9/O28Sjk3JhQH9ErrT8pZPrj+XGlGzWaALmlaFIBPu9T/KVFtjeMJAqI/s7n+wOOao3N6gyYCFcPMzl0/s+Q7ZMldww14NAKIhUJDh/CnXxwj6ixMT8NJ4YSN6mik2jmhGTVFqXVQOTj3wQt47avucFADwfBo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dto4deOL; 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="dto4deOL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78505C19422; Tue, 18 Nov 2025 04:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763438527; bh=P9vErjI21uPXYmIYih8k3QLX5Sscexp8nsNnagepxBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dto4deOLEBFnQX5liwNW0TLcfh/ddw5GhnEZH4TQ74zymdKJKfPQlpJJC8hoWo0Pu WarbsYgKelDCSgW1FXoseT8kg5cBG7ilEeu/Yh9LdURGn8EZIVmk/jU+/rf9mJBkrN BZRMho0jj0TLaxtjgZOzFh2WEPnA7TODjNiWrG7g4SKOmX8nEfNlq4aOz08m8XldqA nPcXaUwim2wpIXg0qZnUnrEDSM7EhTRqYGlIgNpJvJ8VWsgPv4Eb9wD2de6vD87bmT +zT8M/yEGMSlfqZ7e+ajJoY9zs+bUZwJH8uhzhX2Al/ID+2KYtYy4hTFrnhNUeVSXU PpOVdLLLMO2Eg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RFC mptcp-next 10/10] selftests: mptcp: sockopt: add MPTCP TLS test cases Date: Tue, 18 Nov 2025 12:01:31 +0800 Message-ID: <60f58a85a9f059a197633ddcbd7622a5ab09e2c8.1763438045.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Extend KTLS testing to cover MPTCP protocol by adding: - MPTCP-specific TLS test scenarios for IPv4 and IPv6 - Adjustments to handle MPTCP-specific behavior in test validation - Skip certain checks that don't apply to TLS-enabled connections Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 5 ++++- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 8058b1fd5a35..96cba6df6a56 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -623,6 +623,9 @@ static void do_getsockopt_mptcp_full_info(struct so_sta= te *s, int fd) =20 static void do_getsockopts(struct so_state *s, int fd, size_t r, size_t w) { + if (tls) + return; + do_getsockopt_mptcp_info(s, fd, w); =20 do_getsockopt_tcp_info(s, fd, r, w); @@ -730,7 +733,7 @@ static void process_one_client(int fd, int pipefd) =20 /* wait for hangup */ ret3 =3D read(fd, buf, 1); - if (ret3 !=3D 0) + if (!tls && ret3 !=3D 0) xerror("expected EOF, got %lu", ret3); =20 do_getsockopts(&s, fd, ret, ret2); diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 4d6ab4a63e3f..8840be8adea3 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -382,6 +382,18 @@ do_tls_tests() fi do_tls_test -6 -c -t tcp -r tcp lret=3D$? + if [ $lret -ne 0 ] ; then + return $lret + fi + + # MPTCP KTLS + do_tls_test -c + lret=3D$? + if [ $lret -ne 0 ] ; then + return $lret + fi + do_tls_test -6 -c + lret=3D$? return $lret } =20 --=20 2.51.0