mptcp: get rid of msk->subflow
Subsystems (3)
Paolo Abeni
maintainerv2 cover mptcp: get rid of msk->subflow
The mptcp protocol maintains an additional struct socket per connection, mainly to be able to use easily tcp-level struct socket operations.
That lead to several ill side effects, beyond the quite unfortunate/ confusing field name
- active and passive sockets behavior is incosistent, as only active ones have not NULL msk->subflow, leading to different error handling (and different error code returned to the user-space) in several places.
- active sockets uses an unneeded, larger amount of memory
- passive sockets can't successfully go through accept()/disconnect() accept()
This series address all the above finally getting rid of the blamed field. The first patch is a minor clean-up, in the next 11 patches msk->subflow usage is sistematically removed from the mptcp protocol, replacing it with direct msk->first usage, eventually introducing new core helpers as needed.
The final patch finally dispose the field, and it's the only patch in the series intened to produce functional changes.
v1 -> v2:
- dropped first patch (already applied)
- a bunch of typos and comments, the only patches with code changes are 7/13, 9/13, 13/13, see the individual changelog for the details.
Paolo Abeni (13):
mptcp: avoid unneeded mptcp_token_destroy() calls
mptcp: avoid additional __inet_stream_connect() call
mptcp: avoid subflow socket usage in mptcp_get_port()
net: factor out inet{,6}_bind_sk helpers
mptcp: mptcp: avoid additional indirection in mptcp_bind()
net: factor out __inet_listen_sk() helper
mptcp: avoid additional indirection in mptcp_listen()
mptcp: avoid additional indirection in mptcp_poll()
mptcp: avoid unneeded indirection in mptcp_stream_accept()
mptcp: avoid additional indirection in sockopt
mptcp: avoid ssock usage in mptcp_pm_nl_create_listen_socket()
mptcp: change the mpc check helper to return a sk
mptcp: get rid of msk->subflow
include/net/inet_common.h | 2 + include/net/ipv6.h | 1 + net/ipv4/af_inet.c | 46 ++++++---- net/ipv6/af_inet6.c | 10 ++- net/mptcp/pm_netlink.c | 30 ++++--- net/mptcp/protocol.c | 177 +++++++++++++++++++------------------- net/mptcp/protocol.h | 15 ++-- net/mptcp/sockopt.c | 65 +++++++------- 8 files changed, 181 insertions(+), 165 deletions(-)
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 1/13 mptcp: avoid unneeded mptcp_token_destroy() calls
The mptcp protocol currently clears the msk token both at connect() and listen() time. That was necessary before the mptcp protocol gained a full disconnect implementation, but after commit b29fcfb54cd7 ("mptcp: full disconnect implementation") such calls are no more necessary and a bit confusing.
Just drop them.
--- net/mptcp/protocol.c | 2 -- 1 file changed, 2 deletions(-)
net/mptcp/protocol.c +0 -2
@@ -3634,7 +3634,6 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)if (IS_ERR (ssock))return PTR_ERR (ssock); -mptcp_token_destroy (msk);inet_sk_state_store (sk,TCP_SYN_SENT ); subflow =mptcp_subflow_ctx (ssock->sk);#ifdef CONFIG_TCP_MD5SIG
@@ -3753,7 +3752,6 @@ static int mptcp_listen(struct socket *sock, int backlog) goto unlock; } -mptcp_token_destroy (msk);inet_sk_state_store (sk,TCP_LISTEN );sock_set_flag (sk,SOCK_RCU_FREE );
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 2/13 mptcp: avoid additional __inet_stream_connect() call
In reply to Paolo AbeniThe mptcp protocol maintains an additional socket just to easily invoke a few stream operations on the first subflow. One of them is __inet_stream_connect().
We are going to remove the first subflow socket soon, so avoid the additional indirection via at connect time, calling directly into the sock-level connect() ops.
No functional change intended.
---
v1 -> v2:
- added comment pointing to __inet_stream_connect() similar code (Mattbe)
- fixed typo in the commit message (Mat)
--- net/mptcp/protocol.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-)
net/mptcp/protocol.c +32 -11
@@ -3629,22 +3629,24 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)struct mptcp_sock *msk =mptcp_sk (sk);struct socket *ssock;int err = -EINVAL ; +struct sock *ssk; ssock =__mptcp_nmpc_socket (msk);if (IS_ERR (ssock))return PTR_ERR (ssock);inet_sk_state_store (sk,TCP_SYN_SENT ); - subflow =mptcp_subflow_ctx (ssock->sk); + ssk = msk->first; + subflow =mptcp_subflow_ctx (ssk);#ifdef CONFIG_TCP_MD5SIG /* no MPTCP if MD5SIG is enabled on this socket or we may run out of * TCP option space. */ -if (rcu_access_pointer (tcp_sk (ssock->sk)->md5sig_info)) +if (rcu_access_pointer (tcp_sk (ssk)->md5sig_info))mptcp_subflow_early_fallback (msk, subflow);#endif -if (subflow->request_mptcp &&mptcp_token_new_connect (ssock->sk)) { -MPTCP_INC_STATS (sock_net (ssock->sk),MPTCP_MIB_TOKENFALLBACKINIT ); +if (subflow->request_mptcp &&mptcp_token_new_connect (ssk)) { +MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_TOKENFALLBACKINIT );mptcp_subflow_early_fallback (msk, subflow); }if (likely (!__mptcp_check_fallback (msk)))
@@ -3653,21 +3655,40 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* if reaching here via the fastopen/sendmsg path, the caller already * acquired the subflow socket lock, too. */ -if (msk->fastopening) - err =__inet_stream_connect (ssock, uaddr, addr_len,O_NONBLOCK ,1 ); -else - err =inet_stream_connect (ssock, uaddr, addr_len,O_NONBLOCK ); -inet_sk (sk)->defer_connect =inet_sk (ssock->sk)->defer_connect; +if (!msk->fastopening) +lock_sock (ssk); + +/* the following mirrors closely a very small chunk of code from +* __inet_stream_connect() +*/ +if (ssk->sk_state !=TCP_CLOSE ) + goto out; + +if (BPF_CGROUP_PRE_CONNECT_ENABLED (ssk)) { + err = ssk->sk_prot->pre_connect (ssk, uaddr, addr_len); +if (err) + goto out; + } + + err = ssk->sk_prot->connect (ssk, uaddr, addr_len); +if (err <0 ) + goto out; + +inet_sk (sk)->defer_connect =inet_sk (ssk)->defer_connect; + +out: +if (!msk->fastopening) +release_sock (ssk);/* on successful connect, the msk state will be moved to established by * subflow_finish_connect() */ if (unlikely (err && err != -EINPROGRESS )) { -inet_sk_state_store (sk,inet_sk_state_load (ssock->sk)); +inet_sk_state_store (sk,inet_sk_state_load (ssk));return err; } -mptcp_copy_inaddrs (sk, ssock->sk); +mptcp_copy_inaddrs (sk, ssk);/* silence EINPROGRESS and let the caller inet_stream_connect * handle the connection in progress
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 3/13 mptcp: avoid subflow socket usage in mptcp_get_port()
In reply to Paolo AbeniWe are going to remove the first subflow socket soon, so avoid accessing it in mptcp_get_port(). Instead, access directly the first subflow sock.
--- net/mptcp/protocol.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/mptcp/protocol.c +3 -5
@@ -3445,14 +3445,12 @@ static void mptcp_unhash(struct sock *sk)static int mptcp_get_port (struct sock *sk,unsigned short snum) {struct mptcp_sock *msk =mptcp_sk (sk); -struct socket *ssock; - ssock = msk->subflow; -pr_debug ("msk=%p, subflow=%p" , msk, ssock); -if (WARN_ON_ONCE (!ssock)) +pr_debug ("msk=%p, ssk=%p" , msk, msk->first); +if (WARN_ON_ONCE (!msk->first))return -EINVAL ; -return inet_csk_get_port (ssock->sk, snum); +return inet_csk_get_port (msk->first, snum); }void mptcp_finish_connect (struct sock *ssk)
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 4/13 net: factor out inet{,6}_bind_sk helpers
In reply to Paolo AbeniThe mptcp protocol maintains an additional socket just to easily invoke a few stream operations on the first subflow. One of them is bind().
Factor out the helpers operating directly on the struct sock, to allow get rid of the above dependency in the next patch without duplicating the existing code.
No functional changes intended.
--- include/net/inet_common.h | 1 + include/net/ipv6.h | 1 + net/ipv4/af_inet.c | 8 ++++++-- net/ipv6/af_inet6.c | 10 +++++++--- 4 files changed, 15 insertions(+), 5 deletions(-)
include/net/inet_common.h +1 -0
@@ -42,6 +42,7 @@ int inet_shutdown(struct socket *sock, int how);int inet_listen (struct socket *sock,int backlog);void inet_sock_destruct (struct sock *sk);int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len); +int inet_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len);/* Don't allocate port at this moment, defer to connect. */ #define BIND_FORCE_ADDRESS_NO_PORT (1 << 0)/* Grab and release socket lock. */
include/net/ipv6.h +1 -0
@@ -1220,6 +1220,7 @@ void inet6_cleanup_sock(struct sock *sk);void inet6_sock_destruct (struct sock *sk);int inet6_release (struct socket *sock);int inet6_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len); +int inet6_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len);int inet6_getname (struct socket *sock,struct sockaddr *uaddr,int peer);int inet6_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg);
net/ipv4/af_inet.c +6 -2
@@ -431,9 +431,8 @@ int inet_release(struct socket *sock) }EXPORT_SYMBOL (inet_release); -int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +int inet_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len) { -struct sock *sk = sock->sk;u32 flags =BIND_WITH_LOCK ;int err;
@@ -454,6 +453,11 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)return __inet_bind (sk, uaddr, addr_len, flags); } + +int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +{ +return inet_bind_sk (sock->sk, uaddr, addr_len); +}EXPORT_SYMBOL (inet_bind); int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,
net/ipv6/af_inet6.c +7 -3
@@ -435,10 +435,8 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len, goto out; } -/* bind for INET6 API */ -int inet6_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +int inet6_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len) { -struct sock *sk = sock->sk;u32 flags =BIND_WITH_LOCK ;const struct proto *prot;int err =0 ;
@@ -462,6 +460,12 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)return __inet6_bind (sk, uaddr, addr_len, flags); } + +/* bind for INET6 API */ +int inet6_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +{ +return inet6_bind_sk (sock->sk, uaddr, addr_len); +}EXPORT_SYMBOL (inet6_bind);int inet6_release (struct socket *sock)
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 5/13 mptcp: mptcp: avoid additional indirection in mptcp_bind()
In reply to Paolo AbeniWe are going to remove the first subflow socket soon, so avoid the additional indirection via at bind() time. Instead call directly the recently introduced helpers on the first subflow sock.
--- net/mptcp/protocol.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
net/mptcp/protocol.c +12 -5
@@ -3731,22 +3731,29 @@ static struct proto mptcp_prot = {static int mptcp_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) {struct mptcp_sock *msk =mptcp_sk (sock->sk); +struct sock *ssk, *sk = sock->sk;struct socket *ssock; -int err; +int err = -EINVAL ; -lock_sock (sock->sk); +lock_sock (sk); ssock =__mptcp_nmpc_socket (msk);if (IS_ERR (ssock)) { err =PTR_ERR (ssock); goto unlock; } - err = ssock->ops->bind (ssock, uaddr, addr_len); + ssk = msk->first; +if (sk->sk_family ==AF_INET ) + err =inet_bind_sk (ssk, uaddr, addr_len); +#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) + else if (sk->sk_family == AF_INET6) + err =inet6_bind_sk (ssk, uaddr, addr_len); +#endif if (!err) -mptcp_copy_inaddrs (sock->sk, ssock->sk); +mptcp_copy_inaddrs (sk, ssk); unlock: -release_sock (sock->sk); +release_sock (sk);return err; }
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 6/13 net: factor out __inet_listen_sk() helper
In reply to Paolo AbeniThe mptcp protocol maintains an additional socket just to easily invoke a few stream operations on the first subflow. One of them is inet_listen().
Factor out an helper operating directly on the (locked) struct sock, to allow get rid of the above dependency in the next patch without duplicating the existing code.
No functional changes intended.
--
v1 -> v2:
- initialize 'err' at definition time (Mat)
--- include/net/inet_common.h | 1 + net/ipv4/af_inet.c | 38 ++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-)
include/net/inet_common.h +1 -0
@@ -40,6 +40,7 @@ int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int flags);int inet_shutdown (struct socket *sock,int how);int inet_listen (struct socket *sock,int backlog); +int __inet_listen_sk (struct sock *sk,int backlog);void inet_sock_destruct (struct sock *sk);int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len);int inet_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len);
net/ipv4/af_inet.c +22 -16
@@ -187,24 +187,13 @@ static int inet_autobind(struct sock *sk)return 0 ; } -/* -* Move a socket into listening state. -*/ -int inet_listen (struct socket *sock,int backlog) +int __inet_listen_sk (struct sock *sk,int backlog) { -struct sock *sk = sock->sk; -unsigned char old_state; +unsigned char old_state = sk->sk_state;int err, tcp_fastopen; -lock_sock (sk); - - err = -EINVAL ; -if (sock->state !=SS_UNCONNECTED || sock->type !=SOCK_STREAM ) - goto out; - - old_state = sk->sk_state;if (!((1 << old_state) & (TCPF_CLOSE |TCPF_LISTEN ))) - goto out; +return -EINVAL ;WRITE_ONCE (sk->sk_max_ack_backlog, backlog);/* Really, if the socket is already in listen state
@@ -227,10 +216,27 @@ int inet_listen(struct socket *sock, int backlog) err =inet_csk_listen_start (sk);if (err) - goto out; +return err; +tcp_call_bpf (sk,BPF_SOCK_OPS_TCP_LISTEN_CB ,0 ,NULL ); } - err =0 ; +return 0 ; +} + +/* +* Move a socket into listening state. +*/ +int inet_listen (struct socket *sock,int backlog) +{ +struct sock *sk = sock->sk; +int err = -EINVAL ; + +lock_sock (sk); + +if (sock->state !=SS_UNCONNECTED || sock->type !=SOCK_STREAM ) + goto out; + + err =__inet_listen_sk (sk, backlog); out:release_sock (sk);
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 8/13 mptcp: avoid additional indirection in mptcp_poll()
In reply to Paolo AbeniWe are going to remove the first subflow socket soon, so avoid the additional indirection at poll() time. Instead access directly the first subflow sock.
No functional changes intended.
--- net/mptcp/protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/mptcp/protocol.c +3 -3
@@ -3886,12 +3886,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 ) { -struct socket *ssock =READ_ONCE (msk->subflow); +struct sock *ssk =READ_ONCE (msk->first); -if (WARN_ON_ONCE (!ssock || !ssock->sk)) +if (WARN_ON_ONCE (!ssk))return 0 ; -return inet_csk_listen_poll (ssock->sk); +return inet_csk_listen_poll (ssk); } shutdown =READ_ONCE (sk->sk_shutdown);
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 7/13 mptcp: avoid additional indirection in mptcp_listen()
In reply to Paolo AbeniWe are going to remove the first subflow socket soon, so avoid the additional indirection via at listen() time. Instead call directly the recently introduced helper on the first subflow sock.
No functional changes intended.
---
v1 -> v2:
- dropped msk backlog init chunk (Mat)
- fixed commit message type (Mat)
--- net/mptcp/protocol.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/mptcp/protocol.c +9 -4
@@ -3762,6 +3762,7 @@ static int mptcp_listen(struct socket *sock, int backlog)struct mptcp_sock *msk =mptcp_sk (sock->sk);struct sock *sk = sock->sk;struct socket *ssock; +struct sock *ssk;int err;pr_debug ("msk=%p" , msk);
@@ -3778,15 +3779,19 @@ static int mptcp_listen(struct socket *sock, int backlog) goto unlock; } + ssk = msk->first;inet_sk_state_store (sk,TCP_LISTEN );sock_set_flag (sk,SOCK_RCU_FREE ); - err = ssock->ops->listen (ssock, backlog); -inet_sk_state_store (sk,inet_sk_state_load (ssock->sk)); +lock_sock (ssk); + err =__inet_listen_sk (ssk, backlog); +release_sock (ssk); +inet_sk_state_store (sk,inet_sk_state_load (ssk)); +if (!err) {sock_prot_inuse_add (sock_net (sk), sk->sk_prot,1 ); -mptcp_copy_inaddrs (sk, ssock->sk); -mptcp_event_pm_listener (ssock->sk,MPTCP_EVENT_LISTENER_CREATED ); +mptcp_copy_inaddrs (sk, ssk); +mptcp_event_pm_listener (ssk,MPTCP_EVENT_LISTENER_CREATED ); } unlock:
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 9/13 mptcp: avoid unneeded indirection in mptcp_stream_accept()
In reply to Paolo AbeniWe are going to remove the first subflow socket soon, so avoid the additional indirection at accept() time. Instead access directly the first subflow sock, and update mptcp_accept() to operate on it. This allows dropping a duplicated check in mptcp_accept().
No functional changes intended.
---
v1 -> v2:
- changed mptcp_accept() to better clarify why we could remove
the 2nd msk->first check there. --- net/mptcp/protocol.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-)
net/mptcp/protocol.c +10 -19
@@ -3216,25 +3216,17 @@ void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk)WRITE_ONCE (msk->wnd_end, msk->snd_nxt +tcp_sk (ssk)->snd_wnd); } -static struct sock *mptcp_accept (struct sock *sk,int flags,int *err, +static struct sock *mptcp_accept (struct sock *ssk,int flags,int *err,bool kern) { -struct mptcp_sock *msk =mptcp_sk (sk); -struct socket *listener;struct sock *newsk; - listener =READ_ONCE (msk->subflow); -if (WARN_ON_ONCE (!listener)) { - *err = -EINVAL ; -return NULL ; - } - -pr_debug ("msk=%p, listener=%p" , msk,mptcp_subflow_ctx (listener->sk)); - newsk =inet_csk_accept (listener->sk, flags, err, kern); +pr_debug ("ssk=%p, listener=%p" , ssk,mptcp_subflow_ctx (ssk)); + newsk =inet_csk_accept (ssk, flags, err, kern);if (!newsk)return NULL ; -pr_debug ("msk=%p, subflow is mptcp=%d" , msk,sk_is_mptcp (newsk)); +pr_debug ("newsk=%p, subflow is mptcp=%d" , newsk,sk_is_mptcp (newsk));if (sk_is_mptcp (newsk)) {struct mptcp_subflow_context *subflow;struct sock *new_mptcp_sock;
@@ -3251,9 +3243,9 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err, } newsk = new_mptcp_sock; -MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPCAPABLEPASSIVEACK ); +MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_MPCAPABLEPASSIVEACK ); }else { -MPTCP_INC_STATS (sock_net (sk), +MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK ); }
@@ -3803,8 +3795,7 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock, int flags, bool kern) {struct mptcp_sock *msk =mptcp_sk (sock->sk); -struct socket *ssock; -struct sock *newsk; +struct sock *ssk, *newsk;int err;pr_debug ("msk=%p" , msk);
@@ -3812,11 +3803,11 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,/* Buggy applications can call accept on socket states other then LISTEN * but no need to allocate the first subflow just to error out. */ - ssock =READ_ONCE (msk->subflow); -if (!ssock) + ssk =READ_ONCE (msk->first); +if (!ssk)return -EINVAL ; - newsk =mptcp_accept (sock->sk, flags, &err, kern); + newsk =mptcp_accept (ssk, flags, &err, kern);if (!newsk)return err;
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 10/13 mptcp: avoid additional indirection in sockopt
In reply to Paolo AbeniThe mptcp sockopt infrastructure unneedly uses the first subflow socket struct in a few spots. We are going to remove such field soon, so use directly the first subflow sock instead.
No functional changes intended.
--- net/mptcp/sockopt.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
net/mptcp/sockopt.c +16 -12
@@ -293,6 +293,7 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname, {struct sock *sk = (struct sock *)msk;struct socket *ssock; +struct sock *ssk;int ret;switch (optname) {
@@ -307,16 +308,17 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,return PTR_ERR (ssock); } - ret =sock_setsockopt (ssock,SOL_SOCKET , optname, optval, optlen); + ssk = msk->first; + ret =sk_setsockopt (ssk,SOL_SOCKET , optname, optval, optlen);if (ret ==0 ) {if (optname ==SO_REUSEPORT ) - sk->sk_reuseport = ssock->sk->sk_reuseport; + sk->sk_reuseport = ssk->sk_reuseport;else if (optname ==SO_REUSEADDR ) - sk->sk_reuse = ssock->sk->sk_reuse; + sk->sk_reuse = ssk->sk_reuse;else if (optname ==SO_BINDTODEVICE ) - sk->sk_bound_dev_if = ssock->sk->sk_bound_dev_if; + sk->sk_bound_dev_if = ssk->sk_bound_dev_if;else if (optname ==SO_BINDTOIFINDEX ) - sk->sk_bound_dev_if = ssock->sk->sk_bound_dev_if; + sk->sk_bound_dev_if = ssk->sk_bound_dev_if; }release_sock (sk);return ret;
@@ -391,6 +393,7 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname,struct sock *sk = (struct sock *)msk;int ret = -EOPNOTSUPP ;struct socket *ssock; +struct sock *ssk;switch (optname) {case IPV6_V6ONLY :
@@ -403,7 +406,8 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname,return PTR_ERR (ssock); } - ret =tcp_setsockopt (ssock->sk,SOL_IPV6 , optname, optval, optlen); + ssk = msk->first; + ret =tcp_setsockopt (ssk,SOL_IPV6 , optname, optval, optlen);if (ret !=0 ) {release_sock (sk);return ret;
@@ -413,13 +417,13 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname,switch (optname) {case IPV6_V6ONLY : - sk->sk_ipv6only = ssock->sk->sk_ipv6only; + sk->sk_ipv6only = ssk->sk_ipv6only;break ;case IPV6_TRANSPARENT : -inet_sk (sk)->transparent =inet_sk (ssock->sk)->transparent; +inet_sk (sk)->transparent =inet_sk (ssk)->transparent;break ;case IPV6_FREEBIND : -inet_sk (sk)->freebind =inet_sk (ssock->sk)->freebind; +inet_sk (sk)->freebind =inet_sk (ssk)->freebind;break ; }
@@ -700,7 +704,7 @@ static int mptcp_setsockopt_sol_ip_set_transparent(struct mptcp_sock *msk, int oreturn PTR_ERR (ssock); } - issk =inet_sk (ssock->sk); + issk =inet_sk (msk->first);switch (optname) {case IP_FREEBIND :
@@ -865,8 +869,8 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_sock *msk, int level, int {struct sock *sk = (struct sock *)msk;struct socket *ssock; -int ret;struct sock *ssk; +int ret;lock_sock (sk); ssk = msk->first;
@@ -881,7 +885,7 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_sock *msk, int level, int goto out; } - ret =tcp_getsockopt (ssock->sk, level, optname, optval, optlen); + ret =tcp_getsockopt (ssk, level, optname, optval, optlen); out:release_sock (sk);
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 11/13 mptcp: avoid ssock usage in mptcp_pm_nl_create_listen_socket()
In reply to Paolo AbeniThis is one of the few remaining spots actually manipulating the first subflow socket. We can leverage the recently introduced inet helpers to get rid of ssock there.
No functional changes intended.
--- net/mptcp/pm_netlink.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
net/mptcp/pm_netlink.c +15 -9
@@ -9,6 +9,7 @@#include <linux/inet.h> #include <linux/kernel.h> #include <net/tcp.h> +#include <net/inet_common.h> #include <net/netns/generic.h> #include <net/mptcp.h> #include <net/genetlink.h>
@@ -1002,8 +1003,8 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,bool is_ipv6 = sk->sk_family ==AF_INET6 ;int addrlen =sizeof (struct sockaddr_in );struct sockaddr_storage addr; +struct sock *newsk, *ssk;struct socket *ssock; -struct sock *newsk;int backlog =1024 ;int err;
@@ -1039,18 +1040,23 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,if (entry->addr.family ==AF_INET6 ) addrlen =sizeof (struct sockaddr_in6 );#endif - err =kernel_bind (ssock, (struct sockaddr *)&addr, addrlen); + ssk =mptcp_sk (newsk)->first; +if (ssk->sk_family ==AF_INET ) + err =inet_bind_sk (ssk, (struct sockaddr *)&addr, addrlen); +#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) + else if (ssk->sk_family == AF_INET6) + err =inet6_bind_sk (ssk, (struct sockaddr *)&addr, addrlen); +#endif if (err)return err;inet_sk_state_store (newsk,TCP_LISTEN ); - err =kernel_listen (ssock, backlog); -if (err) -return err; - -mptcp_event_pm_listener (ssock->sk,MPTCP_EVENT_LISTENER_CREATED ); - -return 0 ; +lock_sock (ssk); + err =__inet_listen_sk (ssk, backlog); +if (!err) +mptcp_event_pm_listener (ssk,MPTCP_EVENT_LISTENER_CREATED ); +release_sock (ssk); +return err; }int mptcp_pm_nl_get_local_id (struct mptcp_sock *msk,struct mptcp_addr_info *skc)
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 12/13 mptcp: change the mpc check helper to return a sk
In reply to Paolo AbeniAfter the previous patch the __mptcp_nmpc_socket helper is used only to ensure that the MPTCP socket is a suitable status - that is, the mptcp capable handshake is not started yet.
Change the return value to the relevant subflow sock, to finally remove the last references to first subflow socket in the MPTCP stack.
As a bonus, we can get rid of a few local variables in different functions.
No functional change intended.
--- net/mptcp/pm_netlink.c | 8 +++----- net/mptcp/protocol.c | 40 +++++++++++++++------------------------ net/mptcp/protocol.h | 2 +- net/mptcp/sockopt.c | 43 +++++++++++++++++++----------------------- 4 files changed, 38 insertions(+), 55 deletions(-)
net/mptcp/pm_netlink.c +3 -5
@@ -1004,7 +1004,6 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,int addrlen =sizeof (struct sockaddr_in );struct sockaddr_storage addr;struct sock *newsk, *ssk; -struct socket *ssock;int backlog =1024 ;int err;
@@ -1030,17 +1029,16 @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk, &mptcp_keys[is_ipv6]);lock_sock (newsk); - ssock =__mptcp_nmpc_socket (mptcp_sk (newsk)); + ssk =__mptcp_nmpc_sk (mptcp_sk (newsk));release_sock (newsk); -if (IS_ERR (ssock)) -return PTR_ERR (ssock); +if (IS_ERR (ssk)) +return PTR_ERR (ssk);mptcp_info2sockaddr (&entry->addr, &addr, entry->addr.family);#if IS_ENABLED (CONFIG_MPTCP_IPV6 )if (entry->addr.family ==AF_INET6 ) addrlen =sizeof (struct sockaddr_in6 );#endif - ssk =mptcp_sk (newsk)->first;if (ssk->sk_family ==AF_INET ) err =inet_bind_sk (ssk, (struct sockaddr *)&addr, addrlen);#if IS_ENABLED (CONFIG_MPTCP_IPV6 )
net/mptcp/protocol.c +15 -25
@@ -108,7 +108,7 @@ static int __mptcp_socket_create(struct mptcp_sock *msk)/* If the MPC handshake is not started, returns the first subflow, * eventually allocating it. */ -struct socket *__mptcp_nmpc_socket (struct mptcp_sock *msk) +struct sock *__mptcp_nmpc_sk (struct mptcp_sock *msk) {struct sock *sk = (struct sock *)msk;int ret;
@@ -116,10 +116,7 @@ struct socket *__mptcp_nmpc_socket(struct mptcp_sock *msk)if (!((1 << sk->sk_state) & (TCPF_CLOSE |TCPF_LISTEN )))return ERR_PTR (-EINVAL ); -if (!msk->subflow) { -if (msk->first) -return ERR_PTR (-EINVAL ); - +if (!msk->first) { ret =__mptcp_socket_create (msk);if (ret)return ERR_PTR (ret);
@@ -127,7 +124,7 @@ struct socket *__mptcp_nmpc_socket(struct mptcp_sock *msk)mptcp_sockopt_sync (msk, msk->first); } -return msk->subflow; +return msk->first; }static void mptcp_drop (struct sock *sk,struct sk_buff *skb)
@@ -1671,7 +1668,6 @@ static int mptcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, {unsigned int saved_flags = msg->msg_flags;struct mptcp_sock *msk =mptcp_sk (sk); -struct socket *ssock;struct sock *ssk;int ret;
@@ -1682,9 +1678,9 @@ static int mptcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,* fastopen attempt, no need to check for additional subflow status. */ if (msg->msg_flags &MSG_FASTOPEN ) { - ssock =__mptcp_nmpc_socket (msk); -if (IS_ERR (ssock)) -return PTR_ERR (ssock); + ssk =__mptcp_nmpc_sk (msk); +if (IS_ERR (ssk)) +return PTR_ERR (ssk); }if (!msk->first)return -EINVAL ;
@@ -3617,16 +3613,14 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) {struct mptcp_subflow_context *subflow;struct mptcp_sock *msk =mptcp_sk (sk); -struct socket *ssock;int err = -EINVAL ;struct sock *ssk; - ssock =__mptcp_nmpc_socket (msk); -if (IS_ERR (ssock)) -return PTR_ERR (ssock); + ssk =__mptcp_nmpc_sk (msk); +if (IS_ERR (ssk)) +return PTR_ERR (ssk);inet_sk_state_store (sk,TCP_SYN_SENT ); - ssk = msk->first; subflow =mptcp_subflow_ctx (ssk);#ifdef CONFIG_TCP_MD5SIG /* no MPTCP if MD5SIG is enabled on this socket or we may run out of
@@ -3724,17 +3718,15 @@ static int mptcp_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) {struct mptcp_sock *msk =mptcp_sk (sock->sk);struct sock *ssk, *sk = sock->sk; -struct socket *ssock;int err = -EINVAL ;lock_sock (sk); - ssock =__mptcp_nmpc_socket (msk); -if (IS_ERR (ssock)) { - err =PTR_ERR (ssock); + ssk =__mptcp_nmpc_sk (msk); +if (IS_ERR (ssk)) { + err =PTR_ERR (ssk); goto unlock; } - ssk = msk->first;if (sk->sk_family ==AF_INET ) err =inet_bind_sk (ssk, uaddr, addr_len);#if IS_ENABLED (CONFIG_MPTCP_IPV6 )
@@ -3753,7 +3745,6 @@ static int mptcp_listen(struct socket *sock, int backlog) {struct mptcp_sock *msk =mptcp_sk (sock->sk);struct sock *sk = sock->sk; -struct socket *ssock;struct sock *ssk;int err;
@@ -3765,13 +3756,12 @@ static int mptcp_listen(struct socket *sock, int backlog)if (sock->state !=SS_UNCONNECTED || sock->type !=SOCK_STREAM ) goto unlock; - ssock =__mptcp_nmpc_socket (msk); -if (IS_ERR (ssock)) { - err =PTR_ERR (ssock); + ssk =__mptcp_nmpc_sk (msk); +if (IS_ERR (ssk)) { + err =PTR_ERR (ssk); goto unlock; } - ssk = msk->first;inet_sk_state_store (sk,TCP_LISTEN );sock_set_flag (sk,SOCK_RCU_FREE );
net/mptcp/protocol.h +1 -1
@@ -636,7 +636,7 @@ void __mptcp_subflow_send_ack(struct sock *ssk);void mptcp_subflow_reset (struct sock *ssk);void mptcp_subflow_queue_clean (struct sock *sk,struct sock *ssk);void mptcp_sock_graft (struct sock *sk,struct socket *parent); -struct socket *__mptcp_nmpc_socket (struct mptcp_sock *msk); +struct sock *__mptcp_nmpc_sk (struct mptcp_sock *msk);bool __mptcp_close (struct sock *sk,long timeout);void mptcp_cancel_work (struct sock *sk);void __mptcp_unaccepted_force_close (struct sock *sk);
net/mptcp/sockopt.c +19 -24
113 lines not on this page · raw message
Signature · 1 line
2.41.0
Paolo Abeni
maintainerPATCH v2 13/13 mptcp: get rid of msk->subflow
In reply to Paolo AbeniSuch field is now unused just as a flag to control the first subflow deletion at close() time. Introduce a new bit flag for that and finally drop the mentioned field.
As an intended side effect, now the first subflow sock is not freed before close() even for passive sockets. The msk has no open/active subflows if the first one is closed and the subflow list is singular, update accordingly the state check in mptcp_stream_accept().
Among other benefits, the subflow removal, reduces the amount of memory used on the client side for each mptcp connection, allows passive sockets to go through successful accept()/disconnect()/connect() and makes return error code consistent for failing both passive and active sockets.
---
v1 -> v2:
- drop unneeded msk->first check in mptcp_accept(), only data corruption could clear that
Side notes:
- syzkaller will be likely happy about the new code path to possibly exploit
- we could possibly avoid allocating the 'socket' struct at __mptcp_subflow_connect() time, but that will require more invasive helpers creation in inet core.
--- net/mptcp/protocol.c | 25 ++++++------------------- net/mptcp/protocol.h | 13 ++++++------- 2 files changed, 12 insertions(+), 26 deletions(-)
net/mptcp/protocol.c +6 -19
@@ -91,7 +91,6 @@ static int __mptcp_socket_create(struct mptcp_sock *msk)return err;WRITE_ONCE (msk->first, ssock->sk); -WRITE_ONCE (msk->subflow, ssock); subflow =mptcp_subflow_ctx (ssock->sk);list_add (&subflow->node, &msk->conn_list);sock_hold (ssock->sk);
@@ -101,6 +100,7 @@ static int __mptcp_socket_create(struct mptcp_sock *msk)/* This is the first subflow, always with id 0 */ subflow->local_id_valid =1 ;mptcp_sock_graft (msk->first, sk->sk_socket); +iput (SOCK_INODE (ssock));return 0 ; }
@@ -2263,14 +2263,6 @@ struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk)return min_stale_count >1 ? backup :NULL ; } -static void mptcp_dispose_initial_subflow (struct mptcp_sock *msk) -{ -if (msk->subflow) { -iput (SOCK_INODE (msk->subflow)); -WRITE_ONCE (msk->subflow,NULL ); - } -} -bool __mptcp_retransmit_pending_data (struct sock *sk) {struct mptcp_data_frag *cur, *rtx_head;
@@ -2349,7 +2341,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, goto out_release; } - dispose_it = !msk->subflow || ssk != msk->subflow->sk; + dispose_it = msk->free_first || ssk != msk->first;if (dispose_it)list_del (&subflow->node);
@@ -2370,7 +2362,6 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,* disconnect should never fail */ WARN_ON_ONCE (tcp_disconnect (ssk,0 )); - msk->subflow->state =SS_UNCONNECTED ;mptcp_subflow_ctx_reset (subflow);release_sock (ssk);
@@ -3147,7 +3138,6 @@ struct sock *mptcp_sk_clone_init(const struct sock *sk, msk =mptcp_sk (nsk); msk->local_key = subflow_req->local_key; msk->token = subflow_req->token; -WRITE_ONCE (msk->subflow,NULL ); msk->in_accept_queue =1 ;WRITE_ONCE (msk->fully_established, false);if (mp_opt->suboptions &OPTION_MPTCP_CSUMREQD )
@@ -3282,10 +3272,8 @@ static void mptcp_destroy(struct sock *sk) {struct mptcp_sock *msk =mptcp_sk (sk); -/* clears msk->subflow, allowing the following to close -* even the initial subflow -*/ -mptcp_dispose_initial_subflow (msk); +/* allow the following to close even the initial subflow */ + msk->free_first =1 ;mptcp_destroy_common (msk,0 );sk_sockets_allocated_dec (sk); }
@@ -3824,11 +3812,10 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,/* Do late cleanup for the first subflow as necessary. Also * deal with bad peers not doing a complete shutdown. */ -if (msk->first && -unlikely (inet_sk_state_load (msk->first) ==TCP_CLOSE )) { +if (unlikely (inet_sk_state_load (msk->first) ==TCP_CLOSE )) {__mptcp_close_ssk (newsk, msk->first,mptcp_subflow_ctx (msk->first),0 ); -if (unlikely (list_empty (&msk->conn_list))) +if (unlikely (list_is_singular (&msk->conn_list)))inet_sk_state_store (newsk,TCP_CLOSE ); } }
net/mptcp/protocol.h +6 -7
@@ -297,7 +297,8 @@ struct mptcp_sock { cork:1, nodelay:1, fastopening:1, - in_accept_queue:1; + in_accept_queue:1, + free_first:1;struct work_struct work;struct sk_buff *ooo_last_skb;struct rb_root out_of_order_queue;
@@ -306,12 +307,10 @@ struct mptcp_sock {struct list_head rtx_queue;struct mptcp_data_frag *first_pending;struct list_head join_list; -struct socket *subflow;/* outgoing connect/listener/!mp_capable -* The mptcp ops can safely dereference, using suitable -* ONCE annotation, the subflow outside the socket -* lock as such sock is freed after close(). -*/ -struct sock *first; +struct sock *first;/* The mptcp ops can safely dereference, using suitable +* ONCE annotation, the subflow outside the socket +* lock as such sock is freed after close(). +*/ struct mptcp_pm_data pm;struct mptcp_sched_ops *sched;struct {
Signature · 1 line
2.41.0
Re: mptcp: get rid of msk->subflow: Tests Results
Hi Paolo,
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):
- Success! ✅:
- Task: https://cirrus-ci.com/task/5305177201180672
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5305177201180672/summary/summary.txt
- KVM Validation: debug (only selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/6149602131312640
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6149602131312640/summary/summary.txt
- KVM Validation: debug (except selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/5023702224470016
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5023702224470016/summary/summary.txt
- KVM Validation: normal (only selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/6431077108023296
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6431077108023296/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/10e01667fb4d
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-debugFor 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 (Tessares)
Quoted 19 lines · Paolo Abeni
The mptcp protocol maintains an additional struct socket per connection, mainly to be able to use easily tcp-level struct socket operations.
That lead to several ill side effects, beyond the quite unfortunate/ confusing field name
- active and passive sockets behavior is incosistent, as only active ones have not NULLmsk->subflow, leading to different error handling (and different error code returned to the user-space) in several places.
- active sockets uses an unneeded, larger amount of memory
- passive sockets can't successfully go through accept()/disconnect()accept()This series address all the above finally getting rid of the blamed field. The first patch is a minor clean-up, in the next 11 patches
msk->subflowusage is sistematically removed from the mptcp protocol, replacing it with directmsk->firstusage, eventually introducing new core helpers as needed.
Quoted 9 lines
The final patch finally dispose the field, and it's the only patch in the series intened to produce functional changes.
v1 -> v2:
- dropped first patch (already applied)
- a bunch of typos and comments, the only patches with code changes are 7/13, 9/13, 13/13, see the individual changelog for the details.
Thanks Paolo, v2 looks good to me.
For the "mptcp: *" patches:
I'll ack the "net: *" patches separately.
- Mat
Quoted 30 lines
Paolo Abeni (13):
mptcp: avoid unneededmptcp_token_destroy()calls
mptcp: avoid additional__inet_stream_connect()call
mptcp: avoid subflow socket usage inmptcp_get_port()
net: factor out inet{,6}_bind_sk helpers
mptcp: mptcp: avoid additional indirection inmptcp_bind()
net: factor out__inet_listen_sk()helper
mptcp: avoid additional indirection inmptcp_listen()
mptcp: avoid additional indirection inmptcp_poll()
mptcp: avoid unneeded indirection inmptcp_stream_accept()
mptcp: avoid additional indirection in sockopt
mptcp: avoid ssock usage inmptcp_pm_nl_create_listen_socket()
mptcp: change the mpc check helper to return a sk
mptcp: get rid ofmsk->subflowinclude/net/inet_common.h | 2 + include/net/ipv6.h | 1 + net/ipv4/af_inet.c | 46 ++++++---- net/ipv6/af_inet6.c | 10 ++- net/mptcp/pm_netlink.c | 30 ++++--- net/mptcp/protocol.c | 177 +++++++++++++++++++------------------- net/mptcp/protocol.h | 15 ++-- net/mptcp/sockopt.c | 65 +++++++------- 8 files changed, 181 insertions(+), 165 deletions(-)Signature · 1 line
2.41.0
Re: [PATCH v2 mptcp-next 04/13] net: factor out inet{,6}_bind_sk helpers
In reply to Paolo AbeniQuoted 11 lines · Paolo Abeni
The mptcp protocol maintains an additional socket just to easily invoke a few stream operations on the first subflow. One of them is
bind().Factor out the helpers operating directly on the struct sock, to allow get rid of the above dependency in the next patch without duplicating the existing code.
No functional changes intended.
Signed-off-by Paolo Abeni <[email protected]>
Quoted 92 lines
---
include/net/inet_common.h | 1 + include/net/ipv6.h | 1 + net/ipv4/af_inet.c | 8 ++++++-- net/ipv6/af_inet6.c | 10 +++++++--- 4 files changed, 15 insertions(+), 5 deletions(-)include/net/inet_common.h +1
-0@@ -42,6 +42,7 @@ int inet_shutdown(struct socket *sock, int how);int inet_listen (struct socket *sock,int backlog);void inet_sock_destruct (struct sock *sk);int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len); +int inet_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len);/* Don't allocate port at this moment, defer to connect. */ #define BIND_FORCE_ADDRESS_NO_PORT (1 << 0)/* Grab and release socket lock. */ include/net/ipv6.h +1
-0@@ -1220,6 +1220,7 @@ void inet6_cleanup_sock(struct sock *sk);void inet6_sock_destruct (struct sock *sk);int inet6_release (struct socket *sock);int inet6_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len); +int inet6_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len);int inet6_getname (struct socket *sock,struct sockaddr *uaddr,int peer);int inet6_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg);net/ipv4/af_inet.c +6
-2@@ -431,9 +431,8 @@ int inet_release(struct socket *sock) }EXPORT_SYMBOL (inet_release); -int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +int inet_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len) { -struct sock *sk = sock->sk;u32 flags =BIND_WITH_LOCK ;int err;@@ -454,6 +453,11 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)return __inet_bind (sk, uaddr, addr_len, flags); } + +int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +{ +return inet_bind_sk (sock->sk, uaddr, addr_len); +}EXPORT_SYMBOL (inet_bind); int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len,net/ipv6/af_inet6.c +7
-3@@ -435,10 +435,8 @@ static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len, goto out; } -/* bind for INET6 API */ -int inet6_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +int inet6_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len) { -struct sock *sk = sock->sk;u32 flags =BIND_WITH_LOCK ;const struct proto *prot;int err =0 ;@@ -462,6 +460,12 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)return __inet6_bind (sk, uaddr, addr_len, flags); } + +/* bind for INET6 API */ +int inet6_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len) +{ +return inet6_bind_sk (sock->sk, uaddr, addr_len); +}EXPORT_SYMBOL (inet6_bind);int inet6_release (struct socket *sock)Signature · 1 line
2.41.0
Re: [PATCH v2 mptcp-next 06/13] net: factor out __inet_listen_sk() helper
In reply to Paolo AbeniQuoted 8 lines · Paolo Abeni
The mptcp protocol maintains an additional socket just to easily invoke a few stream operations on the first subflow. One of them is
inet_listen().Factor out an helper operating directly on the (locked) struct sock, to allow get rid of the above dependency in the next patch without duplicating the existing code.
Quoted 6 lines
No functional changes intended.
Signed-off-by Paolo Abeni <[email protected]>--
v1 -> v2:
- initialize 'err' at definition time (Mat)
Quoted 84 lines
---
include/net/inet_common.h| 1 +net/ipv4/af_inet.c| 38 ++++++++++++++++++++++----------------2 files changed, 23 insertions(+), 16 deletions(-)include/net/inet_common.h +1
-0@@ -40,6 +40,7 @@ int inet_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int flags);int inet_shutdown (struct socket *sock,int how);int inet_listen (struct socket *sock,int backlog); +int __inet_listen_sk (struct sock *sk,int backlog);void inet_sock_destruct (struct sock *sk);int inet_bind (struct socket *sock,struct sockaddr *uaddr,int addr_len);int inet_bind_sk (struct sock *sk,struct sockaddr *uaddr,int addr_len);net/ipv4/af_inet.c +22
-16@@ -187,24 +187,13 @@ static int inet_autobind(struct sock *sk)return 0 ; } -/* -* Move a socket into listening state. -*/ -int inet_listen (struct socket *sock,int backlog) +int __inet_listen_sk (struct sock *sk,int backlog) { -struct sock *sk = sock->sk; -unsigned char old_state; +unsigned char old_state = sk->sk_state;int err, tcp_fastopen; -lock_sock (sk); - - err = -EINVAL ; -if (sock->state !=SS_UNCONNECTED || sock->type !=SOCK_STREAM ) - goto out; - - old_state = sk->sk_state;if (!((1 << old_state) & (TCPF_CLOSE |TCPF_LISTEN ))) - goto out; +return -EINVAL ;WRITE_ONCE (sk->sk_max_ack_backlog, backlog);/* Really, if the socket is already in listen state @@ -227,10 +216,27 @@ int inet_listen(struct socket *sock, int backlog) err =inet_csk_listen_start (sk);if (err) - goto out; +return err; +tcp_call_bpf (sk,BPF_SOCK_OPS_TCP_LISTEN_CB ,0 ,NULL ); } - err =0 ; +return 0 ; +} + +/* +* Move a socket into listening state. +*/ +int inet_listen (struct socket *sock,int backlog) +{ +struct sock *sk = sock->sk; +int err = -EINVAL ; + +lock_sock (sk); + +if (sock->state !=SS_UNCONNECTED || sock->type !=SOCK_STREAM ) + goto out; + + err =__inet_listen_sk (sk, backlog);out:
release_sock(sk);Signature · 1 line
2.41.0
Re: mptcp: get rid of msk->subflow: Tests Results
In reply to Paolo AbeniHi Paolo,
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):
- Success! ✅:
- Task: https://cirrus-ci.com/task/4562317090750464
- Summary: https://api.cirrus-ci.com/v1/artifact/task/4562317090750464/summary/summary.txt
- KVM Validation: normal (only selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/5688216997593088
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5688216997593088/summary/summary.txt
- KVM Validation: debug (only selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/6251166951014400
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6251166951014400/summary/summary.txt
- KVM Validation: debug (except selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/5125267044171776
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5125267044171776/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/3653a7a07506
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-debugFor 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 (Tessares)
Hi Paolo, Mat,
Quoted 13 lines · Paolo Abeni
The mptcp protocol maintains an additional struct socket per connection, mainly to be able to use easily tcp-level struct socket operations.
That lead to several ill side effects, beyond the quite unfortunate/ confusing field name
- active and passive sockets behavior is incosistent, as only active ones have not NULLmsk->subflow, leading to different error handling (and different error code returned to the user-space) in several places.
- active sockets uses an unneeded, larger amount of memory
- passive sockets can't successfully go through accept()/disconnect()accept()
Quoted 8 lines
This series address all the above finally getting rid of the blamed field. The first patch is a minor clean-up, in the next 11 patches
msk->subflowusage is sistematically removed from the mptcp protocol, replacing it with directmsk->firstusage, eventually introducing new core helpers as needed.The final patch finally dispose the field, and it's the only patch in the series intened to produce functional changes.
Thank you for the patches and the reviews!
Now in our tree (feat. for net-next) with Mat's RvB tag:
New patches for t/upstream:
- 26b3767aaa72: mptcp: avoid unneeded mptcp_token_destroy() calls
- ae27baea9cbe: mptcp: avoid additional __inet_stream_connect() call
- c52207f85c8f: mptcp: avoid subflow socket usage in mptcp_get_port()
- a3beb4bf1bf4: net: factor out inet{,6}_bind_sk helpers
- f805626e3cf4: mptcp: mptcp: avoid additional indirection in mptcp_bind()
- 5bbcd109ff64: net: factor out __inet_listen_sk() helper
- 86211f9d790c: mptcp: avoid additional indirection in mptcp_listen()
- 4e7fe9d2245f: mptcp: avoid additional indirection in mptcp_poll()
- 36d4933b1c0a: mptcp: avoid unneeded indirection in mptcp_stream_accept()
- 6684c443b5a9: mptcp: avoid additional indirection in sockopt
- ac388877cff7: mptcp: avoid ssock usage in mptcp_pm_nl_create_listen_socket()
- 3bdc46b9f3dd: mptcp: change the mpc check helper to return a sk
- 0b266479d09c: mptcp: get rid of msk->subflow
- Results: 87ca9f6d4f74..a989acf037d0 (export)
Tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230717T135639
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net