diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2020-09-14 10:01:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-14 13:28:02 -0700 |
| commit | ab174ad8ef76276cadfdae98731d31797d265927 (patch) | |
| tree | 44e8b1c03602483976ceb1a912f7a85588a6fd19 /net/mptcp/subflow.c | |
| parent | 8268ed4c9d197fc6448b6262c62aad62ef9aa4d5 (diff) | |
| download | linux-ab174ad8ef76276cadfdae98731d31797d265927.tar.bz2 | |
mptcp: move ooo skbs into msk out of order queue.
Add an RB-tree to cope with OoO (at MPTCP level) data.
__mptcp_move_skb() insert into the RB tree "future"
data, eventually coalescing skb as allowed by the
MPTCP DSN.
To simplify sequence accounting, move the DSN inside
the cb.
After successfully enqueuing in sequence data, check
if we can use any data from the RB tree.
Additionally move the data_fin check after spooling
data from the OoO tree, otherwise we could miss shutdown
events.
The RB tree code is copied as verbatim as possible
from tcp_data_queue_ofo(), with a few simplifications
due to the fact that MPTCP doesn't need to cope with
sacks. All bugs here are added by me.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/subflow.c')
| -rw-r--r-- | net/mptcp/subflow.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 071ee54b3c9f..0b1d73a69daf 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -434,6 +434,7 @@ static void mptcp_sock_destruct(struct sock *sk) sock_orphan(sk); } + skb_rbtree_purge(&mptcp_sk(sk)->out_of_order_queue); mptcp_token_destroy(mptcp_sk(sk)); inet_sock_destruct(sk); } |