myri10ge: fix truesize underestimation

skb->truesize must account for allocated memory, not the used part of
it. Doing this work is important to avoid unexpected OOM situations.

Signed-off-by: Eric Dumazet <[email protected]>
CC: Jon Mason <[email protected]>
Acked-by: Jon Mason <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index c970a48436dcafd8a763529458e58e591680a239..0778edcf7b9a1ecee3ffcfcfd058043c317ce194 100644 (file)
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -1210,7 +1210,6 @@ myri10ge_rx_skb_build(struct sk_buff *skb, u8 * va,
        struct skb_frag_struct *skb_frags;
 
        skb->len = skb->data_len = len;
-       skb->truesize = len + sizeof(struct sk_buff);
        /* attach the page(s) */
 
        skb_frags = skb_shinfo(skb)->frags;
@@ -1385,6 +1384,8 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum,
        if (skb_frag_size(&skb_shinfo(skb)->frags[0]) <= 0) {
                skb_frag_unref(skb, 0);
                skb_shinfo(skb)->nr_frags = 0;
+       } else {
+               skb->truesize += bytes * skb_shinfo(skb)->nr_frags;
        }
        skb->protocol = eth_type_trans(skb, dev);
        skb_record_rx_queue(skb, ss - &mgp->ss[0]);