From: Jason Wang Date: Wed, 2 May 2012 03:41:44 +0000 (+0800) Subject: macvtap: zerocopy: fix truesize underestimation X-Git-Tag: v3.2.24~92 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14180f501e674f1bbe352d37c962ede4d8f679d4;p=thirdparty%2Fkernel%2Fstable.git macvtap: zerocopy: fix truesize underestimation commit 4ef67ebedffa44ed9939b34708ac2fee06d2f65f upstream. As the skb fragment were pinned/built from user pages, we should account the page instead of length for truesize. Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin Signed-off-by: Ben Hutchings --- diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 45050085c8ce0..c7a84eb75d1ae 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -518,6 +518,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, struct page *page[MAX_SKB_FRAGS]; int num_pages; unsigned long base; + unsigned long truesize; len = from->iov_len - offset; if (!len) { @@ -532,10 +533,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags)) /* put_page is in skb free */ return -EFAULT; + truesize = size * PAGE_SIZE; skb->data_len += len; skb->len += len; - skb->truesize += len; - atomic_add(len, &skb->sk->sk_wmem_alloc); + skb->truesize += truesize; + atomic_add(truesize, &skb->sk->sk_wmem_alloc); while (len) { int off = base & ~PAGE_MASK; int size = min_t(int, len, PAGE_SIZE - off);