Convert bonding, bridge, and team drivers to use the new
ndo_update_offloads callback instead of manually calling
netdev_compute_master_upper_features() during port add/remove operations.
This change centralizes the feature computation flow:
Before:
- netdev_compute_master_upper_features()
- compute offload features
- netdev_change_features()
- __netdev_update_features()
- update other features
After:
- netdev_master_upper_dev_link()
- __netdev_upper_dev_link()
- netdev_change_features()
- __netdev_update_features()
- ndo_update_offloads()
- netdev_compute_master_upper_features()
- update other features
This ensures offload features are computed automatically when
upper/lower device links change, removing the need for manual
feature computation calls in the driver code.
The netdev_change_features() call in team_uninit() is also removed
since it calls team_port_del() for each port, which now triggers
feature updates automatically.
Signed-off-by: Hangbin Liu <[email protected]>
---
drivers/net/bonding/bond_main.c | 10 +++++++---
drivers/net/team/team_core.c | 11 +++++++----
net/bridge/br_device.c | 6 ++++++
net/bridge/br_if.c | 4 ----
net/core/dev.c | 8 ++++++--
5 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 55a960da42b5..dc524f595e28 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1504,6 +1504,11 @@ static netdev_features_t bond_fix_features(struct
net_device *dev,
return features;
}
+static void bond_update_offloads(struct net_device *dev)
+{
+ netdev_compute_master_upper_features(dev, true);
+}
+
static void bond_setup_by_slave(struct net_device *bond_dev,
struct net_device *slave_dev)
{
@@ -2224,7 +2229,6 @@ int bond_enslave(struct net_device *bond_dev, struct
net_device *slave_dev,
}
bond->slave_cnt++;
- netdev_compute_master_upper_features(bond->dev, true);
bond_set_carrier(bond);
/* Needs to be called before bond_select_active_slave(), which will
@@ -2479,7 +2483,6 @@ static int __bond_release_one(struct net_device *bond_dev,
call_netdevice_notifiers(NETDEV_RELEASE, bond->dev);
}
- 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");
@@ -3971,7 +3974,7 @@ static int bond_slave_netdev_event(unsigned long event,
case NETDEV_FEAT_CHANGE:
if (!bond->notifier_ctx) {
bond->notifier_ctx = true;
- netdev_compute_master_upper_features(bond->dev, true);
+ netdev_change_features(bond->dev);
bond->notifier_ctx = false;
}
break;
@@ -5895,6 +5898,7 @@ static const struct net_device_ops bond_netdev_ops = {
.ndo_add_slave = bond_enslave,
.ndo_del_slave = bond_release,
.ndo_fix_features = bond_fix_features,
+ .ndo_update_offloads = bond_update_offloads,
.ndo_features_check = passthru_features_check,
.ndo_get_xmit_slave = bond_xmit_get_slave,
.ndo_sk_get_lower_dev = bond_sk_get_lower_dev,
diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c
index c08a5c1bd6e4..fa62965b61de 100644
--- a/drivers/net/team/team_core.c
+++ b/drivers/net/team/team_core.c
@@ -1249,7 +1249,6 @@ static int team_port_add(struct team *team, struct
net_device *port_dev,
port->index = -1;
list_add_tail_rcu(&port->list, &team->port_list);
team_port_enable(team, port);
- netdev_compute_master_upper_features(team->dev, true);
__team_port_change_port_added(port, !!netif_oper_up(port_dev));
__team_options_change_check(team);
@@ -1333,7 +1332,6 @@ static int team_port_del(struct team *team, struct
net_device *port_dev)
dev_set_mtu(port_dev, port->orig.mtu);
kfree_rcu(port, rcu);
netdev_info(dev, "Port device %s removed\n", portname);
- netdev_compute_master_upper_features(team->dev, true);
return 0;
}
@@ -1641,7 +1639,6 @@ static void team_uninit(struct net_device *dev)
team_mcast_rejoin_fini(team);
team_notify_peers_fini(team);
team_queue_override_fini(team);
- netdev_change_features(dev);
}
static void team_destructor(struct net_device *dev)
@@ -1959,6 +1956,11 @@ static netdev_features_t team_fix_features(struct
net_device *dev,
return features;
}
+static void team_update_offloads(struct net_device *dev)
+{
+ netdev_compute_master_upper_features(dev, true);
+}
+
static int team_change_carrier(struct net_device *dev, bool new_carrier)
{
struct team *team = netdev_priv(dev);
@@ -1994,6 +1996,7 @@ static const struct net_device_ops team_netdev_ops = {
.ndo_add_slave = team_add_slave,
.ndo_del_slave = team_del_slave,
.ndo_fix_features = team_fix_features,
+ .ndo_update_offloads = team_update_offloads,
.ndo_change_carrier = team_change_carrier,
.ndo_features_check = passthru_features_check,
};
@@ -2931,7 +2934,7 @@ static int team_device_event(struct notifier_block
*unused,
case NETDEV_FEAT_CHANGE:
if (!port->team->notifier_ctx) {
port->team->notifier_ctx = true;
- netdev_compute_master_upper_features(port->team->dev,
true);
+ netdev_change_features(port->team->dev);
port->team->notifier_ctx = false;
}
break;
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index a818fdc22da9..3f2e8f5249fb 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -289,6 +289,11 @@ static netdev_features_t br_fix_features(struct net_device
*dev,
return br_features_recompute(br, features);
}
+static void br_update_offloads(struct net_device *dev)
+{
+ netdev_compute_master_upper_features(dev, false);
+}
+
#ifdef CONFIG_NET_POLL_CONTROLLER
static void br_poll_controller(struct net_device *br_dev)
{
@@ -456,6 +461,7 @@ static const struct net_device_ops br_netdev_ops = {
.ndo_add_slave = br_add_slave,
.ndo_del_slave = br_del_slave,
.ndo_fix_features = br_fix_features,
+ .ndo_update_offloads = br_update_offloads,
.ndo_fdb_add = br_fdb_add,
.ndo_fdb_del = br_fdb_delete,
.ndo_fdb_del_bulk = br_fdb_delete_bulk,
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 4c67a32745f6..7806436340ef 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -680,8 +680,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
br_mtu_auto_adjust(br);
- netdev_compute_master_upper_features(br->dev, false);
-
kobject_uevent(&p->kobj, KOBJ_ADD);
return 0;
@@ -734,8 +732,6 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
if (changed_addr)
call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);
- netdev_compute_master_upper_features(br->dev, false);
-
return 0;
}
diff --git a/net/core/dev.c b/net/core/dev.c
index d05837c0713a..7043ee022980 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -8893,6 +8893,9 @@ static int __netdev_upper_dev_link(struct net_device *dev,
__netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,
priv);
+ /* re-compute all features after adding link */
+ netdev_change_features(upper_dev);
+
return 0;
rollback:
@@ -8985,6 +8988,9 @@ static void __netdev_upper_dev_unlink(struct net_device
*dev,
__netdev_update_lower_level(upper_dev, priv);
__netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,
priv);
+
+ /* re-compute all features after removing link */
+ netdev_change_features(upper_dev);
}
/**
@@ -12851,8 +12857,6 @@ void netdev_compute_master_upper_features(struct
net_device *dev, bool update_he
netif_set_tso_max_segs(dev, tso_max_segs);
netif_set_tso_max_size(dev, tso_max_size);
-
- netdev_change_features(dev);
}
EXPORT_SYMBOL(netdev_compute_master_upper_features);
--
2.50.1
