linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ip6_tunnel: Correct tos value in collect_md mode
@ 2017-06-14  2:48 Haishuang Yan
  2017-06-14  2:54 ` 严海双
  0 siblings, 1 reply; 7+ messages in thread
From: Haishuang Yan @ 2017-06-14  2:48 UTC (permalink / raw)
  To: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy,
	Daniel Borkmann
  Cc: netdev, linux-kernel, Haishuang Yan, Peter Dawson

Same as ip_gre, geneve and vxlan, use key->tos as tos value.

CC: Peter Dawson <petedaws@gmail.com>
Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on
encapsulated packets”)
Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>

---
Changes since v2:
  * Add fixes information
  * mask key->tos with RT_TOS() suggested by Daniel
---
 net/ipv6/ip6_tunnel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ef99d59..6400726 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 		fl6.flowi6_proto = IPPROTO_IPIP;
 		fl6.daddr = key->u.ipv6.dst;
 		fl6.flowlabel = key->label;
-		dsfield = ip6_tclass(key->label);
+		dsfield =  RT_TOS(key->tos);
 	} else {
 		if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
 			encap_limit = t->parms.encap_limit;
@@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 		fl6.flowi6_proto = IPPROTO_IPV6;
 		fl6.daddr = key->u.ipv6.dst;
 		fl6.flowlabel = key->label;
-		dsfield = ip6_tclass(key->label);
+		dsfield = RT_TOS(key->tos);
 	} else {
 		offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));
 		/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] ip6_tunnel: Correct tos value in collect_md mode
  2017-06-14  2:48 [PATCH] ip6_tunnel: Correct tos value in collect_md mode Haishuang Yan
@ 2017-06-14  2:54 ` 严海双
  2017-06-14  5:28   ` Peter Dawson
  0 siblings, 1 reply; 7+ messages in thread
From: 严海双 @ 2017-06-14  2:54 UTC (permalink / raw)
  To: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy,
	Daniel Borkmann
  Cc: netdev, linux-kernel, Peter Dawson



> On 14 Jun 2017, at 10:48 AM, Haishuang Yan <yanhaishuang@cmss.chinamobile.com> wrote:
> 
> Same as ip_gre, geneve and vxlan, use key->tos as tos value.
> 
> CC: Peter Dawson <petedaws@gmail.com>
> Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on
> encapsulated packets”)
> Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
> 
> ---
> Changes since v2:
>  * Add fixes information
>  * mask key->tos with RT_TOS() suggested by Daniel
> ---
> net/ipv6/ip6_tunnel.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> index ef99d59..6400726 100644
> --- a/net/ipv6/ip6_tunnel.c
> +++ b/net/ipv6/ip6_tunnel.c
> @@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
> 		fl6.flowi6_proto = IPPROTO_IPIP;
> 		fl6.daddr = key->u.ipv6.dst;
> 		fl6.flowlabel = key->label;
> -		dsfield = ip6_tclass(key->label);
> +		dsfield =  RT_TOS(key->tos);
> 	} else {
> 		if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
> 			encap_limit = t->parms.encap_limit;
> @@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
> 		fl6.flowi6_proto = IPPROTO_IPV6;
> 		fl6.daddr = key->u.ipv6.dst;
> 		fl6.flowlabel = key->label;
> -		dsfield = ip6_tclass(key->label);
> +		dsfield = RT_TOS(key->tos);
> 	} else {
> 		offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));
> 		/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */
> -- 
> 1.8.3.1
> 
> 

Sorry, I forgot to add subject prefix, please ignore this patch.

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] ip6_tunnel: Correct tos value in collect_md mode
  2017-06-14  2:54 ` 严海双
@ 2017-06-14  5:28   ` Peter Dawson
  2017-06-15  0:58     ` 严海双
  0 siblings, 1 reply; 7+ messages in thread
From: Peter Dawson @ 2017-06-14  5:28 UTC (permalink / raw)
  To: 严海双
  Cc: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy,
	Daniel Borkmann, netdev, linux-kernel

On Wed, 14 Jun 2017 10:54:31 +0800
严海双 <yanhaishuang@cmss.chinamobile.com> wrote:


> > Changes since v2:
> >  * mask key->tos with RT_TOS() suggested by Daniel

