diff options
| author | Florian Westphal <fw@strlen.de> | 2020-08-26 01:31:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-26 15:48:44 -0700 |
| commit | 1cec170d458b1d18f6f1654ca84c0804a701c5ef (patch) | |
| tree | f81177ef63d19aad1a1521f17db4261b846cd9e7 /net | |
| parent | 09e31cf0c528dac3358a081dc4e773d1b3de1bc9 (diff) | |
| download | linux-1cec170d458b1d18f6f1654ca84c0804a701c5ef.tar.gz linux-1cec170d458b1d18f6f1654ca84c0804a701c5ef.tar.bz2 linux-1cec170d458b1d18f6f1654ca84c0804a701c5ef.zip | |
mptcp: free acked data before waiting for more memory
After subflow lock is dropped, more wmem might have been made available.
This fixes a deadlock in mptcp_connect.sh 'mmap' mode: wmem is exhausted.
But as the mptcp socket holds on to already-acked data (for retransmit)
no wakeup will occur.
Using 'goto restart' calls mptcp_clean_una(sk) which will free pages
that have been acked completely in the mean time.
Fixes: fb529e62d3f3 ("mptcp: break and restart in case mptcp sndbuf is full")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mptcp/protocol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1aad411a0e46..8ccd4a151dcb 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -892,7 +892,6 @@ restart: goto out; } -wait_for_sndbuf: __mptcp_flush_join_list(msk); ssk = mptcp_subflow_get_send(msk); while (!sk_stream_memory_free(sk) || @@ -982,7 +981,7 @@ wait_for_sndbuf: */ mptcp_set_timeout(sk, ssk); release_sock(ssk); - goto wait_for_sndbuf; + goto restart; } } } |