From: Eric Dumazet <eric.dumazet@gmail.com>
To: Haiyang Zhang <haiyangz@microsoft.com>
Cc: "edumazet@google.com" <edumazet@google.com>,
David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
KY Srinivasan <kys@microsoft.com>
Subject: [PATCH net-next] net: increase LL_MAX_HEADER if HYPERV_NET is enabled
Date: Sun, 01 Nov 2015 09:20:59 -0800 [thread overview]
Message-ID: <1446398459.6254.90.camel@edumazet-glaptop2.roam.corp.google.com> (raw)
In-Reply-To: <1446249142.6254.47.camel@edumazet-glaptop2.roam.corp.google.com>
From: Eric Dumazet <edumazet@google.com>
My recent commit, attaching SYNACK messages to request sockets
exposed a too small LL_MAX_HEADER when netvsc_drv.c is in use,
because this driver sets a needed_headroom of 220 bytes.
Increase LL_MAX_HEADER in this case, to avoid a realloc of all
TCP frames.
In another patch, I'll make skb_set_owner_w() more robust.
Fixes: ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Bisected-by: Haiyang Zhang <haiyangz@microsoft.com>
---
include/linux/netdevice.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 4ac653b7b8ac..04e3864e660e 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -132,8 +132,10 @@ static inline bool dev_xmit_complete(int rc)
* used.
*/
-#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
-# if defined(CONFIG_MAC80211_MESH)
+#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || IS_ENABLED(CONFIG_HYPERV_NET)
+# if IS_ENABLED(CONFIG_HYPERV_NET)
+# define LL_MAX_HEADER 256
+# elif defined(CONFIG_MAC80211_MESH)
# define LL_MAX_HEADER 128
# else
# define LL_MAX_HEADER 96
next prev parent reply other threads:[~2015-11-01 17:21 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-29 21:49 [patch] tcp: attach SYNACK messages to request sockets instead of listener Haiyang Zhang
2015-10-29 22:58 ` Eric Dumazet
2015-10-30 19:38 ` Haiyang Zhang
2015-10-30 20:02 ` Eric Dumazet
2015-10-30 20:18 ` Eric Dumazet
2015-10-30 21:42 ` Haiyang Zhang
2015-10-30 23:52 ` Eric Dumazet
2015-11-01 17:20 ` Eric Dumazet [this message]
2015-11-01 20:58 ` [PATCH net-next] net: increase LL_MAX_HEADER if HYPERV_NET is enabled David Miller
2015-11-01 22:36 ` Eric Dumazet
2015-11-01 22:58 ` [PATCH net-next] net: make skb_set_owner_w() more robust Eric Dumazet
2015-11-01 23:18 ` kbuild test robot
2015-11-01 23:27 ` Eric Dumazet
2015-11-01 23:36 ` [PATCH v2 " Eric Dumazet
2015-11-02 20:05 ` Haiyang Zhang
2015-11-02 20:09 ` Eric Dumazet
2015-11-02 20:26 ` David Miller
2015-11-02 21:29 ` David Miller
2015-11-03 7:59 ` [PATCH net-next] net: increase LL_MAX_HEADER if HYPERV_NET is enabled KY Srinivasan
2015-11-03 15:33 ` David Miller
2015-11-03 16:37 ` Eric Dumazet
2015-11-03 17:34 ` Haiyang Zhang
2015-11-03 18:20 ` David Miller
2015-11-03 18:49 ` Haiyang Zhang
2015-11-03 19:50 ` David Miller
2015-11-03 21:00 ` Haiyang Zhang
2015-11-03 18:09 ` KY Srinivasan
2015-10-30 20:28 ` [patch] tcp: attach SYNACK messages to request sockets instead of listener KY Srinivasan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446398459.6254.90.camel@edumazet-glaptop2.roam.corp.google.com \
--to=eric.dumazet@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).