Can you help me understand the rationale for this change? Is there are bug introduced by dsfield = ip6_tclass(key->label); ?

The RT_TOS masks out 4bits of the 8bit tos field in accordance with RFC1349 (obsoleted by RFC2474). IPv6 does not have a TOS field. So it dosen't make sense to apply a TOS value to the outer header of an IPv6 tunnel.

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] ip6_tunnel: Correct tos value in collect_md mode
  2017-06-14  5:28   ` Peter Dawson
@ 2017-06-15  0:58     ` 严海双
  0 siblings, 0 replies; 7+ messages in thread
From: 严海双 @ 2017-06-15  0:58 UTC (permalink / raw)
  To: Peter Dawson
  Cc: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy,
	Daniel Borkmann, netdev, linux-kernel


> On 14 Jun 2017, at 1:28 PM, Peter Dawson <petedaws@gmail.com> wrote:
> 
> On Wed, 14 Jun 2017 10:54:31 +0800
> 严海双 <yanhaishuang@cmss.chinamobile.com> wrote:
> 
> 
>>> Changes since v2:
>>> * mask key->tos with RT_TOS() suggested by Daniel
> 
> Can you help me understand the rationale for this change? Is there are bug introduced by dsfield = ip6_tclass(key->label); ?
> 
> The RT_TOS masks out 4bits of the 8bit tos field in accordance with RFC1349 (obsoleted by RFC2474). IPv6 does not have a TOS field. So it dosen't make sense to apply a TOS value to the outer header of an IPv6 tunnel.
> 
> 

Hi, Peter

Here the tos also means Traffic Class in IPv6, see the define in struct ip_tunnel_key:

u8          tos;        /* TOS for IPv4, TC for IPv6 */

RT_TOS mask is suggested by Daniel, please refer to the implement in vxlan or geneve code:

fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tos), label);

Thanks.

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] ip6_tunnel: Correct tos value in collect_md mode
       [not found]   ` <0D379591-C5AA-496C-BC00-18005EAA7D21@cmss.chinamobile.com>
@ 2017-06-13 15:37     ` Daniel Borkmann
  0 siblings, 0 replies; 7+ messages in thread
From: Daniel Borkmann @ 2017-06-13 15:37 UTC (permalink / raw)
  To: 严海双
  Cc: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy,
	netdev, linux-kernel, peter.a.dawson, ast

On 06/13/2017 03:31 PM, 严海双 wrote:
>> On 13 Jun 2017, at 5:57 PM, Daniel Borkmann <daniel@iogearbox.net> wrote:
>> On 06/13/2017 09:55 AM, Haishuang Yan wrote:
>>> Same as ip_gre, geneve and vxlan, use key->tos as tos value.
>>
>> Please also add Fixes tag and Cc original authors.
>>
>> Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets”)
>
> Ok, I will add it, thanks
>
>>> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
>>> ---
>>>   net/ipv6/ip6_tunnel.c | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
>>> index ef99d59..5f4aff5 100644
>>> --- a/net/ipv6/ip6_tunnel.c
>>> +++ b/net/ipv6/ip6_tunnel.c
>>> @@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
>>>   		fl6.flowi6_proto = IPPROTO_IPIP;
>>>   		fl6.daddr = key->u.ipv6.dst;
>>>   		fl6.flowlabel = key->label;
>>> -		dsfield = ip6_tclass(key->label);
>>> +		dsfield = key->tos;
>>
>> Not exactly the same as vxlan / geneve. They do use key->tos
>> indeed, but they also set fl6.flowlabel differently:
>>
>>   [...]
>>   prio = info->key.tos;
>>   [...]
>>   fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio),
>>                                      info->key.label);
>>   [...]
>>
>> But looks like the latter is done later in ip6_tnl_xmit() eventually
>> before the route lookup as per 5f733ee68f9a ("ip6_tunnel: fix traffic
>> class routing for tunnels") fix. However, you still might want to
>> mask key->tos with RT_TOS().
>
> Do you mean this way?

This one from my last comment: dsfield = RT_TOS(key->tos)

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] ip6_tunnel: Correct tos value in collect_md mode
  2017-06-13  7:55 Haishuang Yan
