ip_gre, ip6_gre: Make [IP6]GRE[TAP] devices always NETIF_F_LLTX
Subsystems (3)
v2 cover ip_gre, ip6_gre: Make [IP6]GRE[TAP] devices always NETIF_F_LLTX
From: Peilin Ye <[email protected]>
v1: https://lore.kernel.org/netdev/[email protected]/
change since v1:
- deleted "depends on patch..." in [1/2]'s commit message
Hi all,
This patchset depends on these fixes [1], which has been merged into net-next. Since o_seqno is now atomic_t, we can always turn on NETIF_F_LLTX for [IP6]GRE[TAP] devices, since we no longer need the TX lock (&txq->_xmit_lock).
We could probably do the same thing to [IP6]ERSPAN devices as well, but I'm not familiar with them yet. For example, ERSPAN devices are initialized as |= GRE_FEATURES in erspan_tunnel_init(), but I don't see IP6ERSPAN devices being initialized as |= GRE6_FEATURES. Where should we initialize IP6ERSPAN devices' ->features? Please suggest if I'm missing something, thanks!
[1] https://lore.kernel.org/netdev/[email protected]/
Thanks,
Peilin Ye (2):
ip_gre: Make GRE and GRETAP devices always NETIF_F_LLTX
ip6_gre: Make IP6GRE and IP6GRETAP devices always NETIF_F_LLTX
net/ipv4/ip_gre.c | 50 ++++++++++++++++++++-------------------------- net/ipv6/ip6_gre.c | 34 ++++++++++++------------------- 2 files changed, 35 insertions(+), 49 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/2 ip_gre: Make GRE and GRETAP devices always NETIF_F_LLTX
From: Peilin Ye <[email protected]>
Recently we made o_seqno atomic_t. Stop special-casing TUNNEL_SEQ, and always mark GRE[TAP] devices as NETIF_F_LLTX, since we no longer need the TX lock (&txq->_xmit_lock).
---
change since v1:
- deleted "depends on patch..." in commit message
net/ipv4/ip_gre.c | 50 +++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 28 deletions(-)
net/ipv4/ip_gre.c +22 -28
@@ -748,6 +748,7 @@ static netdev_tx_t gre_tap_xmit(struct sk_buff *skb,static void ipgre_link_update (struct net_device *dev,bool set_mtu) {struct ip_tunnel *tunnel =netdev_priv (dev); +__be16 flags;int len; len = tunnel->tun_hlen;
@@ -763,19 +764,15 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu)if (set_mtu) dev->mtu =max_t (int, dev->mtu - len,68 ); -if (!(tunnel->parms.o_flags &TUNNEL_SEQ )) { -if (!(tunnel->parms.o_flags &TUNNEL_CSUM ) || - 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 { + flags = tunnel->parms.o_flags; + +if (flags &TUNNEL_SEQ || + (flags &TUNNEL_CSUM && tunnel->encap.type !=TUNNEL_ENCAP_NONE )) { + dev->features &= ~NETIF_F_GSO_SOFTWARE ; dev->hw_features &= ~NETIF_F_GSO_SOFTWARE ; - dev->features &= ~(NETIF_F_LLTX |NETIF_F_GSO_SOFTWARE ); + }else { + dev->features |=NETIF_F_GSO_SOFTWARE ; + dev->hw_features |=NETIF_F_GSO_SOFTWARE ; } }
@@ -949,6 +946,7 @@ static void ipgre_tunnel_setup(struct net_device *dev)static void __gre_tunnel_init (struct net_device *dev) {struct ip_tunnel *tunnel; +__be16 flags; tunnel =netdev_priv (dev); tunnel->tun_hlen =gre_calc_hlen (tunnel->parms.o_flags);
@@ -957,25 +955,21 @@ static void __gre_tunnel_init(struct net_device *dev) tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen; dev->needed_headroom = tunnel->hlen +sizeof (tunnel->parms.iph); - dev->features |=GRE_FEATURES ; + dev->features |=GRE_FEATURES |NETIF_F_LLTX ; dev->hw_features |=GRE_FEATURES ; -if (!(tunnel->parms.o_flags &TUNNEL_SEQ )) { -/* TCP offload with GRE SEQ is not supported, nor -* can we support 2 levels of outer headers requiring -* an update. -*/ -if (!(tunnel->parms.o_flags &TUNNEL_CSUM ) || - (tunnel->encap.type ==TUNNEL_ENCAP_NONE )) { - dev->features |=NETIF_F_GSO_SOFTWARE ; - dev->hw_features |=NETIF_F_GSO_SOFTWARE ; - } + flags = tunnel->parms.o_flags; -/* Can use a lockless transmit, unless we generate -* output sequences -*/ - dev->features |=NETIF_F_LLTX ; - } +/* TCP offload with GRE SEQ is not supported, nor can we support 2 +* levels of outer headers requiring an update. +*/ +if (flags &TUNNEL_SEQ ) +return ; +if (flags &TUNNEL_CSUM && tunnel->encap.type !=TUNNEL_ENCAP_NONE ) +return ; + + dev->features |=NETIF_F_GSO_SOFTWARE ; + dev->hw_features |=NETIF_F_GSO_SOFTWARE ; }static int ipgre_tunnel_init (struct net_device *dev)
Signature · 1 line
2.20.1
PATCH v2 2/2 ip6_gre: Make IP6GRE and IP6GRETAP devices always NETIF_F_LLTX
In reply to Peilin YeFrom: Peilin Ye <[email protected]>
Recently we made o_seqno atomic_t. Stop special-casing TUNNEL_SEQ, and always mark IP6GRE[TAP] devices as NETIF_F_LLTX, since we no longer need the TX lock (&txq->_xmit_lock).
---
(no changes since v1)
net/ipv6/ip6_gre.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-)
net/ipv6/ip6_gre.c +13 -21
@@ -382,11 +382,6 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net, goto failed_free;ip6gre_tnl_link_config (nt,1 ); - -/* Can use a lockless transmit, unless we generate output sequences */ -if (!(nt->parms.o_flags &TUNNEL_SEQ )) - dev->features |=NETIF_F_LLTX ; -ip6gre_tunnel_link (ign, nt);return nt;
@@ -1445,26 +1440,23 @@ static void ip6gre_tunnel_setup(struct net_device *dev)static void ip6gre_tnl_init_features (struct net_device *dev) {struct ip6_tnl *nt =netdev_priv (dev); +__be16 flags; - dev->features |=GRE6_FEATURES ; + dev->features |=GRE6_FEATURES |NETIF_F_LLTX ; dev->hw_features |=GRE6_FEATURES ; -if (!(nt->parms.o_flags &TUNNEL_SEQ )) { -/* TCP offload with GRE SEQ is not supported, nor -* can we support 2 levels of outer headers requiring -* an update. -*/ -if (!(nt->parms.o_flags &TUNNEL_CSUM ) || - nt->encap.type ==TUNNEL_ENCAP_NONE ) { - dev->features |=NETIF_F_GSO_SOFTWARE ; - dev->hw_features |=NETIF_F_GSO_SOFTWARE ; - } + flags = nt->parms.o_flags; -/* Can use a lockless transmit, unless we generate -* output sequences -*/ - dev->features |=NETIF_F_LLTX ; - } +/* TCP offload with GRE SEQ is not supported, nor can we support 2 +* levels of outer headers requiring an update. +*/ +if (flags &TUNNEL_SEQ ) +return ; +if (flags &TUNNEL_CSUM && nt->encap.type !=TUNNEL_ENCAP_NONE ) +return ; + + dev->features |=NETIF_F_GSO_SOFTWARE ; + dev->hw_features |=NETIF_F_GSO_SOFTWARE ; }static int ip6gre_tunnel_init_common (struct net_device *dev)
Signature · 1 line
2.20.1
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Thu, 28 Apr 2022 22:24:17 -0700 you wrote:
From: Peilin Ye <[email protected]>
v1: https://lore.kernel.org/netdev/[email protected]/
change since v1:
- deleted "depends on patch..." in [1/2]'s commit message[...]
Here is the summary with links:
- [v2,net-next,1/2] ip_gre: Make GRE and GRETAP devices always NETIF_F_LLTX
https://git.kernel.org/netdev/net-next/c/020e8f60aa8b - [v2,net-next,2/2] ip6_gre: Make IP6GRE and IP6GRETAP devices always NETIF_F_LLTX https://git.kernel.org/netdev/net-next/c/b11ebf2ca2c1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html