summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-07-03 14:02:22 +0200
committerDavid S. Miller <davem@davemloft.net>2013-07-04 01:52:10 +0200
commit9eb5bf838d06aa6ddebe4aca6b5cedcf2eb53b86 (patch)
tree12c3aa5b3242194880829d5b04369c53f087bfc1 /include/net
parentnet/mlx4: fix small memory leak on error (diff)
downloadlinux-9eb5bf838d06aa6ddebe4aca6b5cedcf2eb53b86.tar.xz
linux-9eb5bf838d06aa6ddebe4aca6b5cedcf2eb53b86.zip
net: sock: fix TCP_SKB_MIN_TRUESIZE
commit eea86af6b1e18d ("net: sock: adapt SOCK_MIN_RCVBUF and SOCK_MIN_SNDBUF") forgot the sk_buff alignment taken into account in __alloc_skb() : skb->truesize = SKB_TRUESIZE(size); While above commit fixed the sender issue, the receiver is still dropping the second packet (on loopback device), because the receiver socket can not really hold two skbs : First packet truesize already is above sk_rcvbuf, so even TCP coalescing cannot help. On a typical 64bit build, each tcp skb truesize is 2304, instead of 2272 Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Daniel Borkmann <dborkman@redhat.com> Cc: Neal Cardwell <ncardwell@google.com> Acked-by: Neal Cardwell <ncardwell@google.com> Tested-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index ea6206ccc896..95a5a2c6925a 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2052,7 +2052,7 @@ static inline void sk_wake_async(struct sock *sk, int how, int band)
* Note: for send buffers, TCP works better if we can build two skbs at
* minimum.
*/
-#define TCP_SKB_MIN_TRUESIZE (2048 + sizeof(struct sk_buff))
+#define TCP_SKB_MIN_TRUESIZE (2048 + SKB_DATA_ALIGN(sizeof(struct sk_buff)))
#define SOCK_MIN_SNDBUF (TCP_SKB_MIN_TRUESIZE * 2)
#define SOCK_MIN_RCVBUF TCP_SKB_MIN_TRUESIZE