Attachment 292610 Details for Bug 429417 – Updated upstream version of patch.

[patch] Updated upstream version of patch.

diff (text/plain), 1.98 KB, created by David Miller on 2008-01-23 06:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Miller

Created: 2008-01-23 06:40:16 UTC

Size: 1.98 KB

patch

obsolete

>commit 236e3867cdefb00f57998c2c67811863e18c7fd6
>Author: Herbert Xu <herbert@gondor.apana.org.au>
>Date:   Tue Jan 22 22:39:26 2008 -0800
>
>    [INET]: Fix truesize setting in ip_append_data
>    
>    As it is ip_append_data only counts page fragments to the skb that
>    allocated it.  As such it means that the first skb gets hit with a
>    4K charge even though it might have only used a fraction of it while
>    all subsequent skb's that use the same page gets away with no charge
>    at all.
>    
>    This bug was exposed by the UDP accounting patch.
>    
>    [ The wmem_alloc bumping needs to be moved with the truesize,
>      noticed by Tyasui.  -DaveM ]
>    
>    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>    Signed-off-by: David S. Miller <davem@davemloft.net>
>
>diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
>index e582dba..e63e374 100644
>--- a/net/ipv4/ip_output.c
>+++ b/net/ipv4/ip_output.c
>@@ -1016,8 +1016,6 @@ alloc_new_skb:
> 
> 				skb_fill_page_desc(skb, i, page, 0, 0);
> 				frag = &skb_shinfo(skb)->frags[i];
>-				skb->truesize += PAGE_SIZE;
>-				atomic_add(PAGE_SIZE, &sk->sk_wmem_alloc);
> 			} else {
> 				err = -EMSGSIZE;
> 				goto error;
>@@ -1030,6 +1028,8 @@ alloc_new_skb:
> 			frag->size += copy;
> 			skb->len += copy;
> 			skb->data_len += copy;
>+			skb->truesize += copy;
>+			atomic_add(copy, &sk->sk_wmem_alloc);
> 		}
> 		offset += copy;
> 		length -= copy;
>diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
>index 6338a9c..3bef30e 100644
>--- a/net/ipv6/ip6_output.c
>+++ b/net/ipv6/ip6_output.c
>@@ -1316,8 +1316,6 @@ alloc_new_skb:
> 
> 				skb_fill_page_desc(skb, i, page, 0, 0);
> 				frag = &skb_shinfo(skb)->frags[i];
>-				skb->truesize += PAGE_SIZE;
>-				atomic_add(PAGE_SIZE, &sk->sk_wmem_alloc);
> 			} else {
> 				err = -EMSGSIZE;
> 				goto error;
>@@ -1330,6 +1328,8 @@ alloc_new_skb:
> 			frag->size += copy;
> 			skb->len += copy;
> 			skb->data_len += copy;
>+			skb->truesize += copy;
>+			atomic_add(copy, &sk->sk_wmem_alloc);
> 		}
> 		offset += copy;
> 		length -= copy;

Actions: View | Diff

Attachments on bug 429417: 292578 | 292579 | 292610 | 292869 | 293075 | 293086