diff mbox

[net-next] tcp: clear pfmemalloc on outgoing skb

Message ID 1486096808.21871.67.camel@edumazet-glaptop3.roam.corp.google.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet Feb. 3, 2017, 4:40 a.m. UTC 
From: Eric Dumazet <edumazet@google.com>

Josef Bacik diagnosed following problem :

   I was seeing random disconnects while testing NBD over loopback.
   This turned out to be because NBD sets pfmemalloc on it's socket,
   however the receiving side is a user space application so does not
   have pfmemalloc set on its socket. This means that
   sk_filter_trim_cap will simply drop this packet, under the
   assumption that the other side will simply retransmit. Well we do
   retransmit, and then the packet is just dropped again for the same
   reason.

It seems the better way to address this problem is to clear pfmemalloc
in the TCP transmit path. pfmemalloc strict control really makes sense
on the receive path. 

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Josef Bacik <jbacik@fb.com>
---
 net/ipv4/tcp_output.c |    7 +++++++
 1 file changed, 7 insertions(+)

Comments

David Miller Feb. 3, 2017, 9:24 p.m. UTC | #1 
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 02 Feb 2017 20:40:08 -0800

> From: Eric Dumazet <edumazet@google.com>
> 
> Josef Bacik diagnosed following problem :
> 
>    I was seeing random disconnects while testing NBD over loopback.
>    This turned out to be because NBD sets pfmemalloc on it's socket,
>    however the receiving side is a user space application so does not
>    have pfmemalloc set on its socket. This means that
>    sk_filter_trim_cap will simply drop this packet, under the
>    assumption that the other side will simply retransmit. Well we do
>    retransmit, and then the packet is just dropped again for the same
>    reason.
> 
> It seems the better way to address this problem is to clear pfmemalloc
> in the TCP transmit path. pfmemalloc strict control really makes sense
> on the receive path. 
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Acked-by: Josef Bacik <jbacik@fb.com>

Applied.
diff mbox

Patch

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8ce50dc3ab8cac821b8a2c3e0d31f0aa42f5c9d5..a22545c8917cdc2382717e6176f7bb384e1d91f2 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -966,6 +966,13 @@  static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
 	 */
 	skb->ooo_okay = sk_wmem_alloc_get(sk) < SKB_TRUESIZE(1);
 
+	/* If we had to use memory reserve to allocate this skb,
+	 * this might cause drops if packet is looped back :
+	 * Other socket might not have SOCK_MEMALLOC.
+	 * Packets not looped back do not care about pfmemalloc.
+	 */
+	skb->pfmemalloc = 0;
+
 	skb_push(skb, tcp_header_size);
 	skb_reset_transport_header(skb);