Attachment 292869 Details for Bug 429417 – Fix ip_fragment slow path truesize bug

[patch] Fix ip_fragment slow path truesize bug

p (text/plain), 1.97 KB, created by Herbert Xu on 2008-01-24 21:59:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herbert Xu

Created: 2008-01-24 21:59:09 UTC

Size: 1.97 KB

patch

obsolete

>diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
>index fd99fbd..76ec973 100644
>--- a/net/ipv4/ip_output.c
>+++ b/net/ipv4/ip_output.c
>@@ -462,6 +462,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
> 	if (skb_shinfo(skb)->frag_list) {
> 		struct sk_buff *frag;
> 		int first_len = skb_pagelen(skb);
>+		int truesizes = 0;
> 
> 		if (first_len - hlen > mtu ||
> 		    ((first_len - hlen) & 7) ||
>@@ -485,7 +486,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
> 				sock_hold(skb->sk);
> 				frag->sk = skb->sk;
> 				frag->destructor = sock_wfree;
>-				skb->truesize -= frag->truesize;
>+				truesizes += frag->truesize;
> 			}
> 		}
> 
>@@ -496,6 +497,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
> 		frag = skb_shinfo(skb)->frag_list;
> 		skb_shinfo(skb)->frag_list = NULL;
> 		skb->data_len = first_len - skb_headlen(skb);
>+		skb->truesize -= truesizes;
> 		skb->len = first_len;
> 		iph->tot_len = htons(first_len);
> 		iph->frag_off = htons(IP_MF);
>diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
>index 6338a9c..bb9b183 100644
>--- a/net/ipv6/ip6_output.c
>+++ b/net/ipv6/ip6_output.c
>@@ -609,6 +609,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
> 
> 	if (skb_shinfo(skb)->frag_list) {
> 		int first_len = skb_pagelen(skb);
>+		int truesizes = 0;
> 
> 		if (first_len - hlen > mtu ||
> 		    ((first_len - hlen) & 7) ||
>@@ -631,7 +632,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
> 				sock_hold(skb->sk);
> 				frag->sk = skb->sk;
> 				frag->destructor = sock_wfree;
>-				skb->truesize -= frag->truesize;
>+				truesizes += frag->truesize;
> 			}
> 		}
> 
>@@ -662,6 +663,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
> 
> 		first_len = skb_pagelen(skb);
> 		skb->data_len = first_len - skb_headlen(skb);
>+		skb->truesize -= truesizes;
> 		skb->len = first_len;
> 		ipv6_hdr(skb)->payload_len = htons(first_len -
> 						   sizeof(struct ipv6hdr));

Actions: View | Diff

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