* [PATCH net-next] ftmac100: fix skb truesize underestimation
@ 2011-10-13 21:20 Eric Dumazet
2011-10-14 2:28 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2011-10-13 21:20 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Po-Yu Chuang
ftmac100 allocates a page per skb fragment. We must account
PAGE_SIZE increments on skb->truesize, not the actual frag length.
If frame is under 64 bytes, page is freed, so increase truesize only for
bigger frames.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Po-Yu Chuang <ratbert@faraday-tech.com>
---
drivers/net/ethernet/faraday/ftmac100.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index 9bd7746..a127cb2 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -439,7 +439,10 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed)
skb_fill_page_desc(skb, 0, page, 0, length);
skb->len += length;
skb->data_len += length;
- skb->truesize += length;
+
+ /* page might be freed in __pskb_pull_tail() */
+ if (length > 64)
+ skb->truesize += PAGE_SIZE;
__pskb_pull_tail(skb, min(length, 64));
ftmac100_alloc_rx_page(priv, rxdes, GFP_ATOMIC);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] ftmac100: fix skb truesize underestimation
2011-10-13 21:20 [PATCH net-next] ftmac100: fix skb truesize underestimation Eric Dumazet
@ 2011-10-14 2:28 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-10-14 2:28 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, ratbert
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 13 Oct 2011 23:20:08 +0200
> ftmac100 allocates a page per skb fragment. We must account
> PAGE_SIZE increments on skb->truesize, not the actual frag length.
>
> If frame is under 64 bytes, page is freed, so increase truesize only for
> bigger frames.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-14 2:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-13 21:20 [PATCH net-next] ftmac100: fix skb truesize underestimation Eric Dumazet
2011-10-14 2:28 ` David Miller
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).