From nobody Mon Sep 16 19:57:24 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D23931F12; Wed, 17 May 2023 19:16:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3A3BC433A0; Wed, 17 May 2023 19:16:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684350994; bh=IOY4w35P1hUP7dCa5bCvMMtraUvTn5g+EzA9MRkHVbI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NQhG6xyaZQeAYi1QeJKehHPIRy+efatwY9ghUL+Bp+Yhe4Jg4k/2HB5uMckZlfXQA wCzaOtnJKc4k7AUwFBJTqGItqU2XyIjmU25f3u0NEW77Tcd3Pkky5eLQwhDwbGcOO7 vXnw8NUW56RcE8d330sMrTr1aJXheIw8TynXOHYGVBmTEP4u07n++T62KN6pmyIlVV Mwy60Z8LS983oa8gIcDX7q2pyz8H6f1pYdB+YL3IsVxBREMlvErtBiL13hMs6ermfB 8mGxDSsT0GsTJSZU53JH3tKNQdiO3Y9tTEqOQLmE9223P8MXxugEX+/mqfgwxRvvrY lCZTFzfCncucw== From: Mat Martineau Date: Wed, 17 May 2023 12:16:15 -0700 Subject: [PATCH net-next 2/5] mptcp: refactor mptcp_stream_accept() Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230516-send-net-next-20220516-v1-2-e91822b7b6e0@kernel.org> References: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> In-Reply-To: <20230516-send-net-next-20220516-v1-0-e91822b7b6e0@kernel.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthieu Baerts Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau X-Mailer: b4 0.12.2 From: Paolo Abeni Rewrite the mptcp socket accept op, leveraging the new __inet_accept() helper. This way we can avoid acquiring the new socket lock twice and we can avoid a couple of indirect calls. Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 08dc53f56bc2..2d331b2d62b7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3747,6 +3747,7 @@ static int mptcp_stream_accept(struct socket *sock, s= truct socket *newsock, { struct mptcp_sock *msk =3D mptcp_sk(sock->sk); struct socket *ssock; + struct sock *newsk; int err; =20 pr_debug("msk=3D%p", msk); @@ -3758,17 +3759,20 @@ static int mptcp_stream_accept(struct socket *sock,= struct socket *newsock, if (!ssock) return -EINVAL; =20 - err =3D ssock->ops->accept(sock, newsock, flags, kern); - if (err =3D=3D 0 && !mptcp_is_tcpsk(newsock->sk)) { - struct mptcp_sock *msk =3D mptcp_sk(newsock->sk); + newsk =3D mptcp_accept(sock->sk, flags, &err, kern); + if (!newsk) + return err; + + lock_sock(newsk); + + __inet_accept(sock, newsock, newsk); + if (!mptcp_is_tcpsk(newsock->sk)) { + struct mptcp_sock *msk =3D mptcp_sk(newsk); struct mptcp_subflow_context *subflow; - struct sock *newsk =3D newsock->sk; =20 set_bit(SOCK_CUSTOM_SOCKOPT, &newsock->flags); msk->in_accept_queue =3D 0; =20 - lock_sock(newsk); - /* set ssk->sk_socket of accept()ed flows to mptcp socket. * This is needed so NOSPACE flag can be set from tcp stack. */ @@ -3789,11 +3793,10 @@ static int mptcp_stream_accept(struct socket *sock,= struct socket *newsock, if (unlikely(list_empty(&msk->conn_list))) inet_sk_state_store(newsk, TCP_CLOSE); } - - release_sock(newsk); } + release_sock(newsk); =20 - return err; + return 0; } =20 static __poll_t mptcp_check_writeable(struct mptcp_sock *msk) --=20 2.40.1