MPTCP KTLS support
Subsystems (4)
Geliang Tang
reviewercover MPTCP KTLS support
From: Geliang Tang <[email protected]>
This series adds KTLS support for MPTCP. Since the ULP of msk is not being used, ULP KTLS can be directly configured onto msk without affecting its communication.
Depends on: implement mptcp read_sock, v13
Based-on: <[email protected]>
Geliang Tang (10):
selftests: mptcp: sockopt: add protocol arguments
selftests: mptcp: sockopt: skip mptcp getsockopt for tcp tests
selftests: mptcp: sockopt: add TLS argument support
selftests: mptcp: sockopt: implement TCP TLS tests
tls: add MPTCP protocol support
mptcp: enable TLS socket options
selftests: mptcp: connect: enhance TCP ULP testing
selftests: mptcp: connect: skip TLS in disconnect tests
selftests: mptcp: connect: fix uninitialized variable warning
selftests: mptcp: sockopt: add MPTCP TLS test cases
include/net/mptcp.h | 34 ++++++ net/mptcp/protocol.c | 61 ++++++++-- net/mptcp/sockopt.c | 18 ++- net/tls/tls_main.c | 7 +- net/tls/tls_strp.c | 20 ++- tools/testing/selftests/net/mptcp/config | 1 + .../selftests/net/mptcp/mptcp_connect.c | 42 ++++--- .../selftests/net/mptcp/mptcp_sockopt.c | 114 +++++++++++++++--- .../selftests/net/mptcp/mptcp_sockopt.sh | 47 ++++++++ 9 files changed, 297 insertions(+), 47 deletions(-)
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 1/10 selftests: mptcp: sockopt: add protocol arguments
From: Geliang Tang <[email protected]>
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.
--- .../selftests/net/mptcp/mptcp_sockopt.c | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_sockopt.c +24 -5
@@ -27,6 +27,8 @@#include <linux/tcp.h> static int pf =AF_INET ; +static int proto_tx =IPPROTO_MPTCP ; +static int proto_rx =IPPROTO_MPTCP ;#ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262
@@ -135,7 +137,7 @@ static void die_perror(const char *msg)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); }
@@ -201,7 +203,7 @@ static int sock_listen_mptcp(const char * const listenaddr, hints.ai_family = pf;for (a = addr; a; a = a->ai_next) { - sock =socket (a->ai_family, a->ai_socktype,IPPROTO_MPTCP ); + sock =socket (a->ai_family, a->ai_socktype, proto_rx);if (sock <0 )continue ;
@@ -259,11 +261,22 @@ static int sock_connect_mptcp(const char * const remoteaddr,return sock; } +static int protostr_to_num (const char *s) +{ +if (strcasecmp (s,"tcp" ) ==0 ) +return IPPROTO_TCP ; +if (strcasecmp (s,"mptcp" ) ==0 ) +return IPPROTO_MPTCP ; + +die_usage (1 ); +return 0 ; +} +static void parse_opts (int argc,char **argv) {int c; -while ((c =getopt (argc, argv,"h6" )) !=-1 ) { +while ((c =getopt (argc, argv,"h6t:r:" )) !=-1 ) {switch (c) {case 'h' :die_usage (0 );
@@ -271,6 +284,12 @@ static void parse_opts(int argc, char **argv)case '6' : pf =AF_INET6 ;break ; +case 't' : + proto_tx =protostr_to_num (optarg); +break ; +case 'r' : + proto_rx =protostr_to_num (optarg); +break ;default :die_usage (1 );break ;
@@ -776,10 +795,10 @@ static int client(int pipefd)switch (pf) {case AF_INET : - fd =sock_connect_mptcp ("127.0.0.1" ,"15432" ,IPPROTO_MPTCP ); + fd =sock_connect_mptcp ("127.0.0.1" ,"15432" , proto_tx);break ;case AF_INET6 : - fd =sock_connect_mptcp ("::1" ,"15432" ,IPPROTO_MPTCP ); + fd =sock_connect_mptcp ("::1" ,"15432" , proto_tx);break ;default :xerror ("Unknown pf %d\n" , pf);
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 2/10 selftests: mptcp: sockopt: skip mptcp getsockopt for tcp tests
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Skip mptcp getsockopt checks during tcp tests since MPTCP socket options are not available for them.
--- .../selftests/net/mptcp/mptcp_sockopt.c | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_sockopt.c +9 -12
@@ -384,7 +384,7 @@ static void do_getsockopt_mptcp_info(struct so_state *s, int fd, size_t w) ret =getsockopt (fd,SOL_MPTCP ,MPTCP_INFO , &i, &olen);if (ret <0 ) -die_perror ("getsockopt MPTCP_INFO" ); +return ; s->pkt_stats_avail = olen >=sizeof (i);
@@ -415,7 +415,7 @@ static void do_getsockopt_tcp_info(struct so_state *s, int fd, size_t r, size_t ret =getsockopt (fd,SOL_MPTCP ,MPTCP_TCPINFO , &ti, &olen);if (ret <0 ) -xerror ("getsockopt MPTCP_TCPINFO (tries %d, %m)" ); +return ;assert (olen <=sizeof (ti));assert (ti.d.size_kernel >0 );
@@ -470,7 +470,7 @@ static void do_getsockopt_subflow_addrs(struct so_state *s, int fd) ret =getsockopt (fd,SOL_MPTCP ,MPTCP_SUBFLOW_ADDRS , &addrs, &olen);if (ret <0 ) -die_perror ("getsockopt MPTCP_SUBFLOW_ADDRS" ); +return ;assert (olen <=sizeof (addrs));assert (addrs.d.size_kernel >0 );
@@ -540,13 +540,8 @@ static void do_getsockopt_mptcp_full_info(struct so_state *s, int fd) olen = data_size; ret =getsockopt (fd,SOL_MPTCP ,MPTCP_FULL_INFO , &mfi, &olen); -if (ret <0 ) { -if (errno ==EOPNOTSUPP ) { -perror ("MPTCP_FULL_INFO test skipped" ); -return ; - } -xerror ("getsockopt MPTCP_FULL_INFO" ); - } +if (ret <0 ) +return ;assert (olen <= data_size);assert (mfi.size_tcpinfo_kernel >0 );
@@ -650,7 +645,8 @@ static void connect_one_server(int fd, int pipefd)if (eof) total +=1 ;/* sequence advances due to FIN */ -assert (s.mptcpi_rcv_delta == (uint64_t )total); +if (s.mptcpi_rcv_delta) +assert (s.mptcpi_rcv_delta == (uint64_t )total);close (fd); }
@@ -685,7 +681,8 @@ static void process_one_client(int fd, int pipefd)xerror ("expected EOF, got %lu" , ret3);do_getsockopts (&s, fd, ret, ret2); -if (s.mptcpi_rcv_delta != (uint64_t )ret +1 ) +if (s.mptcpi_rcv_delta && + s.mptcpi_rcv_delta != (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 ));
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 3/10 selftests: mptcp: sockopt: add TLS argument support
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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.
--- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_sockopt.c +5 -2
@@ -29,6 +29,7 @@static int pf =AF_INET ;static int proto_tx =IPPROTO_MPTCP ;static int proto_rx =IPPROTO_MPTCP ; +static bool tls;#ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262
@@ -137,7 +138,7 @@ static void die_perror(const char *msg)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); }
@@ -276,7 +277,7 @@ static void parse_opts(int argc, char **argv) {int c; -while ((c =getopt (argc, argv,"h6t:r:" )) !=-1 ) { +while ((c =getopt (argc, argv,"h6t:r:c" )) !=-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 =protostr_to_num (optarg); +case 'c' : + tls = true;break ;default :die_usage (1 );
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 4/10 selftests: mptcp: sockopt: implement TCP TLS tests
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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
--- 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(+)
tools/testing/selftests/net/mptcp/config +1 -0
@@ -34,3 +34,4 @@ CONFIG_NFT_SOCKET=m CONFIG_NFT_TPROXY=m CONFIG_SYN_COOKIES=y CONFIG_VETH=y +CONFIG_TLS=y
tools/testing/selftests/net/mptcp/mptcp_sockopt.c +56 -0
86 lines not on this page · raw message
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +35 -0
@@ -351,6 +351,40 @@ do_tcpinq_tests() return $? } +do_tls_test() +{ + print_title "KTLS $*" | head -c 53 + ip netns exec "$ns_sbox" ./mptcp_sockopt "$@" + local lret=$? + if [ $lret -ne 0 ];then + ret=$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=0 + + mptcp_lib_print_info "sockopt KTLS" + + # TCP KTLS + do_tls_test -c -t tcp -r tcp + lret=$? + if [ $lret -ne 0 ] ; then + return $lret + fi + do_tls_test -6 -c -t tcp -r tcp + lret=$? + return $lret +} + sin=$(mktemp) sout=$(mktemp) cin=$(mktemp)
@@ -366,6 +400,7 @@ run_tests $ns1 $ns2 dead:beef:1::1 do_mptcp_sockopt_tests do_tcpinq_tests +do_tls_tests mptcp_lib_result_print_all_tap exit $ret
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 5/10 tls: add MPTCP protocol support
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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
--- 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(-)
include/net/mptcp.h +34 -0
@@ -237,6 +237,17 @@ static inline __be32 mptcp_reset_option(const struct sk_buff *skb) }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 static inline void mptcp_init (void )
@@ -323,6 +334,29 @@ static inline struct request_sock *mptcp_subflow_reqsk_alloc(const struct requesstatic inline __be32 mptcp_reset_option (const struct sk_buff *skb) {return htonl (0u ); }static inline void mptcp_active_detect_blackhole (struct sock *sk,bool expired) { } + +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 */ #if IS_ENABLED (CONFIG_MPTCP_IPV6 )
net/mptcp/protocol.c +53 -8
109 lines not on this page · raw message
net/tls/tls_main.c +5 -2
@@ -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); - ret =tcp_sendmsg_locked (sk, &msg, size); + ret = sk->sk_protocol ==IPPROTO_MPTCP ? +mptcp_sendmsg_locked (sk, &msg, size) : +tcp_sendmsg_locked (sk, &msg, size);if (ret != size) {if (ret >0 ) {
@@ -401,6 +403,7 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)static __poll_t tls_sk_poll (struct file *file,struct socket *sock,struct poll_table_struct *wait) { +const struct proto_ops *ops =READ_ONCE (sock->ops);struct tls_sw_context_rx *ctx;struct tls_context *tls_ctx;struct sock *sk = sock->sk;
@@ -409,7 +412,7 @@ static __poll_t tls_sk_poll(struct file *file, struct socket *sock,u8 shutdown;int state; - mask =tcp_poll (file, sock, wait); + mask = ops->poll (file, sock, wait); state =inet_sk_state_load (sk); shutdown =READ_ONCE (sk->sk_shutdown);
net/tls/tls_strp.c +16 -4
@@ -132,6 +132,8 @@ int tls_strp_msg_cow(struct tls_sw_context_rx *ctx)tls_strp_anchor_free (strp); strp->anchor = skb; + strp->sk->sk_protocol ==IPPROTO_MPTCP ? +mptcp_read_done (strp->sk, strp->stm.full_len) :tcp_read_done (strp->sk, strp->stm.full_len); strp->copy_mode =1 ;
@@ -383,6 +385,8 @@ static int tls_strp_read_copyin(struct tls_strparser *strp) desc.count =1 ;/* give more than one skb per call */ /* sk should be locked here, so okay to do read_sock */ + strp->sk->sk_protocol ==IPPROTO_MPTCP ? +mptcp_read_sock (strp->sk, &desc, tls_strp_copyin) :tcp_read_sock (strp->sk, &desc, tls_strp_copyin);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; - first =tcp_recv_skb (strp->sk, tp->copied_seq, &offset); -if (WARN_ON_ONCE (!first)) + first = strp->sk->sk_protocol ==IPPROTO_MPTCP ? +mptcp_recv_skb (strp->sk, &offset) : +tcp_recv_skb (strp->sk, tp->copied_seq, &offset); +if (!first)return ;/* 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);if (!strp->copy_mode && force_refresh) { -if (unlikely (tcp_inq (strp->sk) < strp->stm.full_len)) { +if (unlikely ((strp->sk->sk_protocol ==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 *strp) {int sz, inq; - inq =tcp_inq (strp->sk); + inq = strp->sk->sk_protocol ==IPPROTO_MPTCP ? +mptcp_inq_hint (strp->sk) : +tcp_inq (strp->sk);if (inq <1 )return 0 ;
@@ -586,6 +596,8 @@ void tls_strp_msg_done(struct tls_strparser *strp)WARN_ON (!strp->stm.full_len);if (likely (!strp->copy_mode)) + strp->sk->sk_protocol ==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);
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 6/10 mptcp: enable TLS socket options
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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
--- net/mptcp/sockopt.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
net/mptcp/sockopt.c +17 -1
@@ -12,6 +12,7 @@#include <net/protocol.h> #include <net/tcp.h> #include <net/mptcp.h> +#include <net/tls.h> #include "protocol.h" #define MIN_INFO_OPTLEN_SIZE 16
@@ -567,6 +568,7 @@ static bool mptcp_supported_sockopt(int level, int optname)case TCP_FASTOPEN_CONNECT :case TCP_FASTOPEN_KEY :case TCP_FASTOPEN_NO_COOKIE : +case TCP_ULP :return true; }
@@ -576,6 +578,13 @@ static bool mptcp_supported_sockopt(int level, int optname)* TCP_REPAIR_WINDOW are not supported, better avoid this mess */ } +if (level ==SOL_TLS ) { +switch (optname) { +case TLS_TX : +case TLS_RX : +return true; + } + }return false; }
@@ -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 = (void *)msk; +char __user ulp[4 ] ="" ;int ret, val;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 :
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 7/10 selftests: mptcp: connect: enhance TCP ULP testing
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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.
--- .../selftests/net/mptcp/mptcp_connect.c | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.c +21 -11
@@ -33,6 +33,7 @@#include <linux/tcp.h> #include <linux/time_types.h> #include <linux/sockios.h> +#include <linux/mptcp.h> extern int optind;
@@ -272,7 +273,7 @@ static int do_ulp_so(int sock, const char *name) }#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 =8 ;char buf[8 ] ="" ;
@@ -285,11 +286,11 @@ static void sock_test_tcpulp(int sock, int proto, unsigned int line)if (strcmp (buf,"mptcp" ) !=0 )xerror ("unexpected ULP '%s' for proto %d at line %u" , buf, proto, line); ret =do_ulp_so (sock,"tls" ); -if (ret ==0 ) +if (ret != r)X ("setsockopt" ); }else if (proto ==IPPROTO_MPTCP ) { ret =do_ulp_so (sock,"tls" ); -if (ret !=-1 ) +if (ret != r)X ("setsockopt" ); }
@@ -300,7 +301,7 @@ static void sock_test_tcpulp(int sock, int proto, unsigned int line)#undef X } -#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__)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 listenaddr,if (sock <0 )continue ; -SOCK_TEST_TCPULP (sock, cfg_sock_proto); +SOCK_TEST_TCPULP (sock, cfg_sock_proto,-1 );if (-1 ==setsockopt (sock,SOL_SOCKET ,SO_REUSEADDR , &one,sizeof (one)))
@@ -352,7 +353,7 @@ static int sock_listen_mptcp(const char * const listenaddr,return sock; } -SOCK_TEST_TCPULP (sock, cfg_sock_proto); +SOCK_TEST_TCPULP (sock, cfg_sock_proto,-1 );if (listen (sock,20 )) {perror ("listen" );
@@ -360,11 +361,20 @@ static int sock_listen_mptcp(const char * const listenaddr,return -1 ; } -SOCK_TEST_TCPULP (sock, cfg_sock_proto); +SOCK_TEST_TCPULP (sock, cfg_sock_proto,-1 );return sock; } +static int is_mptcp (int fd) +{ +struct mptcp_info info; +socklen_t optlen; + + optlen =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 remoteaddr,continue ; } -SOCK_TEST_TCPULP (sock, proto); +SOCK_TEST_TCPULP (sock, proto,-1 );if (cfg_mark)set_mark (sock, cfg_mark);
@@ -425,7 +435,7 @@ static int sock_connect_mptcp(const char * const remoteaddr,freeaddrinfo (addr);if (sock !=-1 ) -SOCK_TEST_TCPULP (sock, proto); +SOCK_TEST_TCPULP (sock, proto,is_mptcp (sock));return sock; }
@@ -1197,7 +1207,7 @@ int main_loop_s(int listensock)xerror ("can't open %s: %d" , cfg_input, errno); } -SOCK_TEST_TCPULP (remotesock,0 ); +SOCK_TEST_TCPULP (remotesock,0 ,0 );memset (&winfo,0 ,sizeof (winfo)); err =copyfd_io (fd, remotesock,1 , true, &winfo);
@@ -1371,7 +1381,7 @@ int main_loop(void) again:check_getpeername_connect (fd); -SOCK_TEST_TCPULP (fd, cfg_sock_proto); +SOCK_TEST_TCPULP (fd, cfg_sock_proto,-1 );if (cfg_rcvbuf)set_rcvbuf (fd, cfg_rcvbuf);
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 8/10 selftests: mptcp: connect: skip TLS in disconnect tests
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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.
--- tools/testing/selftests/net/mptcp/mptcp_connect.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.c +6 -2
@@ -79,6 +79,7 @@ static char *cfg_input;static int cfg_repeat =1 ;static int cfg_truncate;static int cfg_rcv_trunc; +static int cfg_disconnect =0 ;struct cfg_cmsg_types {unsigned int cmsg_enabled:1 ;
@@ -434,7 +435,7 @@ static int sock_connect_mptcp(const char * const remoteaddr, }freeaddrinfo (addr); -if (sock !=-1 ) +if (sock !=-1 && cfg_disconnect ==0 )SOCK_TEST_TCPULP (sock, proto,is_mptcp (sock));return sock; }
@@ -1381,7 +1382,9 @@ int main_loop(void) again:check_getpeername_connect (fd); -SOCK_TEST_TCPULP (fd, cfg_sock_proto,-1 ); +/* Don't let TLS break disconnect tests */ +if (cfg_disconnect ==0 ) +SOCK_TEST_TCPULP (fd, cfg_sock_proto,-1 );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 =atoi (optarg); + cfg_disconnect =1 ;break ;case 'l' : listen_mode = true;
Signature · 1 line
2.51.0
Geliang Tang
reviewerRe: [RFC mptcp-next 08/10] selftests: mptcp: connect: skip TLS in disconnect tests
Quoted 5 lines · Geliang Tang
From: Geliang Tang <[email protected]>
Modify disconnect test scenarios to bypass TLS socket configuration since TLS setup can interfere with connection teardown validation. Add
cfg_disconnectflag to control this behavior.
tls_disconnect() returning EOPNOTSUPP caused the MPTCP connect's disconnect tests to fail:
static int tls_disconnect(struct sock *sk, int flags)
{
return -EOPNOTSUPP;
}This patch can be dropped now that MPTCP support has been added to tls_disconnect() like this:
static int tls_disconnect(struct sock *sk, int flags)
{
if (sk->sk_protocol == IPPROTO_MPTCP)
return mptcp_disconnect(sk, flags);
return -EOPNOTSUPP;
}Thanks,
-Geliang
Quoted 48 lines
Signed-off-by Geliang Tang <[email protected]>---
tools/testing/selftests/net/mptcp/mptcp_connect.c | 8 ++++++--1 file changed, 6 insertions(+), 2 deletions(-)tools/testing/selftests/net/mptcp/mptcp_connect.c +1
-0@@ -79,6 +79,7 @@ static char *cfg_input; static int cfg_repeat = 1; static int cfg_truncate; static int cfg_rcv_trunc; +static int cfg_disconnect =0 ;
structcfg_cmsg_types{
unsigned int cmsg_enabled:1;tools/testing/selftests/net/mptcp/mptcp_connect.c +0
-0@@ -434,7 +435,7 @@ static int sock_connect_mptcp(const char * const remoteaddr, }
freeaddrinfo(addr);tools/testing/selftests/net/mptcp/mptcp_connect.c +1
-1-if (sock !=-1 ) +if (sock !=-1 && cfg_disconnect ==0 )
SOCK_TEST_TCPULP(sock, proto, is_mptcp(sock)); return sock;
}tools/testing/selftests/net/mptcp/mptcp_connect.c +0
-0@@ -1381,7 +1382,9 @@ int main_loop(void)again:
check_getpeername_connect(fd);tools/testing/selftests/net/mptcp/mptcp_connect.c +3
-1-SOCK_TEST_TCPULP (fd, cfg_sock_proto,-1 ); +/* Don't let TLS break disconnect tests */ +if (cfg_disconnect ==0 ) +SOCK_TEST_TCPULP (fd, cfg_sock_proto,-1 );
if (cfg_rcvbuf)
set_rcvbuf(fd, cfg_rcvbuf);tools/testing/selftests/net/mptcp/mptcp_connect.c +0
-0@@ -1540,6 +1543,7 @@ static void parse_opts(int argc, char **argv) break;case 'I':
cfg_repeat= atoi(optarg);tools/testing/selftests/net/mptcp/mptcp_connect.c +1
-0+ cfg_disconnect =1 ;break;
case 'l':
listen_mode= true;
Geliang Tang
reviewerRFC 9/10 selftests: mptcp: connect: fix uninitialized variable warning
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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_connectmptcp_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;
| ^~~~
--- tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.c +2 -2
@@ -1365,7 +1365,7 @@ void xdisconnect(int fd)int main_loop (void ) {int fd =0 , ret, fd_in =0 ; -struct addrinfo *peer; +struct addrinfo *peer =NULL ;struct wstate winfo;if (cfg_input && cfg_sockopt_types.mptfo) {
@@ -1405,7 +1405,7 @@ int main_loop(void)if (cfg_truncate >0 ) {shutdown (fd,SHUT_WR ); - }else if (--cfg_repeat >0 ) { + }else if (--cfg_repeat >0 && peer) {xdisconnect (fd);/* the socket could be unblocking at this point, we need the
Signature · 1 line
2.51.0
Geliang Tang
reviewerRFC 10/10 selftests: mptcp: sockopt: add MPTCP TLS test cases
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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
--- 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(-)
tools/testing/selftests/net/mptcp/mptcp_sockopt.c +4 -1
@@ -623,6 +623,9 @@ static void do_getsockopt_mptcp_full_info(struct so_state *s, int fd)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);do_getsockopt_tcp_info (s, fd, r, w);
@@ -730,7 +733,7 @@ static void process_one_client(int fd, int pipefd)/* wait for hangup */ ret3 =read (fd, buf,1 ); -if (ret3 !=0 ) +if (!tls && ret3 !=0 )xerror ("expected EOF, got %lu" , ret3);do_getsockopts (&s, fd, ret, ret2);
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +12 -0
@@ -382,6 +382,18 @@ do_tls_tests() fi do_tls_test -6 -c -t tcp -r tcp lret=$? + if [ $lret -ne 0 ] ; then + return $lret + fi + + # MPTCP KTLS + do_tls_test -c + lret=$? + if [ $lret -ne 0 ] ; then + return $lret + fi + do_tls_test -6 -c + lret=$? return $lret }
Signature · 1 line
2.51.0
Hi Geliang,
Thank you for your modifications, that's great!
But sadly, our CI spotted some issues with it when trying to build it.
You can find more details there:
https://github.com/multipath-tcp/mptcp_net-next/actions/runs/19453856367
Status: failure
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/b37b703d4e0a
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1024635
Feel free to reply to this email if you cannot access logs, if you need some support to fix the error, if this doesn't seem to be caused by your modifications or if the error is a false positive one.
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal (except selftest_mptcp_join): Unstable: 1 failed test(s): packetdrill_dss 🔴
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Unstable: 1 failed test(s): packetdrill_dss 🔴
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/19453856409
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/b37b703d4e0a
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1024635
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)