* [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set
@ 2018-04-10 10:57 Sabrina Dubroca
2018-04-10 13:10 ` Xin Long
2018-04-10 15:04 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Sabrina Dubroca @ 2018-04-10 10:57 UTC (permalink / raw)
To: netdev; +Cc: Sabrina Dubroca, Lorenzo Bianconi, Xin Long, William Tu
Commit dd9d598c6657 ("ip_gre: add the support for i/o_flags update via
netlink") added the ability to change o_flags, but missed that the
GSO/LLTX features are disabled by default, and only enabled some gre
features are unused. Thus we also need to disable the GSO/LLTX features
on the device when the TUNNEL_SEQ or TUNNEL_CSUM flags are set.
These two examples should result in the same features being set:
ip link add gre_none type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 0
ip link set gre_none type gre seq
ip link add gre_seq type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 1 seq
Fixes: dd9d598c6657 ("ip_gre: add the support for i/o_flags update via netlink")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
---
net/ipv4/ip_gre.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index a8772a978224..9c169bb2444d 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -781,8 +781,14 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu)
tunnel->encap.type == TUNNEL_ENCAP_NONE) {
dev->features |= NETIF_F_GSO_SOFTWARE;
dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+ } else {
+ dev->features &= ~NETIF_F_GSO_SOFTWARE;
+ dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
}
dev->features |= NETIF_F_LLTX;
+ } else {
+ dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
+ dev->features &= ~(NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE);
}
}
--
2.16.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set
2018-04-10 10:57 [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set Sabrina Dubroca
@ 2018-04-10 13:10 ` Xin Long
2018-04-10 13:36 ` William Tu
2018-04-10 15:04 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Xin Long @ 2018-04-10 13:10 UTC (permalink / raw)
To: Sabrina Dubroca; +Cc: network dev, Lorenzo Bianconi, William Tu
On Tue, Apr 10, 2018 at 6:57 PM, Sabrina Dubroca <sd@queasysnail.net> wrote:
> Commit dd9d598c6657 ("ip_gre: add the support for i/o_flags update via
> netlink") added the ability to change o_flags, but missed that the
> GSO/LLTX features are disabled by default, and only enabled some gre
> features are unused. Thus we also need to disable the GSO/LLTX features
> on the device when the TUNNEL_SEQ or TUNNEL_CSUM flags are set.
>
> These two examples should result in the same features being set:
>
> ip link add gre_none type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 0
>
> ip link set gre_none type gre seq
> ip link add gre_seq type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 1 seq
>
> Fixes: dd9d598c6657 ("ip_gre: add the support for i/o_flags update via netlink")
> Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
> ---
> net/ipv4/ip_gre.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
> index a8772a978224..9c169bb2444d 100644
> --- a/net/ipv4/ip_gre.c
> +++ b/net/ipv4/ip_gre.c
> @@ -781,8 +781,14 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu)
> tunnel->encap.type == TUNNEL_ENCAP_NONE) {
> dev->features |= NETIF_F_GSO_SOFTWARE;
> dev->hw_features |= NETIF_F_GSO_SOFTWARE;
> + } else {
> + dev->features &= ~NETIF_F_GSO_SOFTWARE;
> + dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
> }
> dev->features |= NETIF_F_LLTX;
> + } else {
> + dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
> + dev->features &= ~(NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE);
> }
> }
>
> --
> 2.16.2
>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set
2018-04-10 13:10 ` Xin Long
@ 2018-04-10 13:36 ` William Tu
0 siblings, 0 replies; 4+ messages in thread
From: William Tu @ 2018-04-10 13:36 UTC (permalink / raw)
To: Xin Long; +Cc: Sabrina Dubroca, network dev, Lorenzo Bianconi
On Tue, Apr 10, 2018 at 6:10 AM, Xin Long <lucien.xin@gmail.com> wrote:
> On Tue, Apr 10, 2018 at 6:57 PM, Sabrina Dubroca <sd@queasysnail.net> wrote:
>> Commit dd9d598c6657 ("ip_gre: add the support for i/o_flags update via
>> netlink") added the ability to change o_flags, but missed that the
>> GSO/LLTX features are disabled by default, and only enabled some gre
>> features are unused. Thus we also need to disable the GSO/LLTX features
>> on the device when the TUNNEL_SEQ or TUNNEL_CSUM flags are set.
>>
>> These two examples should result in the same features being set:
>>
>> ip link add gre_none type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 0
>>
>> ip link set gre_none type gre seq
>> ip link add gre_seq type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 1 seq
>>
>> Fixes: dd9d598c6657 ("ip_gre: add the support for i/o_flags update via netlink")
>> Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
>> ---
Looks good to me.
Acked-by: William Tu <u9012063@gmail.com>
>> net/ipv4/ip_gre.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
>> index a8772a978224..9c169bb2444d 100644
>> --- a/net/ipv4/ip_gre.c
>> +++ b/net/ipv4/ip_gre.c
>> @@ -781,8 +781,14 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu)
>> tunnel->encap.type == TUNNEL_ENCAP_NONE) {
>> dev->features |= NETIF_F_GSO_SOFTWARE;
>> dev->hw_features |= NETIF_F_GSO_SOFTWARE;
>> + } else {
>> + dev->features &= ~NETIF_F_GSO_SOFTWARE;
>> + dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
>> }
>> dev->features |= NETIF_F_LLTX;
>> + } else {
>> + dev->hw_features &= ~NETIF_F_GSO_SOFTWARE;
>> + dev->features &= ~(NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE);
>> }
>> }
>>
>> --
>> 2.16.2
>>
> Reviewed-by: Xin Long <lucien.xin@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set
2018-04-10 10:57 [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set Sabrina Dubroca
2018-04-10 13:10 ` Xin Long
@ 2018-04-10 15:04 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2018-04-10 15:04 UTC (permalink / raw)
To: sd; +Cc: netdev, lorenzo.bianconi, lucien.xin, u9012063
From: Sabrina Dubroca <sd@queasysnail.net>
Date: Tue, 10 Apr 2018 12:57:18 +0200
> Commit dd9d598c6657 ("ip_gre: add the support for i/o_flags update via
> netlink") added the ability to change o_flags, but missed that the
> GSO/LLTX features are disabled by default, and only enabled some gre
> features are unused. Thus we also need to disable the GSO/LLTX features
> on the device when the TUNNEL_SEQ or TUNNEL_CSUM flags are set.
>
> These two examples should result in the same features being set:
>
> ip link add gre_none type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 0
>
> ip link set gre_none type gre seq
> ip link add gre_seq type gre local 192.168.0.10 remote 192.168.0.20 ttl 255 key 1 seq
>
> Fixes: dd9d598c6657 ("ip_gre: add the support for i/o_flags update via netlink")
> Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-10 15:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-10 10:57 [PATCH net] ip_gre: clear feature flags when incompatible o_flags are set Sabrina Dubroca
2018-04-10 13:10 ` Xin Long
2018-04-10 13:36 ` William Tu
2018-04-10 15:04 ` 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).