@ 2017-06-13  9:57 ` Daniel Borkmann
       [not found]   ` <0D379591-C5AA-496C-BC00-18005EAA7D21@cmss.chinamobile.com>
  0 siblings, 1 reply; 7+ messages in thread
From: Daniel Borkmann @ 2017-06-13  9:57 UTC (permalink / raw)
  To: Haishuang Yan, David S. Miller, Alexey Kuznetsov, James Morris,
	Patrick McHardy
  Cc: netdev, linux-kernel, peter.a.dawson, ast

On 06/13/2017 09:55 AM, Haishuang Yan wrote:
> Same as ip_gre, geneve and vxlan, use key->tos as tos value.
>

Please also add Fixes tag and Cc original authors.

Fixes: 0e9a709560db ("ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets")

> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
> ---
>   net/ipv6/ip6_tunnel.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> index ef99d59..5f4aff5 100644
> --- a/net/ipv6/ip6_tunnel.c
> +++ b/net/ipv6/ip6_tunnel.c
> @@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
>   		fl6.flowi6_proto = IPPROTO_IPIP;
>   		fl6.daddr = key->u.ipv6.dst;
>   		fl6.flowlabel = key->label;
> -		dsfield = ip6_tclass(key->label);
> +		dsfield = key->tos;

Not exactly the same as vxlan / geneve. They do use key->tos
indeed, but they also set fl6.flowlabel differently:

   [...]
   prio = info->key.tos;
   [...]
   fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio),
                                      info->key.label);
   [...]

But looks like the latter is done later in ip6_tnl_xmit() eventually
before the route lookup as per 5f733ee68f9a ("ip6_tunnel: fix traffic
class routing for tunnels") fix. However, you still might want to
mask key->tos with RT_TOS().

>   	} else {
>   		if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
>   			encap_limit = t->parms.encap_limit;
> @@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
>   		fl6.flowi6_proto = IPPROTO_IPV6;
>   		fl6.daddr = key->u.ipv6.dst;
>   		fl6.flowlabel = key->label;
> -		dsfield = ip6_tclass(key->label);
> +		dsfield = key->tos;
>   	} else {
>   		offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));
>   		/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */
>

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH] ip6_tunnel: Correct tos value in collect_md mode
@ 2017-06-13  7:55 Haishuang Yan
  2017-06-13  9:57 ` Daniel Borkmann
  0 siblings, 1 reply; 7+ messages in thread
From: Haishuang Yan @ 2017-06-13  7:55 UTC (permalink / raw)
  To: David S. Miller, Alexey Kuznetsov, James Morris, Patrick McHardy
  Cc: netdev, linux-kernel, Haishuang Yan

Same as ip_gre, geneve and vxlan, use key->tos as tos value.

Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
 net/ipv6/ip6_tunnel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ef99d59..5f4aff5 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1249,7 +1249,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 		fl6.flowi6_proto = IPPROTO_IPIP;
 		fl6.daddr = key->u.ipv6.dst;
 		fl6.flowlabel = key->label;
-		dsfield = ip6_tclass(key->label);
+		dsfield = key->tos;
 	} else {
 		if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))
 			encap_limit = t->parms.encap_limit;
@@ -1320,7 +1320,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 		fl6.flowi6_proto = IPPROTO_IPV6;
 		fl6.daddr = key->u.ipv6.dst;
 		fl6.flowlabel = key->label;
-		dsfield = ip6_tclass(key->label);
+		dsfield = key->tos;
 	} else {
 		offset = ip6_tnl_parse_tlv_enc_lim(skb, skb_network_header(skb));
 		/* ip6_tnl_parse_tlv_enc_lim() might have reallocated skb->head */
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-06-15  0:58 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-14  2:48 [PATCH] ip6_tunnel: Correct tos value in collect_md mode Haishuang Yan
2017-06-14  2:54 ` 严海双
2017-06-14  5:28   ` Peter Dawson
2017-06-15  0:58     ` 严海双
  -- strict thread matches above, loose matches on Subject: below --
2017-06-13  7:55 Haishuang Yan
2017-06-13  9:57 ` Daniel Borkmann
     [not found]   ` <0D379591-C5AA-496C-BC00-18005EAA7D21@cmss.chinamobile.com>
2017-06-13 15:37     ` Daniel Borkmann

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).