Commit 21e45ec8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-common-feature-compute-for-upper-interface' 

Hangbin Liu says:

====================
net: common feature compute for upper interface

Some high-level virtual drivers need to compute features from their
lower devices, but each currently has its own implementation and may
miss some feature computations. This patch set introduces a common function
to compute features for such devices.

Currently, bonding, team, and bridge have been updated to use the new
helper.
====================

Link: https://patch.msgid.link/20251017034155.61990-1-liuhangbin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0364ca33 0152747a

drivers/net/bonding/bond_main.c

+4 −95
Original line number Diff line number Diff line
@@ -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 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
	}



	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 |

drivers/net/team/team_core.c

+6 −77
Original line number Diff line number Diff line
@@ -982,63 +982,6 @@ static void team_port_disable(struct team *team, 
	team_lower_state_changed(port);

}



#define TEAM_VLAN_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \

			    NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \

			    NETIF_F_HIGHDMA | NETIF_F_LRO | \

			    NETIF_F_GSO_ENCAP_ALL)



#define TEAM_ENC_FEATURES	(NETIF_F_HW_CSUM | NETIF_F_SG | \

				 NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE)



static void __team_compute_features(struct team *team)

{

	struct team_port *port;

	netdev_features_t vlan_features = TEAM_VLAN_FEATURES;

	netdev_features_t enc_features  = TEAM_ENC_FEATURES;

	unsigned short max_hard_header_len = ETH_HLEN;

	unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |

					IFF_XMIT_DST_RELEASE_PERM;



	rcu_read_lock();

	if (list_empty(&team->port_list))

		goto done;



	vlan_features = netdev_base_features(vlan_features);

	enc_features = netdev_base_features(enc_features);



	list_for_each_entry_rcu(port, &team->port_list, list) {

		vlan_features = netdev_increment_features(vlan_features,

					port->dev->vlan_features,

					TEAM_VLAN_FEATURES);

		enc_features =

			netdev_increment_features(enc_features,

						  port->dev->hw_enc_features,

						  TEAM_ENC_FEATURES);



		dst_release_flag &= port->dev->priv_flags;

		if (port->dev->hard_header_len > max_hard_header_len)

			max_hard_header_len = port->dev->hard_header_len;

	}

done:

	rcu_read_unlock();



	team->dev->vlan_features = vlan_features;

	team->dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |

				     NETIF_F_HW_VLAN_CTAG_TX |

				     NETIF_F_HW_VLAN_STAG_TX;

	team->dev->hard_header_len = max_hard_header_len;



	team->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;

	if (dst_release_flag == (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM))

		team->dev->priv_flags |= IFF_XMIT_DST_RELEASE;

}



static void team_compute_features(struct team *team)

{

	__team_compute_features(team);

	netdev_change_features(team->dev);

}



static int team_port_enter(struct team *team, struct team_port *port)

{

	int err = 0;
@@ -1300,7 +1243,7 @@ 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);

	__team_compute_features(team);

	netdev_compute_master_upper_features(team->dev, true);

	__team_port_change_port_added(port, !!netif_oper_up(port_dev));

	__team_options_change_check(team);
@@ -1382,7 +1325,7 @@ 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);

	__team_compute_features(team);

	netdev_compute_master_upper_features(team->dev, true);



	return 0;

}
@@ -1970,33 +1913,19 @@ static int team_add_slave(struct net_device *dev, struct net_device *port_dev, 
			  struct netlink_ext_ack *extack)

{

	struct team *team = netdev_priv(dev);

	int err;



	ASSERT_RTNL();



	err = team_port_add(team, port_dev, extack);



	if (!err)

		netdev_change_features(dev);



	return err;

	return team_port_add(team, port_dev, extack);

}



static int team_del_slave(struct net_device *dev, struct net_device *port_dev)

{

	struct team *team = netdev_priv(dev);

	int err;



	ASSERT_RTNL();



	err = team_port_del(team, port_dev);



	if (err)

		return err;



	netdev_change_features(dev);



	return err;

	return team_port_del(team, port_dev);

}



