net: add netif_inherit_tso_max()

To make later patches smaller create a helper for inheriting
the TSO limitations of a lower device. The TSO in the name
is not an accident, subsequent patches will replace GSO
with TSO in more names.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
index ba3fa7eac98dcee22eb097a9bf72de340664a79b..790e1d5e4b4a0d2d3b219e0b498bad3874d71e44 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
@@ -286,8 +286,7 @@ nfp_repr_transfer_features(struct net_device *netdev, struct net_device *lower)
        if (repr->dst->u.port_info.lower_dev != lower)
                return;
 
-       netif_set_gso_max_size(netdev, lower->gso_max_size);
-       netif_set_gso_max_segs(netdev, lower->gso_max_segs);
+       netif_inherit_tso_max(netdev, lower);
 
        netdev_update_features(netdev);
 }

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 696e245f6d009d4d5d4a9c3523e4aa1e5d0f8bb6..aa28a29e228c0f3337b6c32d89d525e55a2c2021 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -139,8 +139,7 @@ static int ipvlan_init(struct net_device *dev)
        dev->vlan_features = phy_dev->vlan_features & IPVLAN_FEATURES;
        dev->vlan_features |= IPVLAN_ALWAYS_ON_OFLOADS;
        dev->hw_enc_features |= dev->features;
-       netif_set_gso_max_size(dev, phy_dev->gso_max_size);
-       netif_set_gso_max_segs(dev, phy_dev->gso_max_segs);
+       netif_inherit_tso_max(dev, phy_dev);
        dev->hard_header_len = phy_dev->hard_header_len;
 
        netdev_lockdep_set_classes(dev);
@@ -762,8 +761,7 @@ static int ipvlan_device_event(struct notifier_block *unused,
 
        case NETDEV_FEAT_CHANGE:
                list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
-                       netif_set_gso_max_size(ipvlan->dev, dev->gso_max_size);
-                       netif_set_gso_max_segs(ipvlan->dev, dev->gso_max_segs);
+                       netif_inherit_tso_max(ipvlan->dev, dev);
                        netdev_update_features(ipvlan->dev);
                }
                break;

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index b00bc8173abea8478954adc5d632e10cb8da7aef..0017bd0fe3bb06d3a6486b7e8eaaef76bd978b6f 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -904,8 +904,7 @@ static int macvlan_init(struct net_device *dev)
        dev->vlan_features      = lowerdev->vlan_features & MACVLAN_FEATURES;
        dev->vlan_features      |= ALWAYS_ON_OFFLOADS;
        dev->hw_enc_features    |= dev->features;
-       netif_set_gso_max_size(dev, lowerdev->gso_max_size);
-       netif_set_gso_max_segs(dev, lowerdev->gso_max_segs);
+       netif_inherit_tso_max(dev, lowerdev);
        dev->hard_header_len    = lowerdev->hard_header_len;
        macvlan_set_lockdep_class(dev);
 
@@ -1763,8 +1762,7 @@ static int macvlan_device_event(struct notifier_block *unused,
                break;
        case NETDEV_FEAT_CHANGE:
                list_for_each_entry(vlan, &port->vlans, list) {
-                       netif_set_gso_max_size(vlan->dev, dev->gso_max_size);
-                       netif_set_gso_max_segs(vlan->dev, dev->gso_max_segs);
+                       netif_inherit_tso_max(vlan->dev, dev);
                        netdev_update_features(vlan->dev);
                }
                break;

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 3592014e50cc3169199f39dc43c195c9af38fb39..f474e79a774580e4cb67da44b5f0c796c3ce8abb 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1758,8 +1758,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
        if (ifmp && (dev->ifindex != 0))
                peer->ifindex = ifmp->ifi_index;
 
-       netif_set_gso_max_size(peer, dev->gso_max_size);
-       netif_set_gso_max_segs(peer, dev->gso_max_segs);
+       netif_inherit_tso_max(peer, dev);
 
        err = register_netdevice(peer);
        put_net(net);

diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 8a5e3a6d32d7ce0dec79e3061f6d356d014f47cf..2bda692f70c54b640e630ab27149cc97eca94883 100644 (file)
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -3683,8 +3683,7 @@ static void vxlan_config_apply(struct net_device *dev,
        if (lowerdev) {
                dst->remote_ifindex = conf->remote_ifindex;
 
-               netif_set_gso_max_size(dev, lowerdev->gso_max_size);
-               netif_set_gso_max_segs(dev, lowerdev->gso_max_segs);
+               netif_inherit_tso_max(dev, lowerdev);
 
                needed_headroom = lowerdev->hard_header_len;
                needed_headroom += lowerdev->needed_headroom;

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index eaf66e57d89142a66dc001c4d2432f6a6f93c5fd..006bb5c0e4130c61a6838aa6c302cdb10951d81b 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4895,6 +4895,9 @@ static inline void netif_set_gro_max_size(struct net_device *dev,
        WRITE_ONCE(dev->gro_max_size, size);
 }
 
+void netif_inherit_tso_max(struct net_device *to,
+                          const struct net_device *from);
+
 static inline void skb_gso_error_unwind(struct sk_buff *skb, __be16 protocol,
                                        int pulled_hlen, u16 mac_offset,
                                        int mac_len)

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 788076b002b3b5198c9f4c21a0ad4d940e172592..e40aa3e3641cbf0f5ab4fdd3e374ba9d1ef5a82d 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -319,8 +319,7 @@ static void vlan_transfer_features(struct net_device *dev,
 {
        struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
 
-       netif_set_gso_max_size(vlandev, dev->gso_max_size);
-       netif_set_gso_max_segs(vlandev, dev->gso_max_segs);
+       netif_inherit_tso_max(vlandev, dev);
 
        if (vlan_hw_offload_capable(dev->features, vlan->vlan_proto))
                vlandev->hard_header_len = dev->hard_header_len;

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index e5d23e75572a0e59a3559d467958cdd809c0cdd9..839f2020b015ecaed897bd6672d85b187f982765 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -573,8 +573,7 @@ static int vlan_dev_init(struct net_device *dev)
                           NETIF_F_ALL_FCOE;
 
        dev->features |= dev->hw_features | NETIF_F_LLTX;
-       netif_set_gso_max_size(dev, real_dev->gso_max_size);
-       netif_set_gso_max_segs(dev, real_dev->gso_max_segs);
+       netif_inherit_tso_max(dev, real_dev);
        if (dev->features & NETIF_F_VLAN_FEATURES)
                netdev_warn(real_dev, "VLAN features are set incorrectly.  Q-in-Q configurations may not work correctly.\n");
 

diff --git a/net/core/dev.c b/net/core/dev.c
index c2d73595a7c369995c1f75afbddefc32c2d7283c..eef1d19b130fd31fb72bc0f972c0910461dd1b0a 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2992,6 +2992,18 @@ undo_rx:
 }
 EXPORT_SYMBOL(netif_set_real_num_queues);
 
+/**
+ * netif_inherit_tso_max() - copy all TSO limits from a lower device to an upper
+ * @to:                netdev to update
+ * @from:      netdev from which to copy the limits
+ */
+void netif_inherit_tso_max(struct net_device *to, const struct net_device *from)
+{
+       netif_set_gso_max_size(to, from->gso_max_size);
+       netif_set_gso_max_segs(to, from->gso_max_segs);
+}
+EXPORT_SYMBOL(netif_inherit_tso_max);
+
 /**
  * netif_get_num_default_rss_queues - default number of RSS queues
  *