Commit 5f35227e authored by Jesse Gross's avatar Jesse Gross Committed by David S. Miller
Browse files

net: Generalize ndo_gso_check to ndo_features_check 



GSO isn't the only offload feature with restrictions that
potentially can't be expressed with the current features mechanism.
Checksum is another although it's a general issue that could in
theory apply to anything. Even if it may be possible to
implement these restrictions in other ways, it can result in
duplicate code or inefficient per-packet behavior.

This generalizes ndo_gso_check so that drivers can remove any
features that don't make sense for a given packet, similar to
netif_skb_features(). It also converts existing driver
restrictions to the new format, completing the work that was
done to support tunnel protocols since the issues apply to
checksums as well.

By actually removing features from the set that are used to do
offloading, it solves another problem with the existing
interface. In these cases, GSO would run with the original set
of features and not do anything because it appears that
segmentation is not required.

CC: Tom Herbert <therbert@google.com>
CC: Joe Stringer <joestringer@nicira.com>
CC: Eric Dumazet <edumazet@google.com>
CC: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
Acked-by: default avatarTom Herbert <therbert@google.com>
Fixes: 04ffcb25 ("net: Add ndo_gso_check")
Tested-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e4ab361

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+5 −3
Original line number Diff line number Diff line
@@ -12553,9 +12553,11 @@ static int bnx2x_get_phys_port_id(struct net_device *netdev, 
	return 0;

}



static bool bnx2x_gso_check(struct sk_buff *skb, struct net_device *dev)

static netdev_features_t bnx2x_features_check(struct sk_buff *skb,

					      struct net_device *dev,

					      netdev_features_t features)

{

	return vxlan_gso_check(skb);

	return vxlan_features_check(skb, features);

}



static const struct net_device_ops bnx2x_netdev_ops = {
@@ -12589,7 +12591,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { 
#endif

	.ndo_get_phys_port_id	= bnx2x_get_phys_port_id,

	.ndo_set_vf_link_state	= bnx2x_set_vf_link_state,

	.ndo_gso_check		= bnx2x_gso_check,

	.ndo_features_check	= bnx2x_features_check,

};



static int bnx2x_set_coherency_mask(struct bnx2x *bp)

drivers/net/ethernet/emulex/benet/be_main.c

+5 −3
Original line number Diff line number Diff line
@@ -4459,9 +4459,11 @@ done: 
	adapter->vxlan_port_count--;

}



static bool be_gso_check(struct sk_buff *skb, struct net_device *dev)

static netdev_features_t be_features_check(struct sk_buff *skb,

					   struct net_device *dev,

					   netdev_features_t features)

{

	return vxlan_gso_check(skb);

	return vxlan_features_check(skb, features);

}

#endif
@@ -4492,7 +4494,7 @@ static const struct net_device_ops be_netdev_ops = { 
#ifdef CONFIG_BE2NET_VXLAN

	.ndo_add_vxlan_port	= be_add_vxlan_port,

	.ndo_del_vxlan_port	= be_del_vxlan_port,

	.ndo_gso_check		= be_gso_check,

	.ndo_features_check	= be_features_check,

#endif

};

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+6 −4
Original line number Diff line number Diff line
@@ -2365,9 +2365,11 @@ static void mlx4_en_del_vxlan_port(struct net_device *dev, 
	queue_work(priv->mdev->workqueue, &priv->vxlan_del_task);

}



static bool mlx4_en_gso_check(struct sk_buff *skb, struct net_device *dev)

static netdev_features_t mlx4_en_features_check(struct sk_buff *skb,

						struct net_device *dev,

						netdev_features_t features)

{

	return vxlan_gso_check(skb);

	return vxlan_features_check(skb, features);

}

