* [PATCH] udp6: Fix udp fragmentation for tunnel traffic.
@ 2013-05-30 16:45 Pravin B Shelar
2013-05-30 18:53 ` Dmitry Kravkov
0 siblings, 1 reply; 3+ messages in thread
From: Pravin B Shelar @ 2013-05-30 16:45 UTC (permalink / raw)
To: netdev; +Cc: dkravkov, Pravin B Shelar
udp6 over GRE tunnel does not work after to GRE tso changes. GRE
tso handler passes inner packet but keeps track of outer header
start in SKB_GSO_CB(skb)->mac_offset. udp6 fragment need to
take care of outer header, which start at the mac_offset, while
adding fragment header.
This bug is introduced by commit 68c3316311 (GRE: Add TCP
segmentation offload for GRE).
Reported-by: Dmitry Kravkov <dkravkov@gmail.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
---
include/linux/skbuff.h | 15 +++++++++++++++
net/ipv6/udp_offload.c | 20 ++++++++++++--------
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 5f93119..f7fdf71 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2758,6 +2758,21 @@ static inline int skb_tnl_header_len(const struct sk_buff *inner_skb)
SKB_GSO_CB(inner_skb)->mac_offset;
}
+static inline int gso_pskb_expand_head(struct sk_buff *skb, int extra)
+{
+ int new_headroom, headroom;
+ int ret;
+
+ headroom = skb_headroom(skb);
+ ret = pskb_expand_head(skb, extra, 0, GFP_ATOMIC);
+ if (ret)
+ return ret;
+
+ new_headroom = skb_headroom(skb);
+ SKB_GSO_CB(skb)->mac_offset += (new_headroom - headroom);
+ return 0;
+}
+
static inline bool skb_is_gso(const struct sk_buff *skb)
{
return skb_shinfo(skb)->gso_size;
diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c
index 76d401a..5d1b8d7 100644
--- a/net/ipv6/udp_offload.c
+++ b/net/ipv6/udp_offload.c
@@ -46,11 +46,12 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
unsigned int mss;
unsigned int unfrag_ip6hlen, unfrag_len;
struct frag_hdr *fptr;
- u8 *mac_start, *prevhdr;
+ u8 *packet_start, *prevhdr;
u8 nexthdr;
u8 frag_hdr_sz = sizeof(struct frag_hdr);
int offset;
__wsum csum;
+ int tnl_hlen;
mss = skb_shinfo(skb)->gso_size;
if (unlikely(skb->len <= mss))
@@ -84,9 +85,11 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
skb->ip_summed = CHECKSUM_NONE;
/* Check if there is enough headroom to insert fragment header. */
- if ((skb_mac_header(skb) < skb->head + frag_hdr_sz) &&
- pskb_expand_head(skb, frag_hdr_sz, 0, GFP_ATOMIC))
- goto out;
+ tnl_hlen = skb_tnl_header_len(skb);
+ if (skb_headroom(skb) < (tnl_hlen + frag_hdr_sz)) {
+ if (gso_pskb_expand_head(skb, tnl_hlen + frag_hdr_sz))
+ goto out;
+ }
/* Find the unfragmentable header and shift it left by frag_hdr_sz
* bytes to insert fragment header.
@@ -94,11 +97,12 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
unfrag_ip6hlen = ip6_find_1stfragopt(skb, &prevhdr);
nexthdr = *prevhdr;
*prevhdr = NEXTHDR_FRAGMENT;
- unfrag_len = skb_network_header(skb) - skb_mac_header(skb) +
- unfrag_ip6hlen;
- mac_start = skb_mac_header(skb);
- memmove(mac_start-frag_hdr_sz, mac_start, unfrag_len);
+ unfrag_len = (skb_network_header(skb) - skb_mac_header(skb)) +
+ unfrag_ip6hlen + tnl_hlen;
+ packet_start = (u8 *) skb->head + SKB_GSO_CB(skb)->mac_offset;
+ memmove(packet_start-frag_hdr_sz, packet_start, unfrag_len);
+ SKB_GSO_CB(skb)->mac_offset -= frag_hdr_sz;
skb->mac_header -= frag_hdr_sz;
skb->network_header -= frag_hdr_sz;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] udp6: Fix udp fragmentation for tunnel traffic.
2013-05-30 16:45 [PATCH] udp6: Fix udp fragmentation for tunnel traffic Pravin B Shelar
@ 2013-05-30 18:53 ` Dmitry Kravkov
2013-06-01 0:07 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Kravkov @ 2013-05-30 18:53 UTC (permalink / raw)
To: Pravin B Shelar; +Cc: netdev@vger.kernel.org
On Thu, May 30, 2013 at 7:45 PM, Pravin B Shelar <pshelar@nicira.com> wrote:
> udp6 over GRE tunnel does not work after to GRE tso changes. GRE
> tso handler passes inner packet but keeps track of outer header
> start in SKB_GSO_CB(skb)->mac_offset. udp6 fragment need to
> take care of outer header, which start at the mac_offset, while
> adding fragment header.
> This bug is introduced by commit 68c3316311 (GRE: Add TCP
> segmentation offload for GRE).
>
> Reported-by: Dmitry Kravkov <dkravkov@gmail.com>
> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
> ---
> include/linux/skbuff.h | 15 +++++++++++++++
> net/ipv6/udp_offload.c | 20 ++++++++++++--------
> 2 files changed, 27 insertions(+), 8 deletions(-)
>
> diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
> index 5f93119..f7fdf71 100644
> --- a/include/linux/skbuff.h
> +++ b/include/linux/skbuff.h
> @@ -2758,6 +2758,21 @@ static inline int skb_tnl_header_len(const struct sk_buff *inner_skb)
> SKB_GSO_CB(inner_skb)->mac_offset;
> }
>
> +static inline int gso_pskb_expand_head(struct sk_buff *skb, int extra)
> +{
> + int new_headroom, headroom;
> + int ret;
> +
> + headroom = skb_headroom(skb);
> + ret = pskb_expand_head(skb, extra, 0, GFP_ATOMIC);
> + if (ret)
> + return ret;
> +
> + new_headroom = skb_headroom(skb);
> + SKB_GSO_CB(skb)->mac_offset += (new_headroom - headroom);
> + return 0;
> +}
> +
> static inline bool skb_is_gso(const struct sk_buff *skb)
> {
> return skb_shinfo(skb)->gso_size;
> diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c
> index 76d401a..5d1b8d7 100644
> --- a/net/ipv6/udp_offload.c
> +++ b/net/ipv6/udp_offload.c
> @@ -46,11 +46,12 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
> unsigned int mss;
> unsigned int unfrag_ip6hlen, unfrag_len;
> struct frag_hdr *fptr;
> - u8 *mac_start, *prevhdr;
> + u8 *packet_start, *prevhdr;
> u8 nexthdr;
> u8 frag_hdr_sz = sizeof(struct frag_hdr);
> int offset;
> __wsum csum;
> + int tnl_hlen;
>
> mss = skb_shinfo(skb)->gso_size;
> if (unlikely(skb->len <= mss))
> @@ -84,9 +85,11 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
> skb->ip_summed = CHECKSUM_NONE;
>
> /* Check if there is enough headroom to insert fragment header. */
> - if ((skb_mac_header(skb) < skb->head + frag_hdr_sz) &&
> - pskb_expand_head(skb, frag_hdr_sz, 0, GFP_ATOMIC))
> - goto out;
> + tnl_hlen = skb_tnl_header_len(skb);
> + if (skb_headroom(skb) < (tnl_hlen + frag_hdr_sz)) {
> + if (gso_pskb_expand_head(skb, tnl_hlen + frag_hdr_sz))
> + goto out;
> + }
>
> /* Find the unfragmentable header and shift it left by frag_hdr_sz
> * bytes to insert fragment header.
> @@ -94,11 +97,12 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,
> unfrag_ip6hlen = ip6_find_1stfragopt(skb, &prevhdr);
> nexthdr = *prevhdr;
> *prevhdr = NEXTHDR_FRAGMENT;
> - unfrag_len = skb_network_header(skb) - skb_mac_header(skb) +
> - unfrag_ip6hlen;
> - mac_start = skb_mac_header(skb);
> - memmove(mac_start-frag_hdr_sz, mac_start, unfrag_len);
> + unfrag_len = (skb_network_header(skb) - skb_mac_header(skb)) +
> + unfrag_ip6hlen + tnl_hlen;
> + packet_start = (u8 *) skb->head + SKB_GSO_CB(skb)->mac_offset;
> + memmove(packet_start-frag_hdr_sz, packet_start, unfrag_len);
>
> + SKB_GSO_CB(skb)->mac_offset -= frag_hdr_sz;
> skb->mac_header -= frag_hdr_sz;
> skb->network_header -= frag_hdr_sz;
>
> --
Yeah, this fixes reported issue. Thanks.
Tested-by: Dmitry Kravkov <dmitry@broadcom.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] udp6: Fix udp fragmentation for tunnel traffic.
2013-05-30 18:53 ` Dmitry Kravkov
@ 2013-06-01 0:07 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-06-01 0:07 UTC (permalink / raw)
To: dkravkov; +Cc: pshelar, netdev
From: Dmitry Kravkov <dkravkov@gmail.com>
Date: Thu, 30 May 2013 21:53:37 +0300
> On Thu, May 30, 2013 at 7:45 PM, Pravin B Shelar <pshelar@nicira.com> wrote:
>> udp6 over GRE tunnel does not work after to GRE tso changes. GRE
>> tso handler passes inner packet but keeps track of outer header
>> start in SKB_GSO_CB(skb)->mac_offset. udp6 fragment need to
>> take care of outer header, which start at the mac_offset, while
>> adding fragment header.
>> This bug is introduced by commit 68c3316311 (GRE: Add TCP
>> segmentation offload for GRE).
>>
>> Reported-by: Dmitry Kravkov <dkravkov@gmail.com>
>> Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
...
> Yeah, this fixes reported issue. Thanks.
>
> Tested-by: Dmitry Kravkov <dmitry@broadcom.com>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-01 0:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-30 16:45 [PATCH] udp6: Fix udp fragmentation for tunnel traffic Pravin B Shelar
2013-05-30 18:53 ` Dmitry Kravkov
2013-06-01 0:07 ` 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).