From nobody Fri Dec 19 20:26:48 2025 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 694E11FB6 for ; Tue, 17 Jan 2023 07:37:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673941042; 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=7L11CLY7hRFXPUClesgTsdftxeVUVk9UeBNwXIYWbmM=; b=Q1gp2UjQACV/NimzmxuDdarHiVKY+rW4vN61/tH2a2GvIPZltD/P6nMXOHnDvBMta4hd4C Xuf0N3nmuvF5uU2Gr3JxvVT3smUiohGxFgbemXYiEt2ik1QbPtVA2e1s763bQCFZzpQqcG IZ511VjPCXeCcqBx0ir8lNqJv7t0bW0= 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-338-3gJmsd4yMlOpe4u7cpEZRg-1; Tue, 17 Jan 2023 02:37:21 -0500 X-MC-Unique: 3gJmsd4yMlOpe4u7cpEZRg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF752858F09 for ; Tue, 17 Jan 2023 07:37:20 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C51A40C2006 for ; Tue, 17 Jan 2023 07:37:20 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 11/13] mptcp: refactor mptcp_stream_accept() Date: Tue, 17 Jan 2023 08:36:31 +0100 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.1 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" Rewrite the mptcp socket accept op, partially open-codying inet_accept(), instead of indirectly calling it. 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 --- net/mptcp/protocol.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index f742d558a1b8..cf161deb64d8 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3748,6 +3748,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); @@ -3759,16 +3760,26 @@ 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); + + sock_rps_record_flow(newsk); + WARN_ON(!((1 << newsk->sk_state) & + (TCPF_ESTABLISHED | TCPF_SYN_RECV | + TCPF_CLOSE_WAIT | TCPF_CLOSE))); + + sock_graft(newsk, newsock); + + newsock->state =3D SS_CONNECTED; + 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); =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. */ @@ -3778,10 +3789,10 @@ static int mptcp_stream_accept(struct socket *sock,= struct socket *newsock, if (!ssk->sk_socket) mptcp_sock_graft(ssk, newsock); } - release_sock(newsk); } + release_sock(newsk); =20 - return err; + return 0; } =20 static __poll_t mptcp_check_writeable(struct mptcp_sock *msk) --=20 2.39.0