From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 5 May 2022 19:51:31 -0700
Subject: net: add netif_inherit_tso_max()
Patch-mainline: v5.19-rc1
Git-commit: 6df6398f7c8b481ce83f28143bc08a5231616deb
References: jsc#PED-1565
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>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 3 +--
drivers/net/ipvlan/ipvlan_main.c | 6 ++----
drivers/net/macvlan.c | 6 ++----
drivers/net/veth.c | 3 +--
drivers/net/vxlan.c | 3 +--
include/linux/netdevice.h | 3 +++
net/8021q/vlan.c | 3 +--
net/8021q/vlan_dev.c | 3 +--
net/core/dev.c | 12 ++++++++++++
9 files changed, 24 insertions(+), 18 deletions(-)
--- 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_de
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);
}
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -140,8 +140,7 @@ static int ipvlan_init(struct net_device
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 no
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;
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -903,8 +903,7 @@ static int macvlan_init(struct net_devic
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);
@@ -1751,8 +1750,7 @@ static int macvlan_device_event(struct n
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;
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1516,8 +1516,7 @@ static int veth_newlink(struct net *src_
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);
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -3811,8 +3811,7 @@ static void vxlan_config_apply(struct ne
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;
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4820,6 +4820,9 @@ static inline void netif_set_gro_max_siz
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)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -322,8 +322,7 @@ static void vlan_transfer_features(struc
{
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;
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -573,8 +573,7 @@ static int vlan_dev_init(struct net_devi
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");
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2937,6 +2937,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
*
* This routine should set an upper limit on the number of RSS queues