xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] xen/netfront: improve truesize tracking
@ 2012-12-18 13:51 Ian Campbell
  2012-12-18 14:10 ` Konrad Rzeszutek Wilk
  2012-12-18 15:12 ` Eric Dumazet
  0 siblings, 2 replies; 22+ messages in thread
From: Ian Campbell @ 2012-12-18 13:51 UTC (permalink / raw)
  To: netdev
  Cc: Ian Campbell, Sander Eikelenboom, Konrad Rzeszutek Wilk, annie li,
	xen-devel

Using RX_COPY_THRESHOLD is incorrect if the SKB is actually smaller
than that. We have already accounted for this in
NETFRONT_SKB_CB(skb)->pull_to so use that instead.

Fixes WARN_ON from skb_try_coalesce.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: annie li <annie.li@oracle.com>
Cc: xen-devel@lists.xensource.com
Cc: netdev@vger.kernel.org
Cc: stable@kernel.org # 3.7.x only
---
 drivers/net/xen-netfront.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index caa0110..b06ef81 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -971,17 +971,12 @@ err:
 		 * overheads. Here, we add the size of the data pulled
 		 * in xennet_fill_frags().
 		 *
-		 * We also adjust for any unused space in the main
-		 * data area by subtracting (RX_COPY_THRESHOLD -
-		 * len). This is especially important with drivers
-		 * which split incoming packets into header and data,
-		 * using only 66 bytes of the main data area (see the
-		 * e1000 driver for example.)  On such systems,
-		 * without this last adjustement, our achievable
-		 * receive throughout using the standard receive
-		 * buffer size was cut by 25%(!!!).
+		 * We also adjust for the __pskb_pull_tail done in
+		 * handle_incoming_queue which pulls data from the
+		 * frags into the head area, which is already
+		 * accounted in RX_COPY_THRESHOLD.
 		 */
-		skb->truesize += skb->data_len - RX_COPY_THRESHOLD;
+		skb->truesize += skb->data_len - NETFRONT_SKB_CB(skb)->pull_to;
 		skb->len += skb->data_len;
 
 		if (rx->flags & XEN_NETRXF_csum_blank)
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2013-01-07 16:17 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-18 13:51 [PATCH] xen/netfront: improve truesize tracking Ian Campbell
2012-12-18 14:10 ` Konrad Rzeszutek Wilk
2012-12-18 14:15   ` Ian Campbell
2012-12-18 15:12 ` Eric Dumazet
2012-12-18 15:26   ` Ian Campbell
2012-12-18 16:13     ` Eric Dumazet
2012-12-18 16:22       ` Ian Campbell
2012-12-18 16:35         ` Eric Dumazet
2012-12-19 11:34     ` Sander Eikelenboom
2012-12-19 16:17       ` Eric Dumazet
2012-12-20 12:51         ` Sander Eikelenboom
2012-12-20 14:23           ` [Xen-devel] " Sander Eikelenboom
2012-12-20 14:58             ` Sander Eikelenboom
2012-12-20 15:39           ` Eric Dumazet
2012-12-21 11:21             ` Sander Eikelenboom
2012-12-21 18:33               ` Rick Jones
2013-01-03 20:40                 ` Sander Eikelenboom
2013-01-07 13:41                   ` Ian Campbell
2013-01-07 14:11                     ` Sander Eikelenboom
2013-01-07 14:22                       ` Ian Campbell
2013-01-07 15:26                         ` Eric Dumazet
2013-01-07 16:17                     ` Eric Dumazet

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).