mptcp: New features and cleanup
Subsystems (4)
cover mptcp: New features and cleanup
These patches have been tested in the MPTCP tree for a longer than usual time (thanks to holiday schedules), and are ready for the net-next branch. Changes include feature updates, small fixes, refactoring, and some selftest changes.
Patch 1 fixes an OUTQ ioctl issue with TCP fallback sockets.
Patches 2, 3, and 6 add support of the MPTCP fastclose option (quick shutdown of the full MPTCP connection, similar to TCP RST in regular TCP), and a related self test.
Patch 4 cleans up some accept and poll code that is no longer needed after the fastclose changes.
Patch 5 add userspace disconnect using AF_UNSPEC, which is used when testing fastclose and makes the MPTCP socket's handling of AF_UNSPEC in connect() more TCP-like.
Patches 7-11 refactor subflow creation to make better use of multiple local endpoints and to better handle individual connection failures when creating multiple subflows. Includes self test updates.
Patch 12 cleans up the way subflows are added to the MPTCP connection list, eliminating the need for calls throughout the MPTCP code that had to check the intermediate "join list" for entries to shift over to the main "connection list".
Patch 13 refactors the MPTCP release_cb flags to use separate storage for values only accessed with the socket lock held (no atomic ops needed), and for values that need atomic operations.
Paolo Abeni (13):
mptcp: keep snd_una updated for fallback socket
mptcp: implement fastclose xmit path
mptcp: full disconnect implementation
mptcp: cleanup accept and poll
mptcp: implement support for user-space disconnect
selftests: mptcp: add disconnect tests
mptcp: fix per socket endpoint accounting
mptcp: clean-up MPJ option writing
mptcp: keep track of local endpoint still available for each msk
mptcp: do not block subflows creation on errors
selftests: mptcp: add tests for subflow creation failure
mptcp: cleanup MPJ subflow list handling
mptcp: avoid atomic bit manipulation when possible
net/mptcp/options.c | 101 ++++-- net/mptcp/pm.c | 34 +- net/mptcp/pm_netlink.c | 197 ++++++----- net/mptcp/protocol.c | 307 ++++++++++-------- net/mptcp/protocol.h | 63 ++-- net/mptcp/sockopt.c | 24 +- net/mptcp/subflow.c | 10 +- net/mptcp/token.c | 1 + tools/testing/selftests/net/mptcp/config | 1 + .../selftests/net/mptcp/mptcp_connect.c | 148 +++++++-- .../selftests/net/mptcp/mptcp_connect.sh | 39 ++- .../testing/selftests/net/mptcp/mptcp_join.sh | 83 ++++- 12 files changed, 683 insertions(+), 325 deletions(-)
base-commit: 710ad98c363a66a0cd8526465426c5c5f8377ee0
Signature · 1 line
2.34.1
PATCH 1/13 mptcp: keep snd_una updated for fallback socket
From: Paolo Abeni <[email protected]>
After shutdown, for fallback MPTCP sockets, we always have
write_seq == snd_una+1
The above will foul OUTQ ioctl(). Keep snd_una in sync with write_seq even after shutdown.
--- net/mptcp/protocol.c | 1 + 1 file changed, 1 insertion(+)
net/mptcp/protocol.c +1 -0
@@ -2666,6 +2666,7 @@ static void __mptcp_check_send_data_fin(struct sock *sk)* state now */ if (__mptcp_check_fallback (msk)) { +WRITE_ONCE (msk->snd_una, msk->write_seq);if ((1 << sk->sk_state) & (TCPF_CLOSING |TCPF_LAST_ACK )) {inet_sk_state_store (sk,TCP_CLOSE );mptcp_close_wake_up (sk);
Signature · 1 line
2.34.1
PATCH 2/13 mptcp: implement fastclose xmit path
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Allow the MPTCP xmit path to add MP_FASTCLOSE suboption on RST egress packets.
Additionally reorder related options writing to reduce the number of conditionals required in the fast path.
--- net/mptcp/options.c | 57 ++++++++++++++++++++++++++++++++++---------- net/mptcp/protocol.h | 1 + 2 files changed, 46 insertions(+), 12 deletions(-)
net/mptcp/options.c +45 -12
@@ -768,6 +768,28 @@ static noinline bool mptcp_established_options_rst(struct sock *sk, struct sk_bureturn true; } +static bool mptcp_established_options_fastclose (struct sock *sk, +unsigned int *size, +unsigned int remaining, +struct mptcp_out_options *opts) +{ +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (sk); +struct mptcp_sock *msk =mptcp_sk (subflow->conn); + +if (likely (!subflow->send_fastclose)) +return false; + +if (remaining <TCPOLEN_MPTCP_FASTCLOSE ) +return false; + + *size =TCPOLEN_MPTCP_FASTCLOSE ; + opts->suboptions |=OPTION_MPTCP_FASTCLOSE ; + opts->rcvr_key = msk->remote_key; + +pr_debug ("FASTCLOSE key=%llu" , opts->rcvr_key); +return true; +} + static bool mptcp_established_options_mp_fail(struct sock *sk, unsigned int *size, unsigned int remaining,
@@ -806,10 +828,12 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,return false;if (unlikely (skb &&TCP_SKB_CB (skb)->tcp_flags &TCPHDR_RST )) { -if (mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { +if (mptcp_established_options_fastclose (sk, &opt_size, remaining, opts) || +mptcp_established_options_mp_fail (sk, &opt_size, remaining, opts)) { *size += opt_size; remaining -= opt_size; } +/* MP_RST can be used with MP_FASTCLOSE and MP_FAIL if there is room */ if (mptcp_established_options_rst (sk, skb, &opt_size, remaining, opts)) { *size += opt_size; remaining -= opt_size;
@@ -1251,17 +1275,8 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, ptr +=2 ; } -/* RST is mutually exclusive with everything else */ -if (unlikely (OPTION_MPTCP_RST & opts->suboptions)) { - *ptr++ =mptcp_option (MPTCPOPT_RST , -TCPOLEN_MPTCP_RST , - opts->reset_transient, - opts->reset_reason); -return ; - } - -/* DSS, MPC, MPJ and ADD_ADDR are mutually exclusive, see -* mptcp_established_options*() +/* DSS, MPC, MPJ, ADD_ADDR, FASTCLOSE and RST are mutually exclusive, +* see mptcp_established_options*() */ if (likely (OPTION_MPTCP_DSS & opts->suboptions)) {struct mptcp_ext *mpext = &opts->ext_copy;
@@ -1447,6 +1462,24 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, ptr +=1 ; } } + }else if (unlikely (OPTION_MPTCP_FASTCLOSE & opts->suboptions)) { +/* FASTCLOSE is mutually exclusive with others except RST */ + *ptr++ =mptcp_option (MPTCPOPT_MP_FASTCLOSE , +TCPOLEN_MPTCP_FASTCLOSE , +0 ,0 ); +put_unaligned_be64 (opts->rcvr_key, ptr); + ptr +=2 ; + +if (OPTION_MPTCP_RST & opts->suboptions) + goto mp_rst; +return ; + }else if (unlikely (OPTION_MPTCP_RST & opts->suboptions)) { +mp_rst: + *ptr++ =mptcp_option (MPTCPOPT_RST , +TCPOLEN_MPTCP_RST , + opts->reset_transient, + opts->reset_reason); +return ; }if (OPTION_MPTCP_PRIO & opts->suboptions) {
net/mptcp/protocol.h +1 -0
@@ -423,6 +423,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + send_fastclose : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1, /* ctx can be free at ulp release time */
Signature · 1 line
2.34.1
PATCH 3/13 mptcp: full disconnect implementation
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
The current mptcp_disconnect() implementation lacks several steps, we additionally need to reset the msk socket state and flush the subflow list.
Factor out the needed helper to avoid code duplication.
Additionally ensure that the initial subflow is disposed only after mptcp_close(), just reset it at disconnect time.
--- net/mptcp/pm.c | 10 +++-- net/mptcp/protocol.c | 101 ++++++++++++++++++++++++++++++++----------- net/mptcp/protocol.h | 14 ++++++ net/mptcp/token.c | 1 + 4 files changed, 98 insertions(+), 28 deletions(-)
net/mptcp/pm.c +7 -3
@@ -356,7 +356,7 @@ void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) } } -void mptcp_pm_data_init (struct mptcp_sock *msk) +void mptcp_pm_data_reset (struct mptcp_sock *msk) { msk->pm.add_addr_signaled =0 ; msk->pm.add_addr_accepted =0 ;
@@ -371,10 +371,14 @@ void mptcp_pm_data_init(struct mptcp_sock *msk)WRITE_ONCE (msk->pm.remote_deny_join_id0, false); msk->pm.status =0 ; +mptcp_pm_nl_data_init (msk); +} + +void mptcp_pm_data_init (struct mptcp_sock *msk) +{spin_lock_init (&msk->pm.lock);INIT_LIST_HEAD (&msk->pm.anno_list); - -mptcp_pm_nl_data_init (msk); +mptcp_pm_data_reset (msk); }void __init mptcp_pm_init (void )
net/mptcp/protocol.c +76 -25
199 lines not on this page · raw message
net/mptcp/protocol.h +14 -0
@@ -395,6 +395,9 @@ DECLARE_PER_CPU(struct mptcp_delegated_action, mptcp_delegated_actions);/* MPTCP subflow context */ struct mptcp_subflow_context {struct list_head node;/* conn_list of subflows */ + +char reset_start[0 ]; +unsigned long avg_pacing_rate;/* protected by msk socket lock */ u64 local_key;u64 remote_key;
@@ -442,6 +445,9 @@ struct mptcp_subflow_context {u8 stale_count;long delegated_status; + +char reset_end[0 ]; +struct list_head delegated_node;/* link into delegated_action, protected by local BH */ u32 setsockopt_seq;
@@ -473,6 +479,13 @@ mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow)return subflow->tcp_sock; } +static inline void +mptcp_subflow_ctx_reset (struct mptcp_subflow_context *subflow) +{ +memset (subflow->reset_start,0 , subflow->reset_end - subflow->reset_start); + subflow->request_mptcp =1 ; +} +static inline u64 mptcp_subflow_get_map_offset (const struct mptcp_subflow_context *subflow) {
@@ -713,6 +726,7 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hmac);void __init mptcp_pm_init (void );void mptcp_pm_data_init (struct mptcp_sock *msk); +void mptcp_pm_data_reset (struct mptcp_sock *msk);void mptcp_pm_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk);void mptcp_pm_nl_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk);void mptcp_pm_new_connection (struct mptcp_sock *msk,const struct sock *ssk,int server_side);
net/mptcp/token.c +1 -0
@@ -384,6 +384,7 @@ void mptcp_token_destroy(struct mptcp_sock *msk) bucket->chain_len--; }spin_unlock_bh (&bucket->lock); +WRITE_ONCE (msk->token,0 ); }void __init mptcp_token_init (void )
Signature · 1 line
2.34.1
PATCH 4/13 mptcp: cleanup accept and poll
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
After the previous patch, msk->subflow will never be deleted during the whole msk lifetime. We don't need anymore to acquire references to it in mptcp_stream_accept() and we can use the listener subflow accept queue to simplify mptcp_poll() for listener socket.
Overall this removes a lock pair and 4 more atomic operations per accept().
--- net/mptcp/protocol.c | 25 +++++++------------------ net/mptcp/protocol.h | 1 - net/mptcp/subflow.c | 1 - 3 files changed, 7 insertions(+), 20 deletions(-)
net/mptcp/protocol.c +7 -18
@@ -3493,17 +3493,9 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,pr_debug ("msk=%p" , msk); -lock_sock (sock->sk); -if (sock->sk->sk_state !=TCP_LISTEN ) - goto unlock_fail; - ssock =__mptcp_nmpc_socket (msk);if (!ssock) - goto unlock_fail; - -clear_bit (MPTCP_DATA_READY , &msk->flags); -sock_hold (ssock->sk); -release_sock (sock->sk); +return -EINVAL ; err = ssock->ops->accept (sock, newsock, flags, kern);if (err ==0 && !mptcp_is_tcpsk (newsock->sk)) {
@@ -3543,14 +3535,7 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,release_sock (newsk); } -if (inet_csk_listen_poll (ssock->sk)) -set_bit (MPTCP_DATA_READY , &msk->flags); -sock_put (ssock->sk);return err; - -unlock_fail: -release_sock (sock->sk); -return -EINVAL ; }static __poll_t mptcp_check_readable (struct mptcp_sock *msk)
@@ -3596,8 +3581,12 @@ static __poll_t mptcp_poll(struct file *file, struct socket *sock, state =inet_sk_state_load (sk);pr_debug ("msk=%p state=%d flags=%lx" , msk, state, msk->flags); -if (state ==TCP_LISTEN ) -return test_bit (MPTCP_DATA_READY , &msk->flags) ?EPOLLIN |EPOLLRDNORM :0 ; +if (state ==TCP_LISTEN ) { +if (WARN_ON_ONCE (!msk->subflow || !msk->subflow->sk)) +return 0 ; + +return inet_csk_listen_poll (msk->subflow->sk); + }if (state !=TCP_SYN_SENT && state !=TCP_SYN_RECV ) { mask |=mptcp_check_readable (msk);
net/mptcp/protocol.h +0 -1
@@ -111,7 +111,6 @@#define MPTCP_RST_TRANSIENT BIT(0)/* MPTCP socket flags */ -#define MPTCP_DATA_READY 0#define MPTCP_NOSPACE 1#define MPTCP_WORK_RTX 2#define MPTCP_WORK_EOF 3
net/mptcp/subflow.c +0 -1
@@ -1293,7 +1293,6 @@ static void subflow_data_ready(struct sock *sk)if (reqsk_queue_empty (&inet_csk (sk)->icsk_accept_queue))return ; -set_bit (MPTCP_DATA_READY , &msk->flags); parent->sk_data_ready (parent);return ; }
Signature · 1 line
2.34.1
PATCH 5/13 mptcp: implement support for user-space disconnect
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Handle explicitly AF_UNSPEC in mptcp_stream_connnect() to allow user-space to disconnect established MPTCP connections
--- net/mptcp/protocol.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
net/mptcp/protocol.c +13 -4
@@ -3404,9 +3404,20 @@ static int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr,struct mptcp_sock *msk =mptcp_sk (sock->sk);struct mptcp_subflow_context *subflow;struct socket *ssock; -int err; +int err = -EINVAL ;lock_sock (sock->sk); +if (uaddr) { +if (addr_len <sizeof (uaddr->sa_family)) + goto unlock; + +if (uaddr->sa_family ==AF_UNSPEC ) { + err =mptcp_disconnect (sock->sk, flags); + sock->state = err ?SS_DISCONNECTING :SS_UNCONNECTED ; + goto unlock; + } + } +if (sock->state !=SS_UNCONNECTED && msk->subflow) {/* pending connection or invalid state, let existing subflow * cope with that
@@ -3416,10 +3427,8 @@ static int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr, } ssock =__mptcp_nmpc_socket (msk); -if (!ssock) { - err = -EINVAL ; +if (!ssock) goto unlock; - }mptcp_token_destroy (msk);inet_sk_state_store (sock->sk,TCP_SYN_SENT );
Signature · 1 line
2.34.1
PATCH 6/13 selftests: mptcp: add disconnect tests
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Performs several disconnect/reconnect on the same socket, ensuring the overall transfer is succesful.
The new test leverages ioctl(SIOCOUTQ) to ensure all the pending data is acked before disconnecting.
Additionally order alphabetically the test program arguments list for better maintainability.
--- .../selftests/net/mptcp/mptcp_connect.c | 148 +++++++++++++++--- .../selftests/net/mptcp/mptcp_connect.sh | 39 ++++- 2 files changed, 160 insertions(+), 27 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.c +123 -25
@@ -16,6 +16,7 @@#include <unistd.h> #include <time.h> +#include <sys/ioctl.h> #include <sys/poll.h> #include <sys/sendfile.h> #include <sys/stat.h>
@@ -28,6 +29,7 @@#include <linux/tcp.h> #include <linux/time_types.h> +#include <linux/sockios.h> extern int optind;
@@ -68,6 +70,8 @@ static unsigned int cfg_time;static unsigned int cfg_do_w;static int cfg_wait;static uint32_t cfg_mark; +static char *cfg_input; +static int cfg_repeat =1 ;struct cfg_cmsg_types {unsigned int cmsg_enabled:1 ;
@@ -91,22 +95,31 @@ static struct cfg_sockopt_types cfg_sockopt_types;static void die_usage (void ) { -fprintf (stderr,"Usage: mptcp_connect [-6] [-u] [-s MPTCP|TCP] [-p port] [-m mode]" -"[-l] [-w sec] [-t num] [-T num] connect_address\n" ); +fprintf (stderr,"Usage: mptcp_connect [-6] [-c cmsg] [-i file] [-I num] [-j] [-l] " +"[-m mode] [-M mark] [-o option] [-p port] [-P mode] [-j] [-l] [-r num] " +"[-s MPTCP|TCP] [-S num] [-r num] [-t num] [-T num] [-u] [-w sec] connect_address\n" );fprintf (stderr,"\t-6 use ipv6\n" ); -fprintf (stderr,"\t-t num -- set poll timeout to num\n" ); -fprintf (stderr,"\t-T num -- set expected runtime to num ms\n" ); -fprintf (stderr,"\t-S num -- set SO_SNDBUF to num\n" ); -fprintf (stderr,"\t-R num -- set SO_RCVBUF to num\n" ); -fprintf (stderr,"\t-p num -- use port num\n" ); -fprintf (stderr,"\t-s [MPTCP|TCP] -- use mptcp(default) or tcp sockets\n" ); +fprintf (stderr,"\t-c cmsg -- test cmsg type <cmsg>\n" ); +fprintf (stderr,"\t-i file -- read the data to send from the given file instead of stdin" ); +fprintf (stderr,"\t-I num -- repeat the transfer 'num' times. In listen mode accepts num " +"incoming connections, in client mode, disconnect and reconnect to the server\n" ); +fprintf (stderr,"\t-j -- add additional sleep at connection start and tear down " +"-- for MPJ tests\n" ); +fprintf (stderr,"\t-l -- listens mode, accepts incoming connection\n" );fprintf (stderr,"\t-m [poll|mmap|sendfile] -- use poll(default)/mmap+write/sendfile\n" );fprintf (stderr,"\t-M mark -- set socket packet mark\n" ); -fprintf (stderr,"\t-w num -- wait num sec before closing the socket\n" ); -fprintf (stderr,"\t-c cmsg -- test cmsg type <cmsg>\n" );fprintf (stderr,"\t-o option -- test sockopt <option>\n" ); +fprintf (stderr,"\t-p num -- use port num\n" );fprintf (stderr,"\t-P [saveWithPeek|saveAfterPeek] -- save data with/after MSG_PEEK form tcp socket\n" ); +fprintf (stderr,"\t-t num -- set poll timeout to num\n" ); +fprintf (stderr,"\t-T num -- set expected runtime to num ms\n" ); +fprintf (stderr,"\t-r num -- enable slow mode, limiting each write to num bytes " +"-- for remove addr tests\n" ); +fprintf (stderr,"\t-R num -- set SO_RCVBUF to num\n" ); +fprintf (stderr,"\t-s [MPTCP|TCP] -- use mptcp(default) or tcp sockets\n" ); +fprintf (stderr,"\t-S num -- set SO_SNDBUF to num\n" ); +fprintf (stderr,"\t-w num -- wait num sec before closing the socket\n" );exit (1 ); }
@@ -310,7 +323,8 @@ static int sock_listen_mptcp(const char * const listenaddr, }static int sock_connect_mptcp (const char *const remoteaddr, -const char *const port,int proto) +const char *const port,int proto, +struct addrinfo **peer) {struct addrinfo hints = { .ai_protocol =IPPROTO_TCP ,
@@ -334,8 +348,10 @@ static int sock_connect_mptcp(const char * const remoteaddr,if (cfg_mark)set_mark (sock, cfg_mark); -if (connect (sock, a->ai_addr, a->ai_addrlen) ==0 ) +if (connect (sock, a->ai_addr, a->ai_addrlen) ==0 ) { + *peer = a;break ;/* success */ + }perror ("connect()" );close (sock);
@@ -524,14 +540,17 @@ static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)return ret; } -static void set_nonblock (int fd) +static void set_nonblock (int fd,bool nonblock) {int flags =fcntl (fd,F_GETFL );if (flags ==-1 )return ; -fcntl (fd,F_SETFL , flags |O_NONBLOCK ); +if (nonblock) +fcntl (fd,F_SETFL , flags |O_NONBLOCK ); +else +fcntl (fd,F_SETFL , flags & ~O_NONBLOCK ); }static int copyfd_io_poll (int infd,int peerfd,int outfd,bool *in_closed_after_out)
@@ -543,7 +562,7 @@ static int copyfd_io_poll(int infd, int peerfd, int outfd, bool *in_closed_afterunsigned int woff =0 , wlen =0 ;char wbuf[8192 ]; -set_nonblock (peerfd); +set_nonblock (peerfd, true);for (;;) {char rbuf[8192 ];
@@ -638,7 +657,6 @@ static int copyfd_io_poll(int infd, int peerfd, int outfd, bool *in_closed_afterif (cfg_remove)usleep (cfg_wait); -close (peerfd);return 0 ; }
@@ -780,7 +798,7 @@ static int copyfd_io_sendfile(int infd, int peerfd, int outfd,return err; } -static int copyfd_io (int infd,int peerfd,int outfd) +static int copyfd_io (int infd,int peerfd,int outfd,bool close_peerfd) {bool in_closed_after_out = false;struct timespec start, end;
@@ -819,6 +837,9 @@ static int copyfd_io(int infd, int peerfd, int outfd)if (ret)return ret; +if (close_peerfd) +close (peerfd); +if (cfg_time) {unsigned int delta_ms;
@@ -930,7 +951,7 @@ static void maybe_close(int fd) {unsigned int r =rand (); -if (!(cfg_join || cfg_remove) && (r &1 )) +if (!(cfg_join || cfg_remove || cfg_repeat >1 ) && (r &1 ))close (fd); }
@@ -940,7 +961,9 @@ int main_loop_s(int listensock)struct pollfd polls;socklen_t salen;int remotesock; +int fd =0 ; +again: polls.fd = listensock; polls.events =POLLIN ;
@@ -961,14 +984,27 @@ int main_loop_s(int listensock)check_sockaddr (pf, &ss, salen);check_getpeername (remotesock, &ss, salen); +if (cfg_input) { + fd =open (cfg_input,O_RDONLY ); +if (fd <0 ) +xerror ("can't open %s: %d" , cfg_input, errno); + } +SOCK_TEST_TCPULP (remotesock,0 ); -return copyfd_io (0 , remotesock,1 ); +copyfd_io (fd, remotesock,1 , true); + }else { +perror ("accept" ); +return 1 ; } -perror ("accept" ); +if (--cfg_repeat >0 ) { +if (cfg_input) +close (fd); + goto again; + } -return 1 ; +return 0 ; }static void init_rng (void )
@@ -1057,15 +1093,47 @@ static void parse_setsock_options(const char *name)exit (1 ); } +void xdisconnect (int fd,int addrlen) +{ +struct sockaddr_storage empty; +int msec_sleep =10 ; +int queued =1 ; +int i; + +shutdown (fd,SHUT_WR ); + +/* while until the pending data is completely flushed, the later +* disconnect will bypass/ignore/drop any pending data. +*/ +for (i =0 ; ; i += msec_sleep) { +if (ioctl (fd,SIOCOUTQ , &queued) <0 ) +xerror ("can't query out socket queue: %d" , errno); + +if (!queued) +break ; + +if (i > poll_timeout) +xerror ("timeout while waiting for spool to complete" ); +usleep (msec_sleep *1000 ); + } + +memset (&empty,0 ,sizeof (empty)); + empty.ss_family =AF_UNSPEC ; +if (connect (fd, (struct sockaddr *)&empty, addrlen) <0 ) +xerror ("can't disconnect: %d" , errno); +} +int main_loop (void ) { -int fd; +int fd, ret, fd_in =0 ; +struct addrinfo *peer;/* listener is ready. */ - fd =sock_connect_mptcp (cfg_host, cfg_port, cfg_sock_proto); + fd =sock_connect_mptcp (cfg_host, cfg_port, cfg_sock_proto, &peer);if (fd <0 )return 2 ; +again:check_getpeername_connect (fd);SOCK_TEST_TCPULP (fd, cfg_sock_proto);
@@ -1077,7 +1145,31 @@ int main_loop(void)if (cfg_cmsg_types.cmsg_enabled)apply_cmsg_types (fd, &cfg_cmsg_types); -return copyfd_io (0 , fd,1 ); +if (cfg_input) { + fd_in =open (cfg_input,O_RDONLY ); +if (fd <0 ) +xerror ("can't open %s:%d" , cfg_input, errno); + } + +/* close the client socket open only if we are not going to reconnect */ + ret =copyfd_io (fd_in, fd,1 , cfg_repeat ==1 ); +if (ret) +return ret; + +if (--cfg_repeat >0 ) { +xdisconnect (fd, peer->ai_addrlen); + +/* the socket could be unblocking at this point, we need the +* connect to be blocking +*/ +set_nonblock (fd, false); +if (connect (fd, peer->ai_addr, peer->ai_addrlen)) +xerror ("can't reconnect: %d" , errno); +if (cfg_input) +close (fd_in); + goto again; + } +return 0 ; }int parse_proto (const char *proto)
@@ -1162,7 +1254,7 @@ static void parse_opts(int argc, char **argv) {int c; -while ((c =getopt (argc, argv,"6jr:lp:s:ht:T:m:S:R:w:M:P:c:o:" )) !=-1 ) { +while ((c =getopt (argc, argv,"6c:hi:I:jlm:M:o:p:P:r:R:s:S:t:T:w:" )) !=-1 ) {switch (c) {case 'j' : cfg_join = true;
@@ -1176,6 +1268,12 @@ static void parse_opts(int argc, char **argv)if (cfg_do_w <=0 ) cfg_do_w =50 ;break ; +case 'i' : + cfg_input = optarg; +break ; +case 'I' : + cfg_repeat =atoi (optarg); +break ;case 'l' : listen_mode = true;break ;
tools/testing/selftests/net/mptcp/mptcp_connect.sh +37 -2
@@ -7,6 +7,7 @@ optstring="S:R:d:e:l:r:h4cm:f:tC" ret=0 sin="" sout="" +cin_disconnect="" cin="" cout="" ksft_skip=4
@@ -24,6 +25,7 @@ options_log=true do_tcp=0 checksum=false filesize=0 +connect_per_transfer=1 if [ $tc_loss -eq 100 ];then tc_loss=1%
@@ -127,6 +129,7 @@ TEST_COUNT=0 cleanup() { + rm -f "$cin_disconnect" "$cout_disconnect" rm -f "$cin" "$cout" rm -f "$sin" "$sout" rm -f "$capout"
@@ -149,6 +152,8 @@ sout=$(mktemp) cin=$(mktemp) cout=$(mktemp) capout=$(mktemp) +cin_disconnect="$cin".disconnect +cout_disconnect="$cout".disconnect trap cleanup EXIT for i in "$ns1" "$ns2" "$ns3" "$ns4";do
@@ -500,8 +505,8 @@ do_transfer() cookies=${cookies##*=} if [ ${cl_proto} = "MPTCP" ] && [ ${srv_proto} = "MPTCP" ]; then - expect_synrx=$((stat_synrx_last_l+1)) - expect_ackrx=$((stat_ackrx_last_l+1)) + expect_synrx=$((stat_synrx_last_l+$connect_per_transfer)) + expect_ackrx=$((stat_ackrx_last_l+$connect_per_transfer)) fi if [ ${stat_synrx_now_l} -lt ${expect_synrx} ]; then
@@ -738,6 +743,33 @@ run_tests_peekmode() run_tests_lo "$ns1" "$ns1" dead:beef:1::1 1 "-P ${peekmode}" } +run_tests_disconnect() +{ + local peekmode="$1" + local old_cin=$cin + local old_sin=$sin + + cat $cin $cin $cin > "$cin".disconnect + + # force do_transfer to cope with the multiple tranmissions + sin="$cin.disconnect" + sin_disconnect=$old_sin + cin="$cin.disconnect" + cin_disconnect="$old_cin" + connect_per_transfer=3 + + echo "INFO: disconnect" + run_tests_lo "$ns1" "$ns1" 10.0.1.1 1 "-I 3 -i $old_cin" + run_tests_lo "$ns1" "$ns1" dead:beef:1::1 1 "-I 3 -i $old_cin" + + # restore previous status + cout=$old_cout + cout_disconnect="$cout".disconnect + cin=$old_cin + cin_disconnect="$cin".disconnect + connect_per_transfer=1 +} + display_time() { time_end=$(date +%s)
@@ -853,6 +885,9 @@ stop_if_error "Tests with peek mode have failed" # connect to ns4 ip address, ns2 should intercept/proxy run_test_transparent 10.0.3.1 "tproxy ipv4" run_test_transparent dead:beef:3::1 "tproxy ipv6" +stop_if_error "Tests with tproxy have failed" + +run_tests_disconnect display_time exit $ret
Signature · 1 line
2.34.1
PATCH 7/13 mptcp: fix per socket endpoint accounting
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Since full-mesh endpoint support, the reception of a single ADD_ADDR option can cause multiple subflows creation. When such option is accepted we increment 'add_addr_accepted' by one. When we received a paired RM_ADDR option, we deleted all the relevant subflows, decrementing 'add_addr_accepted' by one for each of them.
We have a similar issue for 'local_addr_used'
Fix them moving the pm endpoint accounting outside the subflow traversal.
--- net/mptcp/pm_netlink.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
net/mptcp/pm_netlink.c +12 -6
@@ -711,6 +711,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,return ;for (i =0 ; i < rm_list->nr; i++) { +bool removed = false; +list_for_each_entry_safe (subflow, tmp, &msk->conn_list, node) {struct sock *ssk =mptcp_subflow_tcp_sock (subflow);int how =RCV_SHUTDOWN |SEND_SHUTDOWN ;
@@ -730,15 +732,19 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,mptcp_close_ssk (sk, ssk, subflow);spin_lock_bh (&msk->pm.lock); -if (rm_type ==MPTCP_MIB_RMADDR ) { - msk->pm.add_addr_accepted--; -WRITE_ONCE (msk->pm.accept_addr, true); - }else if (rm_type ==MPTCP_MIB_RMSUBFLOW ) { - msk->pm.local_addr_used--; - } + removed = true; msk->pm.subflows--;__MPTCP_INC_STATS (sock_net (sk), rm_type); } +if (!removed) +continue ; + +if (rm_type ==MPTCP_MIB_RMADDR ) { + msk->pm.add_addr_accepted--; +WRITE_ONCE (msk->pm.accept_addr, true); + }else if (rm_type ==MPTCP_MIB_RMSUBFLOW ) { + msk->pm.local_addr_used--; + } } }
Signature · 1 line
2.34.1
PATCH 8/13 mptcp: clean-up MPJ option writing
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Check for all MPJ variant at once, this reduces the number of conditionals traversed on average and will simplify the next patch.
No functional change intended.
--- net/mptcp/options.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-)
net/mptcp/options.c +23 -21
@@ -1385,27 +1385,29 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp,/* MPC is additionally mutually exclusive with MP_PRIO */ goto mp_capable_done; - }else if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { - *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , -TCPOLEN_MPTCP_MPJ_SYN , - opts->backup, opts->join_id); -put_unaligned_be32 (opts->token, ptr); - ptr +=1 ; -put_unaligned_be32 (opts->nonce, ptr); - ptr +=1 ; - }else if (OPTION_MPTCP_MPJ_SYNACK & opts->suboptions) { - *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , -TCPOLEN_MPTCP_MPJ_SYNACK , - opts->backup, opts->join_id); -put_unaligned_be64 (opts->thmac, ptr); - ptr +=2 ; -put_unaligned_be32 (opts->nonce, ptr); - ptr +=1 ; - }else if (OPTION_MPTCP_MPJ_ACK & opts->suboptions) { - *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , -TCPOLEN_MPTCP_MPJ_ACK ,0 ,0 ); -memcpy (ptr, opts->hmac,MPTCPOPT_HMAC_LEN ); - ptr +=5 ; + }else if (OPTIONS_MPTCP_MPJ & opts->suboptions) { +if (OPTION_MPTCP_MPJ_SYN & opts->suboptions) { + *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , +TCPOLEN_MPTCP_MPJ_SYN , + opts->backup, opts->join_id); +put_unaligned_be32 (opts->token, ptr); + ptr +=1 ; +put_unaligned_be32 (opts->nonce, ptr); + ptr +=1 ; + }else if (OPTION_MPTCP_MPJ_SYNACK & opts->suboptions) { + *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , +TCPOLEN_MPTCP_MPJ_SYNACK , + opts->backup, opts->join_id); +put_unaligned_be64 (opts->thmac, ptr); + ptr +=2 ; +put_unaligned_be32 (opts->nonce, ptr); + ptr +=1 ; + }else { + *ptr++ =mptcp_option (MPTCPOPT_MP_JOIN , +TCPOLEN_MPTCP_MPJ_ACK ,0 ,0 ); +memcpy (ptr, opts->hmac,MPTCPOPT_HMAC_LEN ); + ptr +=5 ; + } }else if (OPTION_MPTCP_ADD_ADDR & opts->suboptions) {u8 len =TCPOLEN_MPTCP_ADD_ADDR_BASE ;u8 echo =MPTCP_ADDR_ECHO ;
Signature · 1 line
2.34.1
PATCH 9/13 mptcp: keep track of local endpoint still available for each msk
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Include into the path manager status a bitmap tracking the list of local endpoints still available - not yet used - for the relevant mptcp socket.
Keep such map updated at endpoint creation/deletion time, so that we can easily skip already used endpoint at local address selection time.
The endpoint used by the initial subflow is lazyly accounted at subflow creation time: the usage bitmap is be up2date before endpoint selection and we avoid such unneeded task in some relevant scenarios - e.g. busy servers accepting incoming subflows but not creating any additional ones nor annuncing additional addresses.
Overall this allows for fair local endpoints usage in case of subflow failure.
As a side effect, this patch also enforces that each endpoint is used at most once for each mptcp connection.
--- net/mptcp/pm.c | 1 + net/mptcp/pm_netlink.c | 125 +++++++++++------- net/mptcp/protocol.c | 3 +- net/mptcp/protocol.h | 12 +- .../testing/selftests/net/mptcp/mptcp_join.sh | 5 +- 5 files changed, 91 insertions(+), 55 deletions(-)
net/mptcp/pm.c +1 -0
@@ -370,6 +370,7 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk)WRITE_ONCE (msk->pm.accept_subflow, false);WRITE_ONCE (msk->pm.remote_deny_join_id0, false); msk->pm.status =0 ; +bitmap_fill (msk->pm.id_avail_bitmap,MPTCP_PM_MAX_ADDR_ID +1 );mptcp_pm_nl_data_init (msk); }
net/mptcp/pm_netlink.c +74 -51
258 lines not on this page · raw message
net/mptcp/protocol.c +1 -2
@@ -2488,8 +2488,7 @@ static void mptcp_worker(struct work_struct *work)mptcp_check_fastclose (msk); -if (msk->pm.status) -mptcp_pm_nl_work (msk); +mptcp_pm_nl_work (msk);if (test_and_clear_bit (MPTCP_WORK_EOF , &msk->flags))mptcp_check_for_eof (msk);
net/mptcp/protocol.h +11 -1
@@ -173,16 +173,25 @@ enum mptcp_pm_status {MPTCP_PM_ADD_ADDR_SEND_ACK ,MPTCP_PM_RM_ADDR_RECEIVED ,MPTCP_PM_ESTABLISHED , -MPTCP_PM_ALREADY_ESTABLISHED ,/* persistent status, set after ESTABLISHED event */ MPTCP_PM_SUBFLOW_ESTABLISHED , +MPTCP_PM_ALREADY_ESTABLISHED ,/* persistent status, set after ESTABLISHED event */ +MPTCP_PM_MPC_ENDPOINT_ACCOUNTED /* persistent status, set after MPC local address is +* accounted int id_avail_bitmap +*/ }; +/* Status bits below MPTCP_PM_ALREADY_ESTABLISHED need pm worker actions */ +#define MPTCP_PM_WORK_MASK ((1 << MPTCP_PM_ALREADY_ESTABLISHED) - 1) +enum mptcp_addr_signal_status {MPTCP_ADD_ADDR_SIGNAL ,MPTCP_ADD_ADDR_ECHO ,MPTCP_RM_ADDR_SIGNAL , }; +/* max value of mptcp_addr_info.id */ +#define MPTCP_PM_MAX_ADDR_ID U8_MAX +struct mptcp_pm_data {struct mptcp_addr_info local;struct mptcp_addr_info remote;
@@ -201,6 +210,7 @@ struct mptcp_pm_data {u8 local_addr_used;u8 subflows;u8 status; +DECLARE_BITMAP (id_avail_bitmap,MPTCP_PM_MAX_ADDR_ID +1 );struct mptcp_rm_list rm_list_tx;struct mptcp_rm_list rm_list_rx; };
tools/testing/selftests/net/mptcp/mptcp_join.sh +4 -1
@@ -1071,7 +1071,10 @@ signal_address_tests() ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags signal ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags signal run_tests $ns1 $ns2 10.0.1.1 - chk_add_nr 4 4 + + # the server will not signal the address terminating + # the MPC subflow + chk_add_nr 3 3 } link_failure_tests()
Signature · 1 line
2.34.1
PATCH 10/13 mptcp: do not block subflows creation on errors
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
If the MPTCP configuration allows for multiple subflows creation, and the first additional subflows never reach the fully established status - e.g. due to packets drop or reset - the in kernel path manager do not move to the next subflow.
This patch introduces a new PM helper to cope with MPJ subflow creation failure and delay and hook it where appropriate.
Such helper triggers additional subflow creation, as needed and updates the PM subflow counter, if the current one is closing.
Additionally start all the needed additional subflows as soon as the MPTCP socket is fully established, so we don't have to cope with slow MPJ handshake blocking the next subflow creation.
--- net/mptcp/pm.c | 23 ++++++++++++-- net/mptcp/pm_netlink.c | 69 +++++++++++++++++++++++++----------------- net/mptcp/protocol.c | 6 ++++ net/mptcp/protocol.h | 4 ++- 4 files changed, 71 insertions(+), 31 deletions(-)
net/mptcp/pm.c +21 -2
@@ -172,9 +172,28 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk)spin_unlock_bh (&pm->lock); } -void mptcp_pm_subflow_closed (struct mptcp_sock *msk,u8 id) +void mptcp_pm_subflow_check_next (struct mptcp_sock *msk,const struct sock *ssk, +const struct mptcp_subflow_context *subflow) { -pr_debug ("msk=%p" , msk); +struct mptcp_pm_data *pm = &msk->pm; +bool update_subflows; + + update_subflows = (ssk->sk_state ==TCP_CLOSE ) && + (subflow->request_join || subflow->mp_join); +if (!READ_ONCE (pm->work_pending) && !update_subflows) +return ; + +spin_lock_bh (&pm->lock); +if (update_subflows) + pm->subflows--; + +/* Even if this subflow is not really established, tell the PM to try +* to pick the next ones, if possible. +*/ +if (mptcp_pm_nl_check_work_pending (msk)) +mptcp_pm_schedule_work (msk,MPTCP_PM_SUBFLOW_ESTABLISHED ); + +spin_unlock_bh (&pm->lock); } void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
net/mptcp/pm_netlink.c +41 -28
132 lines not on this page · raw message
net/mptcp/protocol.c +6 -0
@@ -2332,6 +2332,12 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk, {if (sk->sk_state ==TCP_ESTABLISHED )mptcp_event (MPTCP_EVENT_SUB_CLOSED ,mptcp_sk (sk), ssk,GFP_KERNEL ); + +/* subflow aborted before reaching the fully_established status +* attempt the creation of the next subflow +*/ +mptcp_pm_subflow_check_next (mptcp_sk (sk), ssk, subflow); +__mptcp_close_ssk (sk, ssk, subflow,MPTCP_CF_PUSH ); }
net/mptcp/protocol.h +3 -1
@@ -743,7 +743,9 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk,bool mptcp_pm_allow_new_subflow (struct mptcp_sock *msk);void mptcp_pm_connection_closed (struct mptcp_sock *msk);void mptcp_pm_subflow_established (struct mptcp_sock *msk); -void mptcp_pm_subflow_closed (struct mptcp_sock *msk,u8 id); +bool mptcp_pm_nl_check_work_pending (struct mptcp_sock *msk); +void mptcp_pm_subflow_check_next (struct mptcp_sock *msk,const struct sock *ssk, +const struct mptcp_subflow_context *subflow);void mptcp_pm_add_addr_received (struct mptcp_sock *msk,const struct mptcp_addr_info *addr); void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
Signature · 1 line
2.34.1
PATCH 11/13 selftests: mptcp: add tests for subflow creation failure
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Verify that, when multiple endpoints are available, subflows creation proceed even when the first additional subflow creation fails - due to packet drop on the relevant link
--- tools/testing/selftests/net/mptcp/config | 1 + .../testing/selftests/net/mptcp/mptcp_join.sh | 78 ++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletion(-)
tools/testing/selftests/net/mptcp/config +1 -0
@@ -17,4 +17,5 @@ CONFIG_NFT_TPROXY=m CONFIG_NFT_SOCKET=m CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IPV6_MULTIPLE_TABLES=y
tools/testing/selftests/net/mptcp/mptcp_join.sh +77 -1
112 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 12/13 mptcp: cleanup MPJ subflow list handling
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
We can simplify the join list handling leveraging the mptcp_release_cb(): if we can acquire the msk socket lock at mptcp_finish_join time, move the new subflow directly into the conn_list, otherwise place it on join_list and let the release_cb process such list.
Since pending MPJ connection are now always processed in a timely way, we can avoid flushing the join list every time we have to process all the current subflows.
Additionally we can now use the mptcp data lock to protect the join_list, removing the additional spin lock.
Finally, the MPJ handshake is now always finalized under the msk socket lock, we can drop the additional synchronization between mptcp_finish_join() and mptcp_close().
--- net/mptcp/pm_netlink.c | 3 -- net/mptcp/protocol.c | 117 ++++++++++++++++++----------------------- net/mptcp/protocol.h | 15 +----- net/mptcp/sockopt.c | 24 +++------ net/mptcp/subflow.c | 5 +- 5 files changed, 60 insertions(+), 104 deletions(-)
net/mptcp/pm_netlink.c +0 -3
@@ -165,7 +165,6 @@ select_local_address(const struct pm_nl_pernet *pernet,msk_owned_by_me (msk);rcu_read_lock (); -__mptcp_flush_join_list (msk);list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) {if (!(entry->flags &MPTCP_PM_ADDR_FLAG_SUBFLOW ))continue ;
@@ -595,7 +594,6 @@ static unsigned int fill_local_addresses_vec(struct mptcp_sock *msk, subflows_max =mptcp_pm_get_subflows_max (msk);rcu_read_lock (); -__mptcp_flush_join_list (msk);list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) {if (!(entry->flags &MPTCP_PM_ADDR_FLAG_FULLMESH ))continue ;
@@ -684,7 +682,6 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk) !mptcp_pm_should_rm_signal(msk))return ; -__mptcp_flush_join_list (msk); subflow =list_first_entry_or_null (&msk->conn_list,typeof (*subflow), node);if (subflow) {struct sock *ssk =mptcp_subflow_tcp_sock (subflow);
net/mptcp/protocol.c +50 -67
215 lines not on this page · raw message
net/mptcp/protocol.h +2 -13
@@ -120,7 +120,7 @@#define MPTCP_CLEAN_UNA 7#define MPTCP_ERROR_REPORT 8#define MPTCP_RETRANSMIT 9 -#define MPTCP_WORK_SYNC_SETSOCKOPT 10 +#define MPTCP_FLUSH_JOIN_LIST 10#define MPTCP_CONNECTED 11static inline bool before64 (__u64 seq1,__u64 seq2)
@@ -261,7 +261,6 @@ struct mptcp_sock { u8 recvmsg_inq:1, cork:1, nodelay:1; -spinlock_t join_list_lock;struct work_struct work;struct sk_buff *ooo_last_skb;struct rb_root out_of_order_queue;
@@ -509,15 +508,6 @@ mptcp_subflow_get_mapped_dsn(const struct mptcp_subflow_context *subflow)return subflow->map_seq +mptcp_subflow_get_map_offset (subflow); } -static inline void mptcp_add_pending_subflow (struct mptcp_sock *msk, -struct mptcp_subflow_context *subflow) -{ -sock_hold (mptcp_subflow_tcp_sock (subflow)); -spin_lock_bh (&msk->join_list_lock); -list_add_tail (&subflow->node, &msk->join_list); -spin_unlock_bh (&msk->join_list_lock); -} -void mptcp_subflow_process_delegated (struct sock *ssk);static inline void mptcp_subflow_delegate (struct mptcp_subflow_context *subflow,int action)
@@ -682,7 +672,6 @@ void __mptcp_data_acked(struct sock *sk);void __mptcp_error_report (struct sock *sk);void mptcp_subflow_eof (struct sock *sk);bool mptcp_update_rcv_data_fin (struct mptcp_sock *msk,u64 data_fin_seq,bool use_64bit); -void __mptcp_flush_join_list (struct mptcp_sock *msk);static inline bool mptcp_data_fin_enabled (const struct mptcp_sock *msk) { return READ_ONCE(msk->snd_data_fin_enable) &&
@@ -842,7 +831,7 @@ unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk);unsigned int mptcp_pm_get_local_addr_max (struct mptcp_sock *msk);void mptcp_sockopt_sync (struct mptcp_sock *msk,struct sock *ssk); -void mptcp_sockopt_sync_all (struct mptcp_sock *msk); +void mptcp_sockopt_sync_locked (struct mptcp_sock *msk,struct sock *ssk);static inline struct mptcp_ext *mptcp_get_ext (const struct sk_buff *skb) {
net/mptcp/sockopt.c +6 -18
@@ -1285,27 +1285,15 @@ void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk) } } -void mptcp_sockopt_sync_all (struct mptcp_sock *msk) +void mptcp_sockopt_sync_locked (struct mptcp_sock *msk,struct sock *ssk) { -struct mptcp_subflow_context *subflow; -struct sock *sk = (struct sock *)msk; -u32 seq; - - seq =sockopt_seq_reset (sk); +struct mptcp_subflow_context *subflow =mptcp_subflow_ctx (ssk); -mptcp_for_each_subflow (msk, subflow) { -struct sock *ssk =mptcp_subflow_tcp_sock (subflow); -u32 sseq =READ_ONCE (subflow->setsockopt_seq); +msk_owned_by_me (msk); -if (sseq != msk->setsockopt_seq) { -__mptcp_sockopt_sync (msk, ssk); -WRITE_ONCE (subflow->setsockopt_seq, seq); - }else if (sseq != seq) { -WRITE_ONCE (subflow->setsockopt_seq, seq); - } +if (READ_ONCE (subflow->setsockopt_seq) != msk->setsockopt_seq) { +sync_socket_options (msk, ssk); -cond_resched (); + subflow->setsockopt_seq = msk->setsockopt_seq; } - - msk->setsockopt_seq = seq; }
net/mptcp/subflow.c +2 -3
@@ -1441,7 +1441,8 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, subflow->request_bkup = !!(flags &MPTCP_PM_ADDR_FLAG_BACKUP );mptcp_info2sockaddr (remote, &addr, ssk->sk_family); -mptcp_add_pending_subflow (msk, subflow); +sock_hold (ssk); +list_add_tail (&subflow->node, &msk->conn_list); err =kernel_connect (sf, (struct sockaddr *)&addr, addrlen,O_NONBLOCK );if (err && err != -EINPROGRESS ) goto failed_unlink;
@@ -1452,9 +1453,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,return err; failed_unlink: -spin_lock_bh (&msk->join_list_lock);list_del (&subflow->node); -spin_unlock_bh (&msk->join_list_lock);sock_put (mptcp_subflow_tcp_sock (subflow)); failed:
Signature · 1 line
2.34.1
PATCH 13/13 mptcp: avoid atomic bit manipulation when possible
In reply to Mat MartineauFrom: Paolo Abeni <[email protected]>
Currently the msk->flags bitmask carries both state for the mptcp_release_cb() - mostly touched under the mptcp data lock
- and others state info touched even outside such lock scope.
As a consequence, msk->flags is always manipulated with atomic operations.
This change splits such bitmask in two separate fields, so that we use plain bit operations when touching the cb-related info.
The MPTCP_PUSH_PENDING bit needs additional care, as it is the only CB related field currently accessed either under the mptcp data lock or the mptcp socket lock.
Let's add another mask just for such bit's sake.
--- net/mptcp/protocol.c | 47 +++++++++++++++++++++++--------------------- net/mptcp/protocol.h | 18 ++++++++++------- net/mptcp/subflow.c | 4 ++-- 3 files changed, 38 insertions(+), 31 deletions(-)
net/mptcp/protocol.c +25 -22
@@ -763,7 +763,7 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, struct sock *ssk)if (!sock_owned_by_user (sk))__mptcp_error_report (sk);else -set_bit (MPTCP_ERROR_REPORT , &msk->flags); +__set_bit (MPTCP_ERROR_REPORT , &msk->cb_flags); }/* If the moves have caught up with the DATA_FIN sequence number
@@ -1517,9 +1517,8 @@ static void mptcp_update_post_push(struct mptcp_sock *msk,void mptcp_check_and_set_pending (struct sock *sk) { -if (mptcp_send_head (sk) && - !test_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->flags)) -set_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->flags); +if (mptcp_send_head (sk)) +mptcp_sk (sk)->push_pending |=BIT (MPTCP_PUSH_PENDING ); }void __mptcp_push_pending (struct sock *sk,unsigned int flags)
@@ -2134,7 +2133,7 @@ static void mptcp_retransmit_timer(struct timer_list *t)mptcp_schedule_work (sk); }else {/* delegate our work to tcp_release_cb() */ -set_bit (MPTCP_RETRANSMIT , &msk->flags); +__set_bit (MPTCP_RETRANSMIT , &msk->cb_flags); }bh_unlock_sock (sk);sock_put (sk);
@@ -2840,7 +2839,9 @@ static int mptcp_disconnect(struct sock *sk, int flags)mptcp_destroy_common (msk); msk->last_snd =NULL ; - msk->flags =0 ; +WRITE_ONCE (msk->flags,0 ); + msk->cb_flags =0 ; + msk->push_pending =0 ; msk->recovery = false; msk->can_ack = false; msk->fully_established = false;
@@ -3021,7 +3022,7 @@ void __mptcp_data_acked(struct sock *sk)if (!sock_owned_by_user (sk))__mptcp_clean_una (sk);else -set_bit (MPTCP_CLEAN_UNA , &mptcp_sk (sk)->flags); +__set_bit (MPTCP_CLEAN_UNA , &mptcp_sk (sk)->cb_flags);if (mptcp_pending_data_fin_ack (sk))mptcp_schedule_work (sk);
@@ -3040,22 +3041,23 @@ void __mptcp_check_push(struct sock *sk, struct sock *ssk)else if (xmit_ssk)mptcp_subflow_delegate (mptcp_subflow_ctx (xmit_ssk),MPTCP_DELEGATE_SEND ); }else { -set_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->flags); +__set_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->cb_flags); } } +#define MPTCP_FLAGS_PROCESS_CTX_NEED (BIT(MPTCP_PUSH_PENDING) | \ + BIT(MPTCP_RETRANSMIT) | \ + BIT(MPTCP_FLUSH_JOIN_LIST)) +/* processes deferred events and flush wmem */ static void mptcp_release_cb (struct sock *sk) + __must_hold(&sk->sk_lock.slock) { +struct mptcp_sock *msk =mptcp_sk (sk); +for (;;) { -unsigned long flags =0 ; - -if (test_and_clear_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->flags)) - flags |=BIT (MPTCP_PUSH_PENDING ); -if (test_and_clear_bit (MPTCP_RETRANSMIT , &mptcp_sk (sk)->flags)) - flags |=BIT (MPTCP_RETRANSMIT ); -if (test_and_clear_bit (MPTCP_FLUSH_JOIN_LIST , &mptcp_sk (sk)->flags)) - flags |=BIT (MPTCP_FLUSH_JOIN_LIST ); +unsigned long flags = (msk->cb_flags &MPTCP_FLAGS_PROCESS_CTX_NEED ) | + msk->push_pending;if (!flags)break ;
@@ -3066,7 +3068,8 @@ static void mptcp_release_cb(struct sock *sk)* datapath acquires the msk socket spinlock while helding * the subflow socket lock */ - + msk->push_pending =0 ; + msk->cb_flags &= ~flags;spin_unlock_bh (&sk->sk_lock.slock);if (flags &BIT (MPTCP_FLUSH_JOIN_LIST ))__mptcp_flush_join_list (sk);
@@ -3082,11 +3085,11 @@ static void mptcp_release_cb(struct sock *sk)/* be sure to set the current sk state before tacking actions * depending on sk_state */ -if (test_and_clear_bit (MPTCP_CONNECTED , &mptcp_sk (sk)->flags)) +if (__test_and_clear_bit (MPTCP_CONNECTED , &msk->cb_flags))__mptcp_set_connected (sk); -if (test_and_clear_bit (MPTCP_CLEAN_UNA , &mptcp_sk (sk)->flags)) +if (__test_and_clear_bit (MPTCP_CLEAN_UNA , &msk->cb_flags))__mptcp_clean_una_wakeup (sk); -if (test_and_clear_bit (MPTCP_ERROR_REPORT , &mptcp_sk (sk)->flags)) +if (__test_and_clear_bit (MPTCP_ERROR_REPORT , &msk->cb_flags))__mptcp_error_report (sk);__mptcp_update_rmem (sk);
@@ -3128,7 +3131,7 @@ void mptcp_subflow_process_delegated(struct sock *ssk)if (!sock_owned_by_user (sk))__mptcp_subflow_push_pending (sk, ssk);else -set_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->flags); +__set_bit (MPTCP_PUSH_PENDING , &mptcp_sk (sk)->cb_flags);mptcp_data_unlock (sk);mptcp_subflow_delegated_done (subflow,MPTCP_DELEGATE_SEND ); }
@@ -3247,7 +3250,7 @@ bool mptcp_finish_join(struct sock *ssk) }else {sock_hold (ssk);list_add_tail (&subflow->node, &msk->join_list); -set_bit (MPTCP_FLUSH_JOIN_LIST , &msk->flags); +__set_bit (MPTCP_FLUSH_JOIN_LIST , &msk->cb_flags); }mptcp_data_unlock (parent);
net/mptcp/protocol.h +11 -7
@@ -110,18 +110,20 @@/* MPTCP TCPRST flags */ #define MPTCP_RST_TRANSIENT BIT(0) -/* MPTCP socket flags */ +/* MPTCP socket atomic flags */ #define MPTCP_NOSPACE 1#define MPTCP_WORK_RTX 2#define MPTCP_WORK_EOF 3#define MPTCP_FALLBACK_DONE 4#define MPTCP_WORK_CLOSE_SUBFLOW 5 -#define MPTCP_PUSH_PENDING 6 -#define MPTCP_CLEAN_UNA 7 -#define MPTCP_ERROR_REPORT 8 -#define MPTCP_RETRANSMIT 9 -#define MPTCP_FLUSH_JOIN_LIST 10 -#define MPTCP_CONNECTED 11 + +/* MPTCP socket release cb flags */ +#define MPTCP_PUSH_PENDING 1 +#define MPTCP_CLEAN_UNA 2 +#define MPTCP_ERROR_REPORT 3 +#define MPTCP_RETRANSMIT 4 +#define MPTCP_FLUSH_JOIN_LIST 5 +#define MPTCP_CONNECTED 6static inline bool before64 (__u64 seq1,__u64 seq2) {
@@ -250,6 +252,8 @@ struct mptcp_sock {u32 token;int rmem_released;unsigned long flags; +unsigned long cb_flags; +unsigned long push_pending;bool recovery;/* closing subflow write queue reinjected */ bool can_ack;bool fully_established;
net/mptcp/subflow.c +2 -2
@@ -388,7 +388,7 @@ static void mptcp_set_connected(struct sock *sk)if (!sock_owned_by_user (sk))__mptcp_set_connected (sk);else -set_bit (MPTCP_CONNECTED , &mptcp_sk (sk)->flags); +__set_bit (MPTCP_CONNECTED , &mptcp_sk (sk)->cb_flags);mptcp_data_unlock (sk); }
@@ -1274,7 +1274,7 @@ static void subflow_error_report(struct sock *ssk)if (!sock_owned_by_user (sk))__mptcp_error_report (sk);else -set_bit (MPTCP_ERROR_REPORT , &mptcp_sk (sk)->flags); +__set_bit (MPTCP_ERROR_REPORT , &mptcp_sk (sk)->cb_flags);mptcp_data_unlock (sk); }
Signature · 1 line
2.34.1
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 6 Jan 2022 16:20:13 -0800 you wrote:
These patches have been tested in the MPTCP tree for a longer than usual time (thanks to holiday schedules), and are ready for the net-next branch. Changes include feature updates, small fixes, refactoring, and some selftest changes.
Patch 1 fixes an OUTQ ioctl issue with TCP fallback sockets.
[...]
Here is the summary with links:
- [net-next,01/13] mptcp: keep snd_una updated for fallback socket
https://git.kernel.org/netdev/net-next/c/58cd405b83b3 - [net-next,02/13] mptcp: implement fastclose xmit path https://git.kernel.org/netdev/net-next/c/f284c0c77321 - [net-next,03/13] mptcp: full disconnect implementation https://git.kernel.org/netdev/net-next/c/b29fcfb54cd7 - [net-next,04/13] mptcp: cleanup accept and poll https://git.kernel.org/netdev/net-next/c/71ba088ce0aa - [net-next,05/13] mptcp: implement support for user-space disconnect https://git.kernel.org/netdev/net-next/c/3d1d6d66e156 - [net-next,06/13] selftests: mptcp: add disconnect tests https://git.kernel.org/netdev/net-next/c/05be5e273c84 - [net-next,07/13] mptcp: fix per socket endpoint accounting https://git.kernel.org/netdev/net-next/c/f7d6a237d742 - [net-next,08/13] mptcp: clean-up MPJ option writing https://git.kernel.org/netdev/net-next/c/71b077e48377 - [net-next,09/13] mptcp: keep track of local endpoint still available for each msk https://git.kernel.org/netdev/net-next/c/86e39e04482b - [net-next,10/13] mptcp: do not block subflows creation on errors https://git.kernel.org/netdev/net-next/c/a88c9e496937 - [net-next,11/13] selftests: mptcp: add tests for subflow creation failure https://git.kernel.org/netdev/net-next/c/46e967d187ed - [net-next,12/13] mptcp: cleanup MPJ subflow list handling https://git.kernel.org/netdev/net-next/c/3e5014909b56 - [net-next,13/13] mptcp: avoid atomic bit manipulation when possible https://git.kernel.org/netdev/net-next/c/e9d09baca676
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html