From: Benjamin Hesmans <benjamin.hesmans@tessares.net>
To: mptcp@lists.linux.dev
Cc: Dmytro Shytyi <dmytro@shytyi.net>,
Benjamin Hesmans <benjamin.hesmans@tessares.net>
Subject: [PATCH mptcp-next v3 3/4] mptcp: handle defer connect in mptcp_sendmsg
Date: Fri, 23 Sep 2022 14:19:12 +0200 [thread overview]
Message-ID: <20220923121913.2135229-4-benjamin.hesmans@tessares.net> (raw)
In-Reply-To: <20220923121913.2135229-1-benjamin.hesmans@tessares.net>
From: Dmytro Shytyi <dmytro@shytyi.net>
When TCP_FASTOPEN_CONNECT has been set on the socket before a connect,
the defer flag is set and must be handled when sendmsg is called.
This is similar to what is done in tcp_sendmsg_locked().
Signed-of-by: Dmytro Shytyi <dmytro@shytyi.net>
Co-developed-by: Benjamin Hesmans <benjamin.hesmans@tessares.net>
Signed-off-by: Benjamin Hesmans <benjamin.hesmans@tessares.net>
---
Notes:
v1:
- error case use latest patch from Paolo (propagate fastclose error)
- I believe the use __mptcp_nmpc_socket(msk); is correct here (instead of
msk->first but would be nice is someone can confirm
- add unlikely for the TFO check
- propagate the ssk state to the msk (Paolo)
v2:
- Question from v1's notes answered by Paolo.
net/mptcp/protocol.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 7d4e197ec567..f5f20910cd83 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1668,6 +1668,7 @@ 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;
@@ -1681,6 +1682,27 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
lock_sock(sk);
+ ssock = __mptcp_nmpc_socket(msk);
+ if (unlikely(ssock && inet_sk(ssock->sk)->defer_connect)) {
+ struct sock *ssk = ssock->sk;
+ int copied_syn = 0;
+
+ lock_sock(ssk);
+
+ ret = tcp_sendmsg_fastopen(ssk, msg, &copied_syn, len, NULL);
+ copied += copied_syn;
+ if (ret == -EINPROGRESS && copied_syn > 0) {
+ /* reflect the new state on the MPTCP socket */
+ inet_sk_state_store(sk, inet_sk_state_load(ssk));
+ release_sock(ssk);
+ goto out;
+ } else if (ret) {
+ release_sock(ssk);
+ goto do_error;
+ }
+ release_sock(ssk);
+ }
+
timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
if ((1 << sk->sk_state) & ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) {
--
2.25.1
--
Disclaimer: https://www.tessares.net/mail-disclaimer/
<https://www.tessares.net/mail-disclaimer/>
next prev parent reply other threads:[~2022-09-23 12:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 12:19 [PATCH mptcp-next v3 0/4] mptcp: add support for TCP_FASTOPEN_CONNECT, sender side only Benjamin Hesmans
2022-09-23 12:19 ` [PATCH mptcp-next v3 1/4] mptcp: add TCP_FASTOPEN_CONNECT socket option Benjamin Hesmans
2022-09-23 12:19 ` [PATCH mptcp-next v3 2/4] tcp: export tcp_sendmsg_fastopen Benjamin Hesmans
2022-09-23 12:19 ` Benjamin Hesmans [this message]
2022-09-23 12:19 ` [PATCH mptcp-next v3 4/4] mptcp: poll allow write call before actual connect Benjamin Hesmans
2022-09-23 15:21 ` mptcp: poll allow write call before actual connect: Tests Results MPTCP CI
2022-09-23 13:41 ` [PATCH mptcp-next v3 0/4] mptcp: add support for TCP_FASTOPEN_CONNECT, sender side only Paolo Abeni
2022-09-23 17:48 ` Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220923121913.2135229-4-benjamin.hesmans@tessares.net \
--to=benjamin.hesmans@tessares.net \
--cc=dmytro@shytyi.net \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).