Skip to content

Commit 76ca305

Browse files
Jon Paul Maloygregkh
authored andcommitted
tipc: re-enable compensation for socket receive buffer double counting
commit 7c8bcfb1255fe9d929c227d67bdcd84430fd200b upstream. In the refactoring commit d570d86 ("tipc: enqueue arrived buffers in socket in separate function") we did by accident replace the test if (sk->sk_backlog.len == 0) atomic_set(&tsk->dupl_rcvcnt, 0); with if (sk->sk_backlog.len) atomic_set(&tsk->dupl_rcvcnt, 0); This effectively disables the compensation we have for the double receive buffer accounting that occurs temporarily when buffers are moved from the backlog to the socket receive queue. Until now, this has gone unnoticed because of the large receive buffer limits we are applying, but becomes indispensable when we reduce this buffer limit later in this series. We now fix this by inverting the mentioned condition. Acked-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3f31559 commit 76ca305

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/tipc/socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@ static void tipc_sk_enqueue(struct sk_buff_head *inputq, struct sock *sk,
17551755

17561756
/* Try backlog, compensating for double-counted bytes */
17571757
dcnt = &tipc_sk(sk)->dupl_rcvcnt;
1758-
if (sk->sk_backlog.len)
1758+
if (!sk->sk_backlog.len)
17591759
atomic_set(dcnt, 0);
17601760
lim = rcvbuf_limit(sk, skb) + atomic_read(dcnt);
17611761
if (likely(!sk_add_backlog(sk, skb, lim)))

0 commit comments

Comments
 (0)