#endif
@@ -2400,7 +2402,7 @@ static const struct net_device_ops mlx4_netdev_ops = { 
#ifdef CONFIG_MLX4_EN_VXLAN

	.ndo_add_vxlan_port	= mlx4_en_add_vxlan_port,

	.ndo_del_vxlan_port	= mlx4_en_del_vxlan_port,

	.ndo_gso_check		= mlx4_en_gso_check,

	.ndo_features_check	= mlx4_en_features_check,

#endif

};
@@ -2434,7 +2436,7 @@ static const struct net_device_ops mlx4_netdev_ops_master = { 
#ifdef CONFIG_MLX4_EN_VXLAN

	.ndo_add_vxlan_port	= mlx4_en_add_vxlan_port,

	.ndo_del_vxlan_port	= mlx4_en_del_vxlan_port,

	.ndo_gso_check		= mlx4_en_gso_check,

	.ndo_features_check	= mlx4_en_features_check,

#endif

};

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+5 −3
Original line number Diff line number Diff line
@@ -505,9 +505,11 @@ static void qlcnic_del_vxlan_port(struct net_device *netdev, 
	adapter->flags |= QLCNIC_DEL_VXLAN_PORT;

}



static bool qlcnic_gso_check(struct sk_buff *skb, struct net_device *dev)

static netdev_features_t qlcnic_features_check(struct sk_buff *skb,

					       struct net_device *dev,

					       netdev_features_t features)

{

	return vxlan_gso_check(skb);

	return vxlan_features_check(skb, features);

}

#endif
@@ -532,7 +534,7 @@ static const struct net_device_ops qlcnic_netdev_ops = { 
#ifdef CONFIG_QLCNIC_VXLAN

	.ndo_add_vxlan_port	= qlcnic_add_vxlan_port,

	.ndo_del_vxlan_port	= qlcnic_del_vxlan_port,

	.ndo_gso_check		= qlcnic_gso_check,

	.ndo_features_check	= qlcnic_features_check,

#endif

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = qlcnic_poll_controller,

include/linux/netdevice.h

+11 −9
Original line number Diff line number Diff line
@@ -1012,12 +1012,15 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, 
 *	Callback to use for xmit over the accelerated station. This

 *	is used in place of ndo_start_xmit on accelerated net

 *	devices.

 * bool	(*ndo_gso_check) (struct sk_buff *skb,

 *			  struct net_device *dev);

 * netdev_features_t (*ndo_features_check) (struct sk_buff *skb,

 *					    struct net_device *dev

 *					    netdev_features_t features);

 *	Called by core transmit path to determine if device is capable of

 *	performing GSO on a packet. The device returns true if it is

 *	able to GSO the packet, false otherwise. If the return value is

 *	false the stack will do software GSO.

 *	performing offload operations on a given packet. This is to give

 *	the device an opportunity to implement any restrictions that cannot

 *	be otherwise expressed by feature flags. The check is called with

 *	the set of features that the stack has calculated and it returns

 *	those the driver believes to be appropriate.

 *

 * int (*ndo_switch_parent_id_get)(struct net_device *dev,

 *				   struct netdev_phys_item_id *psid);
@@ -1178,8 +1181,9 @@ struct net_device_ops { 
							struct net_device *dev,

							void *priv);

	int			(*ndo_get_lock_subclass)(struct net_device *dev);

	bool			(*ndo_gso_check) (struct sk_buff *skb,

						  struct net_device *dev);

	netdev_features_t	(*ndo_features_check) (struct sk_buff *skb,

						       struct net_device *dev,

						       netdev_features_t features);

#ifdef CONFIG_NET_SWITCHDEV

	int			(*ndo_switch_parent_id_get)(struct net_device *dev,

							    struct netdev_phys_item_id *psid);
@@ -3611,8 +3615,6 @@ static inline bool netif_needs_gso(struct net_device *dev, struct sk_buff *skb, 
				   netdev_features_t features)

{

	return skb_is_gso(skb) && (!skb_gso_ok(skb, features) ||

		(dev->netdev_ops->ndo_gso_check &&

		 !dev->netdev_ops->ndo_gso_check(skb, dev)) ||

		unlikely((skb->ip_summed != CHECKSUM_PARTIAL) &&

			 (skb->ip_summed != CHECKSUM_UNNECESSARY)));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE