From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99BF111CB0 for ; Fri, 14 Jul 2023 11:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DZQZiIPDlavpQfBnrC6Rc66+z1u60ZGYJd8qeUuRdHA=; b=cG4cSY5IGagV318zeEGcJZolkL6CTStXcyIvGs8EZNsUf04F1CXbZ2Yu/wlEKP89NLH9c+ T6KJkTp9Gpx6ZWdNiNXNdrjhowHN7YEOHdnVR7m79S4kSiGBvXuN1mgmcQ/c7Yww8SuyZc 7slqOjBaibHCnpOChD2F21r1VlcwSjI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-5pJaxtUAMSKm2yYjHSqcxw-1; Fri, 14 Jul 2023 07:29:58 -0400 X-MC-Unique: 5pJaxtUAMSKm2yYjHSqcxw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E8772801CF3 for ; Fri, 14 Jul 2023 11:29:57 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79AF12166B26 for ; Fri, 14 Jul 2023 11:29:57 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 01/13] mptcp: avoid unneeded mptcp_token_destroy() calls Date: Fri, 14 Jul 2023 13:29:32 +0200 Message-ID: <897413a66c948b6a462c8d05e2628b85d58a668b.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 8b5c78f582f7..17174bdae1ca 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3634,7 +3634,6 @@ static int mptcp_connect(struct sock *sk, struct sock= addr *uaddr, int addr_len) if (IS_ERR(ssock)) return PTR_ERR(ssock); =20 - mptcp_token_destroy(msk); inet_sk_state_store(sk, TCP_SYN_SENT); subflow =3D mptcp_subflow_ctx(ssock->sk); #ifdef CONFIG_TCP_MD5SIG @@ -3753,7 +3752,6 @@ static int mptcp_listen(struct socket *sock, int back= log) goto unlock; } =20 - mptcp_token_destroy(msk); inet_sk_state_store(sk, TCP_LISTEN); sock_set_flag(sk, SOCK_RCU_FREE); =20 --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D98111CBC for ; Fri, 14 Jul 2023 11:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ol0Hep/2nAzre6eKlHHvYKy6RWx62u4KDSHiVXrzy/c=; b=CYqhVk4IN3zn4o6y2XSRHpaYqY3T3RjujGnbb2jReaBYH7lbcVeX4TIT1dkPNB05GlC4Rk W//IFSO6R5Y6fxdk3MEZlf+2dx4ptQeAk55O4z0ZRCzTXy3gDW0pUtssX6IDi/UlGjz96z PRufdMsXUbJEmYeUIP8Ky9tQAmhWEXc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-630-373q2NQAONKGxDp1LKpdQw-1; Fri, 14 Jul 2023 07:29:58 -0400 X-MC-Unique: 373q2NQAONKGxDp1LKpdQw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A6441800159 for ; Fri, 14 Jul 2023 11:29:58 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AA702166B25 for ; Fri, 14 Jul 2023 11:29:58 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 02/13] mptcp: avoid additional __inet_stream_connect() call Date: Fri, 14 Jul 2023 13:29:33 +0200 Message-ID: <419f27ff608db6a749476301f6d52703e3666c09.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- 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(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 17174bdae1ca..8eaf19c01c64 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3629,22 +3629,24 @@ static int mptcp_connect(struct sock *sk, struct so= ckaddr *uaddr, int addr_len) struct mptcp_sock *msk =3D mptcp_sk(sk); struct socket *ssock; int err =3D -EINVAL; + struct sock *ssk; =20 ssock =3D __mptcp_nmpc_socket(msk); if (IS_ERR(ssock)) return PTR_ERR(ssock); =20 inet_sk_state_store(sk, TCP_SYN_SENT); - subflow =3D mptcp_subflow_ctx(ssock->sk); + ssk =3D msk->first; + subflow =3D 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 so= ckaddr *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 =3D __inet_stream_connect(ssock, uaddr, addr_len, O_NONBLOCK, 1); - else - err =3D inet_stream_connect(ssock, uaddr, addr_len, O_NONBLOCK); - inet_sk(sk)->defer_connect =3D 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 !=3D TCP_CLOSE) + goto out; + + if (BPF_CGROUP_PRE_CONNECT_ENABLED(ssk)) { + err =3D ssk->sk_prot->pre_connect(ssk, uaddr, addr_len); + if (err) + goto out; + } + + err =3D ssk->sk_prot->connect(ssk, uaddr, addr_len); + if (err < 0) + goto out; + + inet_sk(sk)->defer_connect =3D inet_sk(ssk)->defer_connect; + +out: + if (!msk->fastopening) + release_sock(ssk); =20 /* on successful connect, the msk state will be moved to established by * subflow_finish_connect() */ if (unlikely(err && err !=3D -EINPROGRESS)) { - inet_sk_state_store(sk, inet_sk_state_load(ssock->sk)); + inet_sk_state_store(sk, inet_sk_state_load(ssk)); return err; } =20 - mptcp_copy_inaddrs(sk, ssock->sk); + mptcp_copy_inaddrs(sk, ssk); =20 /* silence EINPROGRESS and let the caller inet_stream_connect * handle the connection in progress --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33AF1125A2 for ; Fri, 14 Jul 2023 11:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7oCiXHlSeCgXFkps8zR82HjhZbnE6ljSkiKnD9X0nrw=; b=FWFR4JjgQ7aIFluiczwDuqs/myd7sRuOMzeiVW6eHhUhmOsC1BydIqClkGmaiuUb2fVADf xwOr0mGCO/CrSlySBzJfZ8gtBqHeFzM1ATjyaJTNAsP0DbUg9SUqKQagLpb5FYxgSfYwsX xR/vVIKJYlz8UYokwP3IIzgx47/SbDw= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-133-msDvRzLFNBO-5c2ndVLxaQ-1; Fri, 14 Jul 2023 07:29:59 -0400 X-MC-Unique: msDvRzLFNBO-5c2ndVLxaQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71B4A3C01E05 for ; Fri, 14 Jul 2023 11:29:59 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id EAC842166B25 for ; Fri, 14 Jul 2023 11:29:58 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 03/13] mptcp: avoid subflow socket usage in mptcp_get_port() Date: Fri, 14 Jul 2023 13:29:34 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" We are going to remove the first subflow socket soon, so avoid accessing it in mptcp_get_port(). Instead, access directly the first subflow sock. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 8eaf19c01c64..ba26c16eaecd 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -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 =3D mptcp_sk(sk); - struct socket *ssock; =20 - ssock =3D msk->subflow; - pr_debug("msk=3D%p, subflow=3D%p", msk, ssock); - if (WARN_ON_ONCE(!ssock)) + pr_debug("msk=3D%p, ssk=3D%p", msk, msk->first); + if (WARN_ON_ONCE(!msk->first)) return -EINVAL; =20 - return inet_csk_get_port(ssock->sk, snum); + return inet_csk_get_port(msk->first, snum); } =20 void mptcp_finish_connect(struct sock *ssk) --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9EEAA6FC8 for ; Fri, 14 Jul 2023 11:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cGxNXb5AAUHd4ml2+3mWQDjJlRRhPEzMsUZG876sX2s=; b=fzs67XzInJTNa9ydHo0Dd71WB/I1y1+auyoRInuJ5NJTnQSiE9m/EwYVVkq2lRRzhflGdf jF70D/rYIrRhloRFyOGiZ5hLK3EXTO4vm3uH+G49+hb94af/9qmRGrSA9Lv5XxuQb6HMcE fDpE1K+nv02bYRvhpCxZdfPiRC5meXg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-145-_y9C9nzAMcGS14JlREtFeA-1; Fri, 14 Jul 2023 07:30:00 -0400 X-MC-Unique: _y9C9nzAMcGS14JlREtFeA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32829805C10 for ; Fri, 14 Jul 2023 11:30:00 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id B64662166B25 for ; Fri, 14 Jul 2023 11:29:59 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 04/13] net: factor out inet{,6}_bind_sk helpers Date: Fri, 14 Jul 2023 13:29:35 +0200 Message-ID: <0ae88674cecce303698c169be39bdeefe27e9232.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Acked-by: Mat Martineau Reviewed-by: Mat Martineau --- 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(-) diff --git a/include/net/inet_common.h b/include/net/inet_common.h index b86b8e21de7f..8e97de700991 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -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. */ diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 7332296eca44..af761504e2f6 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -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); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 9b2ca2fcc5a1..2fd23437c1d2 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -431,9 +431,8 @@ int inet_release(struct socket *sock) } EXPORT_SYMBOL(inet_release); =20 -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 =3D sock->sk; u32 flags =3D BIND_WITH_LOCK; int err; =20 @@ -454,6 +453,11 @@ int inet_bind(struct socket *sock, struct sockaddr *ua= ddr, int addr_len) =20 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); =20 int __inet_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len, diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 5d593ddc0347..d68959434256 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -435,10 +435,8 @@ static int __inet6_bind(struct sock *sk, struct sockad= dr *uaddr, int addr_len, goto out; } =20 -/* 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 =3D sock->sk; u32 flags =3D BIND_WITH_LOCK; const struct proto *prot; int err =3D 0; @@ -462,6 +460,12 @@ int inet6_bind(struct socket *sock, struct sockaddr *u= addr, int addr_len) =20 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); =20 int inet6_release(struct socket *sock) --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8454211CB0 for ; Fri, 14 Jul 2023 11:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YiZ9nlVq4YyNofryNWObarf1zFadP9clDs7hnCHD2hU=; b=Mecss/1Yk9NdP6S8yyIVe+LocJlZ/OPeNvoDKG32hjmn53QzknDccHZJlif28WIZVKg3cb xwcn/LHzlFq7UbbEmEcDhonpYtaDVPjAq42ZyDHTUnOoHUSeAw4aSABgv41hOjwMssDDJI iBkZU6kwIV0iqa/LwVID14C09kzFvRg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622--ScGw_vsOECM3Pm57TdGNA-1; Fri, 14 Jul 2023 07:30:01 -0400 X-MC-Unique: -ScGw_vsOECM3Pm57TdGNA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E740E1011573 for ; Fri, 14 Jul 2023 11:30:00 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77DFA2166B27 for ; Fri, 14 Jul 2023 11:30:00 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 05/13] mptcp: mptcp: avoid additional indirection in mptcp_bind() Date: Fri, 14 Jul 2023 13:29:36 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" We 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ba26c16eaecd..fa62e6d2d1ac 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3731,22 +3731,29 @@ static struct proto mptcp_prot =3D { static int mptcp_bind(struct socket *sock, struct sockaddr *uaddr, int add= r_len) { struct mptcp_sock *msk =3D mptcp_sk(sock->sk); + struct sock *ssk, *sk =3D sock->sk; struct socket *ssock; - int err; + int err =3D -EINVAL; =20 - lock_sock(sock->sk); + lock_sock(sk); ssock =3D __mptcp_nmpc_socket(msk); if (IS_ERR(ssock)) { err =3D PTR_ERR(ssock); goto unlock; } =20 - err =3D ssock->ops->bind(ssock, uaddr, addr_len); + ssk =3D msk->first; + if (sk->sk_family =3D=3D AF_INET) + err =3D inet_bind_sk(ssk, uaddr, addr_len); +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + else if (sk->sk_family =3D=3D AF_INET6) + err =3D inet6_bind_sk(ssk, uaddr, addr_len); +#endif if (!err) - mptcp_copy_inaddrs(sock->sk, ssock->sk); + mptcp_copy_inaddrs(sk, ssk); =20 unlock: - release_sock(sock->sk); + release_sock(sk); return err; } =20 --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54AE16FC8 for ; Fri, 14 Jul 2023 11:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y2kHJu+C8C/YLVNX0pTR7RJqPWh/16kVNroHRzpb05k=; b=ZcclEBFrqb2U26VWPKzD7nu5mq06Slr4ipum7drdeXXTQoIYyAV57w4XAqYRfqr+0TYlbt RyTAEHttEAp4A4Pj3ElxCZuYWCtvrdDKqNllU6Ki70ygF63nbS/0yK+YfWtzJGcHJdkzBI TQYv+dy8X51KFOChJjFQD2JczE8xSzg= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-82-RDSo3-QzPE6wzoyh4uNC0g-1; Fri, 14 Jul 2023 07:30:01 -0400 X-MC-Unique: RDSo3-QzPE6wzoyh4uNC0g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A9C803C01E08 for ; Fri, 14 Jul 2023 11:30:01 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37E8A2166B25 for ; Fri, 14 Jul 2023 11:30:01 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 06/13] net: factor out __inet_listen_sk() helper Date: Fri, 14 Jul 2023 13:29:37 +0200 Message-ID: <5ed59fdc8730f5a559f126b9f78fcdf2ef64d1ce.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" 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. No functional changes intended. Signed-off-by: Paolo Abeni -- v1 -> v2: - initialize 'err' at definition time (Mat) Acked-by: Mat Martineau Reviewed-by: Mat Martineau --- include/net/inet_common.h | 1 + net/ipv4/af_inet.c | 38 ++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/include/net/inet_common.h b/include/net/inet_common.h index 8e97de700991..f50a644d87a9 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -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); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 2fd23437c1d2..c59da65f19d2 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -187,24 +187,13 @@ static int inet_autobind(struct sock *sk) return 0; } =20 -/* - * 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 =3D sock->sk; - unsigned char old_state; + unsigned char old_state =3D sk->sk_state; int err, tcp_fastopen; =20 - lock_sock(sk); - - err =3D -EINVAL; - if (sock->state !=3D SS_UNCONNECTED || sock->type !=3D SOCK_STREAM) - goto out; - - old_state =3D sk->sk_state; if (!((1 << old_state) & (TCPF_CLOSE | TCPF_LISTEN))) - goto out; + return -EINVAL; =20 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) =20 err =3D inet_csk_listen_start(sk); if (err) - goto out; + return err; + tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_LISTEN_CB, 0, NULL); } - err =3D 0; + return 0; +} + +/* + * Move a socket into listening state. + */ +int inet_listen(struct socket *sock, int backlog) +{ + struct sock *sk =3D sock->sk; + int err =3D -EINVAL; + + lock_sock(sk); + + if (sock->state !=3D SS_UNCONNECTED || sock->type !=3D SOCK_STREAM) + goto out; + + err =3D __inet_listen_sk(sk, backlog); =20 out: release_sock(sk); --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45BD76FC8 for ; Fri, 14 Jul 2023 11:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4SaSXFic5JPrABMsbLBxiXqzTD9bnvv3Y577KQqkdTA=; b=Jn2AAQ6gdijJAS0hswHcOFta5SUdpmOhctJpN21EE04WGWkD0kJkWL06p1ecJ6UeO0sfeo 1Jb92O18u/vqJJ6XBMb0skTD2grzNT1tHK2K6SneHYf/uMoFMR0JXs4a0R8xc476aSnb9j TsLX+2PBPcRxxzvctHrFzWGpqe4U4TY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-16-SzYwif6xNKKkm1kmUdpmOw-1; Fri, 14 Jul 2023 07:30:02 -0400 X-MC-Unique: SzYwif6xNKKkm1kmUdpmOw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 693608D1684 for ; Fri, 14 Jul 2023 11:30:02 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC9672166B26 for ; Fri, 14 Jul 2023 11:30:01 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 07/13] mptcp: avoid additional indirection in mptcp_listen() Date: Fri, 14 Jul 2023 13:29:38 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" We 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- 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(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fa62e6d2d1ac..4d9775f45dd6 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3762,6 +3762,7 @@ static int mptcp_listen(struct socket *sock, int back= log) struct mptcp_sock *msk =3D mptcp_sk(sock->sk); struct sock *sk =3D sock->sk; struct socket *ssock; + struct sock *ssk; int err; =20 pr_debug("msk=3D%p", msk); @@ -3778,15 +3779,19 @@ static int mptcp_listen(struct socket *sock, int ba= cklog) goto unlock; } =20 + ssk =3D msk->first; inet_sk_state_store(sk, TCP_LISTEN); sock_set_flag(sk, SOCK_RCU_FREE); =20 - err =3D ssock->ops->listen(ssock, backlog); - inet_sk_state_store(sk, inet_sk_state_load(ssock->sk)); + lock_sock(ssk); + err =3D __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); } =20 unlock: --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A57D311CB0 for ; Fri, 14 Jul 2023 11:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R/viohNaCGpZg6Ug7HQvJkvWKxqGxBc1fzuotFp8KL4=; b=QVdDdK2eloA9AruVIzRnzQ5WNDjFS9yObEZsRfRIxtkY+HLJ9OSzraoDtnDSv7Mu2fsRJ/ clUojfLMwdSN0Fc+uNd1p5nAB8ofdO3RL7DVDMXVe9SmKgMCq4RHIgy2pdrTc0kaADM6S+ RoM42GU4M7DBkIcR0TzIv4qVZaXApBo= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-136-V_I5lMoiMxyLFZGVapldew-1; Fri, 14 Jul 2023 07:30:03 -0400 X-MC-Unique: V_I5lMoiMxyLFZGVapldew-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2B2DF3C01D8C for ; Fri, 14 Jul 2023 11:30:03 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE27C2166B25 for ; Fri, 14 Jul 2023 11:30:02 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 08/13] mptcp: avoid additional indirection in mptcp_poll() Date: Fri, 14 Jul 2023 13:29:39 +0200 Message-ID: <911ac5beb00f45e6c63764a01507ad9164e55d5d.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" We 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4d9775f45dd6..bed379bea8e3 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3886,12 +3886,12 @@ static __poll_t mptcp_poll(struct file *file, struc= t socket *sock, state =3D inet_sk_state_load(sk); pr_debug("msk=3D%p state=3D%d flags=3D%lx", msk, state, msk->flags); if (state =3D=3D TCP_LISTEN) { - struct socket *ssock =3D READ_ONCE(msk->subflow); + struct sock *ssk =3D READ_ONCE(msk->first); =20 - if (WARN_ON_ONCE(!ssock || !ssock->sk)) + if (WARN_ON_ONCE(!ssk)) return 0; =20 - return inet_csk_listen_poll(ssock->sk); + return inet_csk_listen_poll(ssk); } =20 shutdown =3D READ_ONCE(sk->sk_shutdown); --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 527E1125AA for ; Fri, 14 Jul 2023 11:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oW/3/VAyLX4PVQgaYKd3zEporKJgsSAzMh9yP7KMWBo=; b=C28bP1bKoZjWH4d+/oCTEW7503Wf/LUsDnXpWgE20GXt+YVYJGr9IPz/s2fUuTy79S4nZk dfyy/VjMsvNvbLxu4NfEOGLuuOflldSVBBgJftlUTgjV6kZDGwWT2H+9GX2VRtjSI5AiUe Jxyr5B7zpiRdeIUuoy2yHUiyBe0eJHQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-461-3FirrM1iMTmxeepKqHAzfQ-1; Fri, 14 Jul 2023 07:30:04 -0400 X-MC-Unique: 3FirrM1iMTmxeepKqHAzfQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E046680123E for ; Fri, 14 Jul 2023 11:30:03 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EB2D2166B25 for ; Fri, 14 Jul 2023 11:30:03 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 09/13] mptcp: avoid unneeded indirection in mptcp_stream_accept() Date: Fri, 14 Jul 2023 13:29:40 +0200 Message-ID: <0641bf5383a1af49107c8f61ed667223f8c216e9.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" We 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- 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(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index bed379bea8e3..dbc17fdac0ef 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3216,25 +3216,17 @@ void mptcp_rcv_space_init(struct mptcp_sock *msk, c= onst struct sock *ssk) WRITE_ONCE(msk->wnd_end, msk->snd_nxt + tcp_sk(ssk)->snd_wnd); } =20 -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 =3D mptcp_sk(sk); - struct socket *listener; struct sock *newsk; =20 - listener =3D READ_ONCE(msk->subflow); - if (WARN_ON_ONCE(!listener)) { - *err =3D -EINVAL; - return NULL; - } - - pr_debug("msk=3D%p, listener=3D%p", msk, mptcp_subflow_ctx(listener->sk)); - newsk =3D inet_csk_accept(listener->sk, flags, err, kern); + pr_debug("ssk=3D%p, listener=3D%p", ssk, mptcp_subflow_ctx(ssk)); + newsk =3D inet_csk_accept(ssk, flags, err, kern); if (!newsk) return NULL; =20 - pr_debug("msk=3D%p, subflow is mptcp=3D%d", msk, sk_is_mptcp(newsk)); + pr_debug("newsk=3D%p, subflow is mptcp=3D%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, } =20 newsk =3D 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); } =20 @@ -3803,8 +3795,7 @@ static int mptcp_stream_accept(struct socket *sock, s= truct socket *newsock, int flags, bool kern) { struct mptcp_sock *msk =3D mptcp_sk(sock->sk); - struct socket *ssock; - struct sock *newsk; + struct sock *ssk, *newsk; int err; =20 pr_debug("msk=3D%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 =3D READ_ONCE(msk->subflow); - if (!ssock) + ssk =3D READ_ONCE(msk->first); + if (!ssk) return -EINVAL; =20 - newsk =3D mptcp_accept(sock->sk, flags, &err, kern); + newsk =3D mptcp_accept(ssk, flags, &err, kern); if (!newsk) return err; =20 --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDC1D125AB for ; Fri, 14 Jul 2023 11:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=poKr2f2/qEoyTf7d74omHVhbHOtl16PWzdzTg3K1zWw=; b=iFRtZYJn01DaYvQ8sz2fA/ZjBQ+dDLffkKp5abK7zOanMIHTAA0FIHOuAzZHRigrLsaInj hxq6ew0Op0hR0FuWbn0dnfCSZKK9JNtp60b4sbmDFSSQiNWT1WWI7ZX1npCyViNTuPHxf3 E1a7Lmh0L4taMWIQWlLCfqvvA4UqFsc= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-198-xWzuf4V8OiG1HJTlgLMsvw-1; Fri, 14 Jul 2023 07:30:04 -0400 X-MC-Unique: xWzuf4V8OiG1HJTlgLMsvw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A1104381495A for ; Fri, 14 Jul 2023 11:30:04 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FD592166B25 for ; Fri, 14 Jul 2023 11:30:04 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 10/13] mptcp: avoid additional indirection in sockopt Date: Fri, 14 Jul 2023 13:29:41 +0200 Message-ID: <6ffa0a931ffb77654dd55fc80bdc1b59f7788f3d.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/sockopt.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 63f7a09335c5..348475dcbc23 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -293,6 +293,7 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_soc= k *msk, int optname, { struct sock *sk =3D (struct sock *)msk; struct socket *ssock; + struct sock *ssk; int ret; =20 switch (optname) { @@ -307,16 +308,17 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_s= ock *msk, int optname, return PTR_ERR(ssock); } =20 - ret =3D sock_setsockopt(ssock, SOL_SOCKET, optname, optval, optlen); + ssk =3D msk->first; + ret =3D sk_setsockopt(ssk, SOL_SOCKET, optname, optval, optlen); if (ret =3D=3D 0) { if (optname =3D=3D SO_REUSEPORT) - sk->sk_reuseport =3D ssock->sk->sk_reuseport; + sk->sk_reuseport =3D ssk->sk_reuseport; else if (optname =3D=3D SO_REUSEADDR) - sk->sk_reuse =3D ssock->sk->sk_reuse; + sk->sk_reuse =3D ssk->sk_reuse; else if (optname =3D=3D SO_BINDTODEVICE) - sk->sk_bound_dev_if =3D ssock->sk->sk_bound_dev_if; + sk->sk_bound_dev_if =3D ssk->sk_bound_dev_if; else if (optname =3D=3D SO_BINDTOIFINDEX) - sk->sk_bound_dev_if =3D ssock->sk->sk_bound_dev_if; + sk->sk_bound_dev_if =3D 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 =3D (struct sock *)msk; int ret =3D -EOPNOTSUPP; struct socket *ssock; + struct sock *ssk; =20 switch (optname) { case IPV6_V6ONLY: @@ -403,7 +406,8 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk, = int optname, return PTR_ERR(ssock); } =20 - ret =3D tcp_setsockopt(ssock->sk, SOL_IPV6, optname, optval, optlen); + ssk =3D msk->first; + ret =3D tcp_setsockopt(ssk, SOL_IPV6, optname, optval, optlen); if (ret !=3D 0) { release_sock(sk); return ret; @@ -413,13 +417,13 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk= , int optname, =20 switch (optname) { case IPV6_V6ONLY: - sk->sk_ipv6only =3D ssock->sk->sk_ipv6only; + sk->sk_ipv6only =3D ssk->sk_ipv6only; break; case IPV6_TRANSPARENT: - inet_sk(sk)->transparent =3D inet_sk(ssock->sk)->transparent; + inet_sk(sk)->transparent =3D inet_sk(ssk)->transparent; break; case IPV6_FREEBIND: - inet_sk(sk)->freebind =3D inet_sk(ssock->sk)->freebind; + inet_sk(sk)->freebind =3D inet_sk(ssk)->freebind; break; } =20 @@ -700,7 +704,7 @@ static int mptcp_setsockopt_sol_ip_set_transparent(stru= ct mptcp_sock *msk, int o return PTR_ERR(ssock); } =20 - issk =3D inet_sk(ssock->sk); + issk =3D inet_sk(msk->first); =20 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 =3D (struct sock *)msk; struct socket *ssock; - int ret; struct sock *ssk; + int ret; =20 lock_sock(sk); ssk =3D msk->first; @@ -881,7 +885,7 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int goto out; } =20 - ret =3D tcp_getsockopt(ssock->sk, level, optname, optval, optlen); + ret =3D tcp_getsockopt(ssk, level, optname, optval, optlen); =20 out: release_sock(sk); --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F2D211CB0 for ; Fri, 14 Jul 2023 11:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=joBGKcUdoUahqUpfr7bFbYlaoHLCEnUeJd+IkRK8ZAY=; b=PCUnSHepBy6+YFSe7PXLXiOrA46RhKCqugZ82W6IHFG9XQpOM9jJk2dll6Z/3xAlYTDdsr q+IGN0ys+gnF8wDSAbUSsNWCLhPIjc7gbozx24y6OCKpzzBMxK5/WoLMycIIYR9wiOI9Aa gfOGL8UwZ0gD+0rK+zSSFB7E6kL/k9U= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-190-eKdOk39JMC2_kLkEWqPtRA-1; Fri, 14 Jul 2023 07:30:05 -0400 X-MC-Unique: eKdOk39JMC2_kLkEWqPtRA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62E71281BDCA for ; Fri, 14 Jul 2023 11:30:05 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id E40A12166B25 for ; Fri, 14 Jul 2023 11:30:04 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 11/13] mptcp: avoid ssock usage in mptcp_pm_nl_create_listen_socket() Date: Fri, 14 Jul 2023 13:29:42 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" This 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/pm_netlink.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 3be32f134d2a..b939e442477a 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -1002,8 +1003,8 @@ static int mptcp_pm_nl_create_listen_socket(struct so= ck *sk, bool is_ipv6 =3D sk->sk_family =3D=3D AF_INET6; int addrlen =3D sizeof(struct sockaddr_in); struct sockaddr_storage addr; + struct sock *newsk, *ssk; struct socket *ssock; - struct sock *newsk; int backlog =3D 1024; int err; =20 @@ -1039,18 +1040,23 @@ static int mptcp_pm_nl_create_listen_socket(struct = sock *sk, if (entry->addr.family =3D=3D AF_INET6) addrlen =3D sizeof(struct sockaddr_in6); #endif - err =3D kernel_bind(ssock, (struct sockaddr *)&addr, addrlen); + ssk =3D mptcp_sk(newsk)->first; + if (ssk->sk_family =3D=3D AF_INET) + err =3D inet_bind_sk(ssk, (struct sockaddr *)&addr, addrlen); +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + else if (ssk->sk_family =3D=3D AF_INET6) + err =3D inet6_bind_sk(ssk, (struct sockaddr *)&addr, addrlen); +#endif if (err) return err; =20 inet_sk_state_store(newsk, TCP_LISTEN); - err =3D kernel_listen(ssock, backlog); - if (err) - return err; - - mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); - - return 0; + lock_sock(ssk); + err =3D __inet_listen_sk(ssk, backlog); + if (!err) + mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CREATED); + release_sock(ssk); + return err; } =20 int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_inf= o *skc) --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5E9411CBC for ; Fri, 14 Jul 2023 11:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V9QsJgvZDYs/XVLTfaGLB7/pV8l+Qvhr3aU/ISUo/bQ=; b=fdh1JQdd+DfvVr72s4LeGmOXo44D8FDU+0o/V93CO2myhLwnPyt2fC7VFOHnI1v0w5P6HL 6Yz8Q/q/snfxUPFhVgJZIXyGH6FPdOyAjF5G4eVVSIk0ZgzKLgyl53Vdkb6iXGoNs/+0hr 7zY29XwstUXVMWTXvBc4CdQAaIYqebc= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-311-dzlRzrpNPFasN_iLTgDYDA-1; Fri, 14 Jul 2023 07:30:06 -0400 X-MC-Unique: dzlRzrpNPFasN_iLTgDYDA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 235B2381495B for ; Fri, 14 Jul 2023 11:30:06 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id A64932166B25 for ; Fri, 14 Jul 2023 11:30:05 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 12/13] mptcp: change the mpc check helper to return a sk Date: Fri, 14 Jul 2023 13:29:43 +0200 Message-ID: <739a0a577cbf621e2132e1003e597c47eaf1f05c.1689334116.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" After 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- 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(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index b939e442477a..9661f3812682 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1004,7 +1004,6 @@ static int mptcp_pm_nl_create_listen_socket(struct so= ck *sk, int addrlen =3D sizeof(struct sockaddr_in); struct sockaddr_storage addr; struct sock *newsk, *ssk; - struct socket *ssock; int backlog =3D 1024; int err; =20 @@ -1030,17 +1029,16 @@ static int mptcp_pm_nl_create_listen_socket(struct = sock *sk, &mptcp_keys[is_ipv6]); =20 lock_sock(newsk); - ssock =3D __mptcp_nmpc_socket(mptcp_sk(newsk)); + ssk =3D __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); =20 mptcp_info2sockaddr(&entry->addr, &addr, entry->addr.family); #if IS_ENABLED(CONFIG_MPTCP_IPV6) if (entry->addr.family =3D=3D AF_INET6) addrlen =3D sizeof(struct sockaddr_in6); #endif - ssk =3D mptcp_sk(newsk)->first; if (ssk->sk_family =3D=3D AF_INET) err =3D inet_bind_sk(ssk, (struct sockaddr *)&addr, addrlen); #if IS_ENABLED(CONFIG_MPTCP_IPV6) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index dbc17fdac0ef..47079c257e52 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -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 =3D (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); =20 - if (!msk->subflow) { - if (msk->first) - return ERR_PTR(-EINVAL); - + if (!msk->first) { ret =3D __mptcp_socket_create(msk); if (ret) return ERR_PTR(ret); @@ -127,7 +124,7 @@ struct socket *__mptcp_nmpc_socket(struct mptcp_sock *m= sk) mptcp_sockopt_sync(msk, msk->first); } =20 - return msk->subflow; + return msk->first; } =20 static void mptcp_drop(struct sock *sk, struct sk_buff *skb) @@ -1671,7 +1668,6 @@ static int mptcp_sendmsg_fastopen(struct sock *sk, st= ruct msghdr *msg, { unsigned int saved_flags =3D msg->msg_flags; struct mptcp_sock *msk =3D mptcp_sk(sk); - struct socket *ssock; struct sock *ssk; int ret; =20 @@ -1682,9 +1678,9 @@ static int mptcp_sendmsg_fastopen(struct sock *sk, st= ruct msghdr *msg, * fastopen attempt, no need to check for additional subflow status. */ if (msg->msg_flags & MSG_FASTOPEN) { - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) - return PTR_ERR(ssock); + ssk =3D __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 so= ckaddr *uaddr, int addr_len) { struct mptcp_subflow_context *subflow; struct mptcp_sock *msk =3D mptcp_sk(sk); - struct socket *ssock; int err =3D -EINVAL; struct sock *ssk; =20 - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) - return PTR_ERR(ssock); + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) + return PTR_ERR(ssk); =20 inet_sk_state_store(sk, TCP_SYN_SENT); - ssk =3D msk->first; subflow =3D 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 s= ockaddr *uaddr, int addr_len) { struct mptcp_sock *msk =3D mptcp_sk(sock->sk); struct sock *ssk, *sk =3D sock->sk; - struct socket *ssock; int err =3D -EINVAL; =20 lock_sock(sk); - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) { - err =3D PTR_ERR(ssock); + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) { + err =3D PTR_ERR(ssk); goto unlock; } =20 - ssk =3D msk->first; if (sk->sk_family =3D=3D AF_INET) err =3D 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 back= log) { struct mptcp_sock *msk =3D mptcp_sk(sock->sk); struct sock *sk =3D sock->sk; - struct socket *ssock; struct sock *ssk; int err; =20 @@ -3765,13 +3756,12 @@ static int mptcp_listen(struct socket *sock, int ba= cklog) if (sock->state !=3D SS_UNCONNECTED || sock->type !=3D SOCK_STREAM) goto unlock; =20 - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) { - err =3D PTR_ERR(ssock); + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) { + err =3D PTR_ERR(ssk); goto unlock; } =20 - ssk =3D msk->first; inet_sk_state_store(sk, TCP_LISTEN); sock_set_flag(sk, SOCK_RCU_FREE); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bb4d50c8c398..c26587fd7d50 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -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); diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 348475dcbc23..91ee1aa2284e 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -292,7 +292,6 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_soc= k *msk, int optname, sockptr_t optval, unsigned int optlen) { struct sock *sk =3D (struct sock *)msk; - struct socket *ssock; struct sock *ssk; int ret; =20 @@ -302,13 +301,12 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_s= ock *msk, int optname, case SO_BINDTODEVICE: case SO_BINDTOIFINDEX: lock_sock(sk); - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) { + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) { release_sock(sk); - return PTR_ERR(ssock); + return PTR_ERR(ssk); } =20 - ssk =3D msk->first; ret =3D sk_setsockopt(ssk, SOL_SOCKET, optname, optval, optlen); if (ret =3D=3D 0) { if (optname =3D=3D SO_REUSEPORT) @@ -392,7 +390,6 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk, = int optname, { struct sock *sk =3D (struct sock *)msk; int ret =3D -EOPNOTSUPP; - struct socket *ssock; struct sock *ssk; =20 switch (optname) { @@ -400,13 +397,12 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk= , int optname, case IPV6_TRANSPARENT: case IPV6_FREEBIND: lock_sock(sk); - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) { + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) { release_sock(sk); - return PTR_ERR(ssock); + return PTR_ERR(ssk); } =20 - ssk =3D msk->first; ret =3D tcp_setsockopt(ssk, SOL_IPV6, optname, optval, optlen); if (ret !=3D 0) { release_sock(sk); @@ -689,7 +685,7 @@ static int mptcp_setsockopt_sol_ip_set_transparent(stru= ct mptcp_sock *msk, int o { struct sock *sk =3D (struct sock *)msk; struct inet_sock *issk; - struct socket *ssock; + struct sock *ssk; int err; =20 err =3D ip_setsockopt(sk, SOL_IP, optname, optval, optlen); @@ -698,13 +694,13 @@ static int mptcp_setsockopt_sol_ip_set_transparent(st= ruct mptcp_sock *msk, int o =20 lock_sock(sk); =20 - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) { + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) { release_sock(sk); - return PTR_ERR(ssock); + return PTR_ERR(ssk); } =20 - issk =3D inet_sk(msk->first); + issk =3D inet_sk(ssk); =20 switch (optname) { case IP_FREEBIND: @@ -767,18 +763,18 @@ static int mptcp_setsockopt_first_sf_only(struct mptc= p_sock *msk, int level, int sockptr_t optval, unsigned int optlen) { struct sock *sk =3D (struct sock *)msk; - struct socket *sock; + struct sock *ssk; int ret; =20 /* Limit to first subflow, before the connection establishment */ lock_sock(sk); - sock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(sock)) { - ret =3D PTR_ERR(sock); + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) { + ret =3D PTR_ERR(ssk); goto unlock; } =20 - ret =3D tcp_setsockopt(sock->sk, level, optname, optval, optlen); + ret =3D tcp_setsockopt(ssk, level, optname, optval, optlen); =20 unlock: release_sock(sk); @@ -868,7 +864,6 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int char __user *optval, int __user *optlen) { struct sock *sk =3D (struct sock *)msk; - struct socket *ssock; struct sock *ssk; int ret; =20 @@ -879,9 +874,9 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int goto out; } =20 - ssock =3D __mptcp_nmpc_socket(msk); - if (IS_ERR(ssock)) { - ret =3D PTR_ERR(ssock); + ssk =3D __mptcp_nmpc_sk(msk); + if (IS_ERR(ssk)) { + ret =3D PTR_ERR(ssk); goto out; } =20 --=20 2.41.0 From nobody Wed May 22 02:41:50 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AF1211CB0 for ; Fri, 14 Jul 2023 11:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689334208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T/+CyuAFUsS2dG9VT2iSfjbZNq5NHronoP47JWA+POk=; b=g8S9jMR91L6MybNCt/Frigkitb95NPNoTJyfdRJykK0XB1bN4h02AEA7y58B+DIVjTiLFD sYVvg2KDLWU+uQWuuEeMvxJX/FJQNmTmRcTmbEfmuCeTUgbtm1paIhZZQDrxEx8+XBSDOU NyB1g1sjsaMFQVLVtx4wRz5D1OlMbJc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-304-0d6X0chAMfentq22topuIA-1; Fri, 14 Jul 2023 07:30:07 -0400 X-MC-Unique: 0d6X0chAMfentq22topuIA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D82B5185A792 for ; Fri, 14 Jul 2023 11:30:06 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66F5E2166B25 for ; Fri, 14 Jul 2023 11:30:06 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v2 mptcp-next 13/13] mptcp: get rid of msk->subflow Date: Fri, 14 Jul 2023 13:29:44 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Such 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. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- 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(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 47079c257e52..9f00a0288a0a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -91,7 +91,6 @@ static int __mptcp_socket_create(struct mptcp_sock *msk) return err; =20 WRITE_ONCE(msk->first, ssock->sk); - WRITE_ONCE(msk->subflow, ssock); subflow =3D 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 =3D 1; mptcp_sock_graft(msk->first, sk->sk_socket); + iput(SOCK_INODE(ssock)); =20 return 0; } @@ -2263,14 +2263,6 @@ struct sock *mptcp_subflow_get_retrans(struct mptcp_= sock *msk) return min_stale_count > 1 ? backup : NULL; } =20 -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; } =20 - dispose_it =3D !msk->subflow || ssk !=3D msk->subflow->sk; + dispose_it =3D msk->free_first || ssk !=3D msk->first; if (dispose_it) list_del(&subflow->node); =20 @@ -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 =3D SS_UNCONNECTED; mptcp_subflow_ctx_reset(subflow); release_sock(ssk); =20 @@ -3147,7 +3138,6 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, msk =3D mptcp_sk(nsk); msk->local_key =3D subflow_req->local_key; msk->token =3D subflow_req->token; - WRITE_ONCE(msk->subflow, NULL); msk->in_accept_queue =3D 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 =3D mptcp_sk(sk); =20 - /* 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 =3D 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) =3D=3D TCP_CLOSE)) { + if (unlikely(inet_sk_state_load(msk->first) =3D=3D 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); } } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c26587fd7d50..1b4457c44fe8 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -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 suitab= le + * 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 { --=20 2.41.0