From patchwork Wed Sep 21 12:55:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmytro Shytyi X-Patchwork-Id: 12983701 X-Patchwork-Delegate: pabeni@redhat.com Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) (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 C9BEC33C0 for ; Wed, 21 Sep 2022 12:56:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1663764964; cv=none; d=zohomail.eu; s=zohoarc; b=V0HOIILVDDRINsf+m8VghZhehssavHByYS9xFkJC52O+PXfQb4a1aZtjqKw8pGUnXqBq4uqs7gXS81iCnla4YVuXau/UNBv26OmXuvoJB0WvjnxVQvGJUACsp5uONErRUSW1KB1/LL3bq+eeC3o/ziqyqmNjELIRlrL02la+Xxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1663764964; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=WRncidMfE40C+dTPtggN1+TrhPs22BWkn0VJlHw1exc=; b=WQZw8CB1X5RLGA3Y9WOmUwGoFtSJp5HfahHxo6q7Wlar2qByhmHY2Bbr4+cA4jJqb5TqnwizNqK+qreYvv+7HjQ6JszBfY4pQe/UNsdai0jmRY6oB4AeLwpOG3Ed4Th29lUfi5WWdnKQOsFay6Gxe0VN/W0mRwM3O1rbQWxkZo0= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=shytyi.net; spf=pass smtp.mailfrom=dmytro@shytyi.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1663764964; s=hs; d=shytyi.net; i=dmytro@shytyi.net; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=WRncidMfE40C+dTPtggN1+TrhPs22BWkn0VJlHw1exc=; b=BVhG5UaCJbvLrIq4wJbkw6AG/25Nf7/tuO0h+L5Dzv5reLAIf98Ft4E+VF8noIYA 8wGOrdHt5r5oczsdig4ehZ0Oyu/fl8PR26YwQwTSUJD2O0zqOhlR4YU5QQBiTWa7i3p bMxDGYTIfuEXVEBUf4eRKNB5hu2rDSOVfBlZk0/4= Received: from doris.localdomain (243.34.22.93.rev.sfr.net [93.22.34.243]) by mx.zoho.eu with SMTPS id 16637649631431022.7540864576093; Wed, 21 Sep 2022 14:56:03 +0200 (CEST) From: Dmytro Shytyi To: mptcp@lists.linux.dev Cc: Dmytro Shytyi Message-ID: <20220921125558.19483-4-dmytro@shytyi.net> Subject: [RFC PATCH mptcp-next v9 3/6] mptcp: reuse tcp_sendmsg_fastopen() Date: Wed, 21 Sep 2022 14:55:55 +0200 X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921125558.19483-1-dmytro@shytyi.net> References: <20220921125558.19483-1-dmytro@shytyi.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ZohoMailClient: External In the following patches we will reuse modified tcp_sendmsg_fastopen(). We call it from mptcp_sendmsg(). Signed-off-by: Dmytro Shytyi --- include/net/tcp.h | 3 +++ net/ipv4/tcp.c | 24 +++++++++++++++++++----- net/mptcp/protocol.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 735e957f7f4b..a7d49e42470a 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1754,6 +1754,9 @@ struct sock *tcp_try_fastopen(struct sock *sk, struct sk_buff *skb, struct request_sock *req, struct tcp_fastopen_cookie *foc, const struct dst_entry *dst); +int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, + int *copied, size_t size, + struct ubuf_info *uarg); void tcp_fastopen_init_key_once(struct net *net); bool tcp_fastopen_cookie_check(struct sock *sk, u16 *mss, struct tcp_fastopen_cookie *cookie); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9251c99d3cfd..41fa9e840e0e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -280,6 +280,9 @@ #include #include +#include +#include "../mptcp/protocol.h" + /* Track pending CMSGs. */ enum { TCP_CMSG_INQ = 1, @@ -1162,9 +1165,9 @@ void tcp_free_fastopen_req(struct tcp_sock *tp) } } -static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, - int *copied, size_t size, - struct ubuf_info *uarg) +int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, + int *copied, size_t size, + struct ubuf_info *uarg) { struct tcp_sock *tp = tcp_sk(sk); struct inet_sock *inet = inet_sk(sk); @@ -1197,8 +1200,19 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, } } flags = (msg->msg_flags & MSG_DONTWAIT) ? O_NONBLOCK : 0; - err = __inet_stream_connect(sk->sk_socket, uaddr, - msg->msg_namelen, flags, 1); + if (!sk_is_mptcp(sk)) { + err = __inet_stream_connect(sk->sk_socket, uaddr, + msg->msg_namelen, flags, 1); + } else { + struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); + + release_sock(sk); + release_sock(subflow->conn); + err = mptcp_stream_connect(sk->sk_socket, uaddr, + msg->msg_namelen, msg->msg_flags); + lock_sock(subflow->conn); + lock_sock(sk); + } /* fastopen_req could already be freed in __inet_stream_connect * if the connection times out or gets rst */ diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 470045793181..d5c502d141b4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1668,14 +1668,39 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) { struct mptcp_sock *msk = mptcp_sk(sk); struct page_frag *pfrag; + struct socket *ssock; size_t copied = 0; int ret = 0; long timeo; + lock_sock(sk); + + ssock = __mptcp_nmpc_socket(msk); + + if (ssock && inet_sk(ssock->sk)->defer_connect) { + release_sock(sk); + goto fastopen; + } else { + release_sock(sk); + } /* we don't support FASTOPEN yet */ - if (msg->msg_flags & MSG_FASTOPEN) - return -EOPNOTSUPP; + if (msg->msg_flags & MSG_FASTOPEN) { +fastopen: + lock_sock(sk); + + ssock = __mptcp_nmpc_socket(msk); + + lock_sock(ssock->sk); + if (ssock) { + int copied_syn_fastopen = 0; + + ret = tcp_sendmsg_fastopen(ssock->sk, msg, &copied_syn_fastopen, len, NULL); + copied += copied_syn_fastopen; + } + release_sock(ssock->sk); + release_sock(sk); + } /* silently ignore everything else */ msg->msg_flags &= MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL;