diff options
| author | Eric Dumazet <edumazet@google.com> | 2021-11-15 22:02:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-16 16:10:35 +0300 |
| commit | 29fbc26e6dfc7be351c23261938de3f93f5cde57 (patch) | |
| tree | f3775856188c4864ad33c3b5fe1899c89ea115b7 /net/ipv4 | |
| parent | 8bd172b787298124ef75c0e466101107c036d54d (diff) | |
| download | linux-29fbc26e6dfc7be351c23261938de3f93f5cde57.tar.xz | |
tcp: do not call tcp_cleanup_rbuf() if we have a backlog
Under pressure, tcp recvmsg() has logic to process the socket backlog,
but calls tcp_cleanup_rbuf() right before.
Avoiding sending ACK right before processing new segments makes
a lot of sense, as this decrease the number of ACK packets,
with no impact on effective ACK clocking.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7b1886103556..d1949fdb1462 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2436,12 +2436,11 @@ static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len, } } - tcp_cleanup_rbuf(sk, copied); - if (copied >= target) { /* Do not sleep, just process backlog. */ __sk_flush_backlog(sk); } else { + tcp_cleanup_rbuf(sk, copied); sk_defer_free_flush(sk); sk_wait_data(sk, &timeo, last); } |