netdev - Re: [PATCH net-next] inet: restore gso for vxlan

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJZOPZ+96PudQJabptvb_h5qLLyEVPWruK6mJUh7Z9FW8wk6+A@mail.gmail.com>
Date:	Sat, 16 Nov 2013 22:23:50 +0200
From:	Or Gerlitz <or.gerlitz@...il.com>
To:	Alexei Starovoitov <ast@...mgrid.com>
Cc:	Eric Dumazet <eric.dumazet@...il.com>,
	David Miller <davem@...emloft.net>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	Hannes Frederic Sowa <hannes@...essinduktion.org>
Subject: Re: [PATCH net-next] inet: restore gso for vxlan

On Fri, Nov 8, 2013,  Alexei Starovoitov <ast@...mgrid.com> wrote:
> On Thu, Nov 7, 2013 , Eric Dumazet <eric.dumazet@...il.com> wrote:
>> On Sun, 2013-10-27 , Eric Dumazet wrote:
>>> From: Eric Dumazet <edumazet@...gle.com>


>>> Alexei reported a performance regression on vxlan, caused
>>> by commit 3347c9602955 "ipv4: gso: make inet_gso_segment() stackable"

>>> GSO vxlan packets were not properly segmented, adding IP fragments
>>> while they were not expected.

>>> Rename 'bool tunnel' to 'bool encap', and add a new boolean
>>> to express the fact that UDP should be fragmented.
>>> This fragmentation is triggered by skb->encapsulation being set.
>>>
>>> Remove a "skb->encapsulation = 1" added in above commit,
>>> as its not needed, as frags inherit skb->frag from original
>>> GSO skb.
>>>
>>> Reported-by: Alexei Starovoitov <ast@...mgrid.com>
>>> Signed-off-by: Eric Dumazet <edumazet@...gle.com>
>>> Tested-by: Alexei Starovoitov <ast@...mgrid.com>
>>> ---
>>>  net/ipv4/af_inet.c |   15 +++++++--------
>>>  1 file changed, 7 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
>>> index f4a159e705c0..09d78d4a3cff 100644
>>> --- a/net/ipv4/af_inet.c
>>> +++ b/net/ipv4/af_inet.c
>>> @@ -1251,8 +1251,8 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
>>>       struct sk_buff *segs = ERR_PTR(-EINVAL);
>>>       const struct net_offload *ops;
>>>       unsigned int offset = 0;
>>> +     bool udpfrag, encap;
>>>       struct iphdr *iph;
>>> -     bool tunnel;
>>>       int proto;
>>>       int nhoff;
>>>       int ihl;
>>> @@ -1290,8 +1290,8 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
>>>               goto out;
>>>       __skb_pull(skb, ihl);
>>>
>>> -     tunnel = SKB_GSO_CB(skb)->encap_level > 0;
>>> -     if (tunnel)
>>> +     encap = SKB_GSO_CB(skb)->encap_level > 0;
>>> +     if (encap)
>>>               features = skb->dev->hw_enc_features & netif_skb_features(skb);
>>>       SKB_GSO_CB(skb)->encap_level += ihl;
>>>
>>> @@ -1306,24 +1306,23 @@ 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;
>>
>> It seems I did an error here, shouldn't it be
>>
>>      udpfrag = !skb->encapsulation && proto == IPPROTO_UDP;
>>
>> instead ?
>
> oops. yes.
> the segs coming out of udp4_ufo_fragment() in case of udp_tunnel should not
> be marked as ip frags. ip frags are only for UFO.
>
> Thank you for spotting it!

Guys, just to clarify, is this fixed by now? where, net-next?
--
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