[PATCH net-next 1/3] net: use ndo_set_features to set offload features for bonding/bridge/team
From: Hangbin Liu <hidden>
Date: 2026-03-10 07:46:54
Also in:
bridge, lkml
Subsystem:
bonding driver, ethernet bridge, networking drivers, networking [general], team driver, the rest · Maintainers:
Jay Vosburgh, Nikolay Aleksandrov, Ido Schimmel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jiri Pirko, Linus Torvalds
Convert bonding, bridge, and team drivers to use ndo_set_features callback
instead of manually calling netdev_compute_master_upper_features() during
port add/remove operations.
This change centralizes the feature computation flow:
Before:
- netdev_master_upper_dev_link()
- netdev_compute_master_upper_features() <- called manually
- 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_set_features()
- netdev_compute_master_upper_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 <redacted>
---
drivers/net/bonding/bond_main.c | 11 ++++++++---
drivers/net/team/team_core.c | 12 ++++++++----
net/bridge/br_device.c | 7 +++++++
net/bridge/br_if.c | 4 ----
net/core/dev.c | 8 ++++++--
5 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0ccf928eecde..4d32b06079ee 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c@@ -1509,6 +1509,12 @@ static netdev_features_t bond_fix_features(struct net_device *dev, return features; } +static int bond_set_features(struct net_device *dev, netdev_features_t features) +{ + netdev_compute_master_upper_features(dev, true); + return 0; +} + static void bond_setup_by_slave(struct net_device *bond_dev, struct net_device *slave_dev) {
@@ -2228,7 +2234,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
@@ -2483,7 +2488,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");
@@ -3975,7 +3979,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;
@@ -5897,6 +5901,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_set_features = bond_set_features, .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 b7282f5c9632..4906ea3717b1 100644
--- a/drivers/net/team/team_core.c
+++ b/drivers/net/team/team_core.c@@ -1247,7 +1247,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);
@@ -1337,7 +1336,6 @@ static int team_port_del(struct team *team, struct net_device *port_dev, bool un } kfree_rcu(port, rcu); netdev_info(dev, "Port device %s removed\n", portname); - netdev_compute_master_upper_features(team->dev, true); return 0; }
@@ -1645,7 +1643,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)
@@ -1972,6 +1969,12 @@ static netdev_features_t team_fix_features(struct net_device *dev, return features; } +static int team_set_features(struct net_device *dev, netdev_features_t features) +{ + netdev_compute_master_upper_features(dev, true); + return 0; +} + static int team_change_carrier(struct net_device *dev, bool new_carrier) { struct team *team = netdev_priv(dev);
@@ -2007,6 +2010,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_set_features = team_set_features, .ndo_change_carrier = team_change_carrier, .ndo_features_check = passthru_features_check, };
@@ -2944,7 +2948,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 f7502e62dd35..f82082050e36 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c@@ -289,6 +289,12 @@ static netdev_features_t br_fix_features(struct net_device *dev, return br_features_recompute(br, features); } +static int br_set_features(struct net_device *dev, netdev_features_t features) +{ + netdev_compute_master_upper_features(dev, false); + return 0; +} + #ifdef CONFIG_NET_POLL_CONTROLLER static void br_poll_controller(struct net_device *br_dev) {
@@ -456,6 +462,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_set_features = br_set_features, .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 d39571e13744..030248bc94c5 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 6fc9350f0be8..ce1d9c73e6ce 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c@@ -8919,6 +8919,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:
@@ -9011,6 +9014,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); } /**
@@ -12873,8 +12879,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);
--
Git-155)