Skip to content
/ linux Public

Commit 26924d2

Browse files
liuhangbinSasha Levin
authored andcommitted
net: add a common function to compute features for upper devices
[ Upstream commit 28098de ] Some high level software drivers need to compute features from lower devices. But each has their own implementations and may lost some feature compute. Let's use one common function to compute features for kinds of these devices. The new helper uses the current bond implementation as the reference one, as the latter already handles all the relevant aspects: netdev features, TSO limits and dst retention. Suggested-by: Paolo Abeni <pabeni@redhat.com> 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-2-liuhangbin@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Stable-dep-of: bb4c698 ("team: avoid NETDEV_CHANGEMTU event when unregistering slave") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent fa3c2f8 commit 26924d2

File tree

3 files changed

+107
-0
lines changed

3 files changed

+107
-0
lines changed

include/linux/netdev_features.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,24 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
255255
NETIF_F_GSO_UDP_TUNNEL | \
256256
NETIF_F_GSO_UDP_TUNNEL_CSUM)
257257

258+
/* virtual device features */
259+
#define MASTER_UPPER_DEV_VLAN_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \
260+
NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \
261+
NETIF_F_GSO_ENCAP_ALL | \
262+
NETIF_F_HIGHDMA | NETIF_F_LRO)
263+
264+
#define MASTER_UPPER_DEV_ENC_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \
265+
NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE | \
266+
NETIF_F_GSO_PARTIAL)
267+
268+
#define MASTER_UPPER_DEV_MPLS_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \
269+
NETIF_F_GSO_SOFTWARE)
270+
271+
#define MASTER_UPPER_DEV_XFRM_FEATURES (NETIF_F_HW_ESP | NETIF_F_HW_ESP_TX_CSUM | \
272+
NETIF_F_GSO_ESP)
273+
274+
#define MASTER_UPPER_DEV_GSO_PARTIAL_FEATURES (NETIF_F_GSO_ESP)
275+
258276
static inline netdev_features_t netdev_base_features(netdev_features_t features)
259277
{
260278
features &= ~NETIF_F_ONE_FOR_ALL;

include/linux/netdevice.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5306,6 +5306,7 @@ static inline netdev_features_t netdev_add_tso_features(netdev_features_t featur
53065306
int __netdev_update_features(struct net_device *dev);
53075307
void netdev_update_features(struct net_device *dev);
53085308
void netdev_change_features(struct net_device *dev);
5309+
void netdev_compute_master_upper_features(struct net_device *dev, bool update_header);
53095310

53105311
void netif_stacked_transfer_operstate(const struct net_device *rootdev,
53115312
struct net_device *dev);

net/core/dev.c

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12657,6 +12657,94 @@ netdev_features_t netdev_increment_features(netdev_features_t all,
1265712657
}
1265812658
EXPORT_SYMBOL(netdev_increment_features);
1265912659

12660+
/**
12661+
* netdev_compute_master_upper_features - compute feature from lowers
12662+
* @dev: the upper device
12663+
* @update_header: whether to update upper device's header_len/headroom/tailroom
12664+
*
12665+
* Recompute the upper device's feature based on all lower devices.
12666+
*/
12667+
void netdev_compute_master_upper_features(struct net_device *dev, bool update_header)
12668+
{
12669+
unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM;
12670+
netdev_features_t gso_partial_features = MASTER_UPPER_DEV_GSO_PARTIAL_FEATURES;
12671+
netdev_features_t xfrm_features = MASTER_UPPER_DEV_XFRM_FEATURES;
12672+
netdev_features_t mpls_features = MASTER_UPPER_DEV_MPLS_FEATURES;
12673+
netdev_features_t vlan_features = MASTER_UPPER_DEV_VLAN_FEATURES;
12674+
netdev_features_t enc_features = MASTER_UPPER_DEV_ENC_FEATURES;
12675+
unsigned short max_header_len = ETH_HLEN;
12676+
unsigned int tso_max_size = TSO_MAX_SIZE;
12677+
unsigned short max_headroom = 0;
12678+
unsigned short max_tailroom = 0;
12679+
u16 tso_max_segs = TSO_MAX_SEGS;
12680+
struct net_device *lower_dev;
12681+
struct list_head *iter;
12682+
12683+
mpls_features = netdev_base_features(mpls_features);
12684+
vlan_features = netdev_base_features(vlan_features);
12685+
enc_features = netdev_base_features(enc_features);
12686+
12687+
netdev_for_each_lower_dev(dev, lower_dev, iter) {
12688+
gso_partial_features = netdev_increment_features(gso_partial_features,
12689+
lower_dev->gso_partial_features,
12690+
MASTER_UPPER_DEV_GSO_PARTIAL_FEATURES);
12691+
12692+
vlan_features = netdev_increment_features(vlan_features,
12693+
lower_dev->vlan_features,
12694+
MASTER_UPPER_DEV_VLAN_FEATURES);
12695+
12696+
enc_features = netdev_increment_features(enc_features,
12697+
lower_dev->hw_enc_features,
12698+
MASTER_UPPER_DEV_ENC_FEATURES);
12699+
12700+
if (IS_ENABLED(CONFIG_XFRM_OFFLOAD))
12701+
xfrm_features = netdev_increment_features(xfrm_features,
12702+
lower_dev->hw_enc_features,
12703+
MASTER_UPPER_DEV_XFRM_FEATURES);
12704+
12705+
mpls_features = netdev_increment_features(mpls_features,
12706+
lower_dev->mpls_features,
12707+
MASTER_UPPER_DEV_MPLS_FEATURES);
12708+
12709+
dst_release_flag &= lower_dev->priv_flags;
12710+
12711+
if (update_header) {
12712+
max_header_len = max(max_header_len, lower_dev->hard_header_len);
12713+
max_headroom = max(max_headroom, lower_dev->needed_headroom);
12714+
max_tailroom = max(max_tailroom, lower_dev->needed_tailroom);
12715+
}
12716+
12717+
tso_max_size = min(tso_max_size, lower_dev->tso_max_size);
12718+
tso_max_segs = min(tso_max_segs, lower_dev->tso_max_segs);
12719+
}
12720+
12721+
dev->gso_partial_features = gso_partial_features;
12722+
dev->vlan_features = vlan_features;
12723+
dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |
12724+
NETIF_F_HW_VLAN_CTAG_TX |
12725+
NETIF_F_HW_VLAN_STAG_TX;
12726+
if (IS_ENABLED(CONFIG_XFRM_OFFLOAD))
12727+
dev->hw_enc_features |= xfrm_features;
12728+
dev->mpls_features = mpls_features;
12729+
12730+
dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
12731+
if ((dev->priv_flags & IFF_XMIT_DST_RELEASE_PERM) &&
12732+
dst_release_flag == (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM))
12733+
dev->priv_flags |= IFF_XMIT_DST_RELEASE;
12734+
12735+
if (update_header) {
12736+
dev->hard_header_len = max_header_len;
12737+
dev->needed_headroom = max_headroom;
12738+
dev->needed_tailroom = max_tailroom;
12739+
}
12740+
12741+
netif_set_tso_max_segs(dev, tso_max_segs);
12742+
netif_set_tso_max_size(dev, tso_max_size);
12743+
12744+
netdev_change_features(dev);
12745+
}
12746+
EXPORT_SYMBOL(netdev_compute_master_upper_features);
12747+
1266012748
static struct hlist_head * __net_init netdev_create_hash(void)
1266112749
{
1266212750
int i;

0 commit comments

Comments
 (0)