static netdev_features_t team_fix_features(struct net_device *dev,
@@ -2190,7 +2119,7 @@ static void team_setup(struct net_device *dev) 


	dev->features |= NETIF_F_GRO;



	dev->hw_features = TEAM_VLAN_FEATURES |

	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 |
@@ -2994,7 +2923,7 @@ static int team_device_event(struct notifier_block *unused, 
	case NETDEV_FEAT_CHANGE:

		if (!port->team->notifier_ctx) {

			port->team->notifier_ctx = true;

			team_compute_features(port->team);

			netdev_compute_master_upper_features(port->team->dev, true);

			port->team->notifier_ctx = false;

		}

		break;

include/linux/netdev_features.h

+18 −0
Original line number Diff line number Diff line
@@ -255,6 +255,24 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start) 
				 NETIF_F_GSO_UDP_TUNNEL |		\

				 NETIF_F_GSO_UDP_TUNNEL_CSUM)



/* virtual device features */

#define MASTER_UPPER_DEV_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 MASTER_UPPER_DEV_ENC_FEATURES	 (NETIF_F_HW_CSUM | NETIF_F_SG | \

					  NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE | \

					  NETIF_F_GSO_PARTIAL)



#define MASTER_UPPER_DEV_MPLS_FEATURES	 (NETIF_F_HW_CSUM | NETIF_F_SG | \

					  NETIF_F_GSO_SOFTWARE)



#define MASTER_UPPER_DEV_XFRM_FEATURES	 (NETIF_F_HW_ESP | NETIF_F_HW_ESP_TX_CSUM | \

					  NETIF_F_GSO_ESP)



#define MASTER_UPPER_DEV_GSO_PARTIAL_FEATURES (NETIF_F_GSO_ESP)



static inline netdev_features_t netdev_base_features(netdev_features_t features)

{

	features &= ~NETIF_F_ONE_FOR_ALL;

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -5304,6 +5304,7 @@ static inline netdev_features_t netdev_add_tso_features(netdev_features_t featur 
int __netdev_update_features(struct net_device *dev);

void netdev_update_features(struct net_device *dev);

void netdev_change_features(struct net_device *dev);

void netdev_compute_master_upper_features(struct net_device *dev, bool update_header);



void netif_stacked_transfer_operstate(const struct net_device *rootdev,

					struct net_device *dev);

net/bridge/br_if.c

+3 −19
Original line number Diff line number Diff line
@@ -525,20 +525,6 @@ void br_mtu_auto_adjust(struct net_bridge *br) 
	br_opt_toggle(br, BROPT_MTU_SET_BY_USER, false);

}



static void br_set_gso_limits(struct net_bridge *br)

{

	unsigned int tso_max_size = TSO_MAX_SIZE;

	const struct net_bridge_port *p;

	u16 tso_max_segs = TSO_MAX_SEGS;



	list_for_each_entry(p, &br->port_list, list) {

		tso_max_size = min(tso_max_size, p->dev->tso_max_size);

		tso_max_segs = min(tso_max_segs, p->dev->tso_max_segs);

	}

	netif_set_tso_max_size(br->dev, tso_max_size);

	netif_set_tso_max_segs(br->dev, tso_max_segs);

}



/*

 * Recomputes features using slave's features

 */
@@ -652,8 +638,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, 
			netdev_err(dev, "failed to sync bridge static fdb addresses to this port\n");

	}



	netdev_update_features(br->dev);



	br_hr = br->dev->needed_headroom;

	dev_hr = netdev_get_fwd_headroom(dev);

	if (br_hr < dev_hr)
@@ -694,7 +678,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, 
		call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);



	br_mtu_auto_adjust(br);

	br_set_gso_limits(br);



	netdev_compute_master_upper_features(br->dev, false);



	kobject_uevent(&p->kobj, KOBJ_ADD);
@@ -740,7 +725,6 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) 
	del_nbp(p);



	br_mtu_auto_adjust(br);

	br_set_gso_limits(br);



	spin_lock_bh(&br->lock);

	changed_addr = br_stp_recalculate_bridge_id(br);
@@ -749,7 +733,7 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) 
	if (changed_addr)

		call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);



	netdev_update_features(br->dev);

	netdev_compute_master_upper_features(br->dev, false);



	return 0;

}