bonding: use common function to compute the features

Use the new functon netdev_compute_master_upper_features() to compute the bonding
features.

Note that bond_compute_features() currently uses bond_for_each_slave()
to traverse the lower devices list, and that is just a macro wrapper of
netdev_for_each_lower_private(). We use similar helper
netdev_for_each_lower_dev() in netdev_compute_master_upper_features() to
iterate the slave device, as there is not need to get the private data.

No functional change intended.

Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://patch.msgid.link/20251017034155.61990-3-liuhangbin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 4da619210c1fa8b2d7b2baee68aba4b39bc9a78c..cd7da6ed8c6bb3f1e0a9ce70cc960259f035dd7a 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1468,97 +1468,6 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
        return features;
 }
 
-#define BOND_VLAN_FEATURES     (NETIF_F_HW_CSUM | NETIF_F_SG | \
-                                NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \
-                                NETIF_F_GSO_ENCAP_ALL | \
-                                NETIF_F_HIGHDMA | NETIF_F_LRO)
-
-#define BOND_ENC_FEATURES      (NETIF_F_HW_CSUM | NETIF_F_SG | \
-                                NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE | \
-                                NETIF_F_GSO_PARTIAL)
-
-#define BOND_MPLS_FEATURES     (NETIF_F_HW_CSUM | NETIF_F_SG | \
-                                NETIF_F_GSO_SOFTWARE)
-
-#define BOND_GSO_PARTIAL_FEATURES (NETIF_F_GSO_ESP)
-
-
-static void bond_compute_features(struct bonding *bond)
-{
-       netdev_features_t gso_partial_features = BOND_GSO_PARTIAL_FEATURES;
-       unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |
-                                       IFF_XMIT_DST_RELEASE_PERM;
-       netdev_features_t vlan_features = BOND_VLAN_FEATURES;
-       netdev_features_t enc_features  = BOND_ENC_FEATURES;
-#ifdef CONFIG_XFRM_OFFLOAD
-       netdev_features_t xfrm_features  = BOND_XFRM_FEATURES;
-#endif /* CONFIG_XFRM_OFFLOAD */
-       netdev_features_t mpls_features  = BOND_MPLS_FEATURES;
-       struct net_device *bond_dev = bond->dev;
-       struct list_head *iter;
-       struct slave *slave;
-       unsigned short max_hard_header_len = ETH_HLEN;
-       unsigned int tso_max_size = TSO_MAX_SIZE;
-       u16 tso_max_segs = TSO_MAX_SEGS;
-
-       if (!bond_has_slaves(bond))
-               goto done;
-
-       vlan_features = netdev_base_features(vlan_features);
-       mpls_features = netdev_base_features(mpls_features);
-
-       bond_for_each_slave(bond, slave, iter) {
-               vlan_features = netdev_increment_features(vlan_features,
-                       slave->dev->vlan_features, BOND_VLAN_FEATURES);
-
-               enc_features = netdev_increment_features(enc_features,
-                                                        slave->dev->hw_enc_features,
-                                                        BOND_ENC_FEATURES);
-
-#ifdef CONFIG_XFRM_OFFLOAD
-               xfrm_features = netdev_increment_features(xfrm_features,
-                                                         slave->dev->hw_enc_features,
-                                                         BOND_XFRM_FEATURES);
-#endif /* CONFIG_XFRM_OFFLOAD */
-
-               gso_partial_features = netdev_increment_features(gso_partial_features,
-                                                                slave->dev->gso_partial_features,
-                                                                BOND_GSO_PARTIAL_FEATURES);
-
-               mpls_features = netdev_increment_features(mpls_features,
-                                                         slave->dev->mpls_features,
-                                                         BOND_MPLS_FEATURES);
-
-               dst_release_flag &= slave->dev->priv_flags;
-               if (slave->dev->hard_header_len > max_hard_header_len)
-                       max_hard_header_len = slave->dev->hard_header_len;
-
-               tso_max_size = min(tso_max_size, slave->dev->tso_max_size);
-               tso_max_segs = min(tso_max_segs, slave->dev->tso_max_segs);
-       }
-       bond_dev->hard_header_len = max_hard_header_len;
-
-done:
-       bond_dev->gso_partial_features = gso_partial_features;
-       bond_dev->vlan_features = vlan_features;
-       bond_dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |
-                                   NETIF_F_HW_VLAN_CTAG_TX |
-                                   NETIF_F_HW_VLAN_STAG_TX;
-#ifdef CONFIG_XFRM_OFFLOAD
-       bond_dev->hw_enc_features |= xfrm_features;
-#endif /* CONFIG_XFRM_OFFLOAD */
-       bond_dev->mpls_features = mpls_features;
-       netif_set_tso_max_segs(bond_dev, tso_max_segs);
-       netif_set_tso_max_size(bond_dev, tso_max_size);
-
-       bond_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
-       if ((bond_dev->priv_flags & IFF_XMIT_DST_RELEASE_PERM) &&
-           dst_release_flag == (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM))
-               bond_dev->priv_flags |= IFF_XMIT_DST_RELEASE;
-
-       netdev_change_features(bond_dev);
-}
-
 static void bond_setup_by_slave(struct net_device *bond_dev,
                                struct net_device *slave_dev)
 {
@@ -2273,7 +2182,7 @@ skip_mac_set:
        }
 
        bond->slave_cnt++;
-       bond_compute_features(bond);
+       netdev_compute_master_upper_features(bond->dev, true);
        bond_set_carrier(bond);
 
        /* Needs to be called before bond_select_active_slave(), which will
@@ -2525,7 +2434,7 @@ static int __bond_release_one(struct net_device *bond_dev,
                call_netdevice_notifiers(NETDEV_RELEASE, bond->dev);
        }
 
-       bond_compute_features(bond);
+       netdev_compute_master_upper_features(bond->dev, true);
        if (!(bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
            (old_features & NETIF_F_VLAN_CHALLENGED))
                slave_info(bond_dev, slave_dev, "last VLAN challenged slave left bond - VLAN blocking is removed\n");
@@ -4028,7 +3937,7 @@ static int bond_slave_netdev_event(unsigned long event,
        case NETDEV_FEAT_CHANGE:
                if (!bond->notifier_ctx) {
                        bond->notifier_ctx = true;
-                       bond_compute_features(bond);
+                       netdev_compute_master_upper_features(bond->dev, true);
                        bond->notifier_ctx = false;
                }
                break;
@@ -6011,7 +5920,7 @@ void bond_setup(struct net_device *bond_dev)
         * capable
         */
 
-       bond_dev->hw_features = BOND_VLAN_FEATURES |
+       bond_dev->hw_features = MASTER_UPPER_DEV_VLAN_FEATURES |
                                NETIF_F_HW_VLAN_CTAG_RX |
                                NETIF_F_HW_VLAN_CTAG_FILTER |
                                NETIF_F_HW_VLAN_STAG_RX |