diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2020-03-27 14:48:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-29 22:14:48 -0700 |
| commit | cc9d2566986692e5b6df1aac88fbf65fe340d432 (patch) | |
| tree | 3aecfec84f8fa69a2314fe3bcc370274e8b4fab1 /net/mptcp/protocol.c | |
| parent | 926bdeab5535856e3a164545630149f212d3482d (diff) | |
| download | linux-cc9d2566986692e5b6df1aac88fbf65fe340d432.tar.gz linux-cc9d2566986692e5b6df1aac88fbf65fe340d432.tar.bz2 linux-cc9d2566986692e5b6df1aac88fbf65fe340d432.zip | |
mptcp: update per unacked sequence on pkt reception
So that we keep per unacked sequence number consistent; since
we update per msk data, use an atomic64 cmpxchg() to protect
against concurrent updates from multiple subflows.
Initialize the snd_una at connect()/accept() time.
Co-developed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.c')
| -rw-r--r-- | net/mptcp/protocol.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5c4560287bd2..d3197ace2a89 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -906,6 +906,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk, struct request_sock *req) } msk->write_seq = subflow_req->idsn + 1; + atomic64_set(&msk->snd_una, msk->write_seq); if (subflow_req->remote_key_valid) { msk->can_ack = true; msk->remote_key = subflow_req->remote_key; @@ -1107,6 +1108,7 @@ void mptcp_finish_connect(struct sock *ssk) WRITE_ONCE(msk->write_seq, subflow->idsn + 1); WRITE_ONCE(msk->ack_seq, ack_seq); WRITE_ONCE(msk->can_ack, 1); + atomic64_set(&msk->snd_una, msk->write_seq); mptcp_pm_new_connection(msk, 0); } |