[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAMEtUuxwi05oX0TqNdMbjy04MT=ZLemLXJQTTcAMrnWuhXLKdQ@mail.gmail.com>
Date: Fri, 25 Oct 2013 15:41:47 -0700
From: Alexei Starovoitov <ast@...mgrid.com>
To: David Miller <davem@...emloft.net>
Cc: eric.dumazet@...il.com, Eric Dumazet <edumazet@...gle.com>,
stephen@...workplumber.org, netdev@...r.kernel.org
Subject: Re: vxlan gso is broken by stackable gso_segment()
On Fri, Oct 25, 2013 at 3:18 PM, David Miller <davem@...emloft.net> wrote:
> From: Eric Dumazet <eric.dumazet@...il.com>
> Date: Fri, 25 Oct 2013 02:09:00 -0700
>
>> @@ -1252,6 +1252,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
>> const struct net_offload *ops;
>> unsigned int offset = 0;
>> struct iphdr *iph;
>> + bool udpfrag;
>> bool tunnel;
>> int proto;
>> int nhoff;
>> @@ -1306,10 +1307,11 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
>> if (IS_ERR_OR_NULL(segs))
>> goto out;
>>
>> + udpfrag = !!skb->encapsulation && proto == IPPROTO_UDP;
>> skb = segs;
>> do {
>> iph = (struct iphdr *)(skb_mac_header(skb) + nhoff);
>> - if (!tunnel && proto == IPPROTO_UDP) {
>> + if (udpfrag) {
>> iph->id = htons(id);
>> iph->frag_off = htons(offset >> 3);
>> if (skb->next != NULL)
>>
>
> The "tunnel" variable becomes unused once you do this, please remove it.
'bool tunnel' actually still used to indicate encap_level > 0
Eric's fix brings back performance for vxlan and gre keeps working. Thx!
net/core/skbuff.c:3474 skb_try_coalesce() warning, I mentioned before,
is unrelated.
I still see it with this patch. Running either gre or vxlan tunnels.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists