Commit 669d3e0b authored by Vasu Dev's avatar Vasu Dev Committed by David S. Miller
Browse files

vlan: adds vlan_dev_select_queue 



This is required to correctly select vlan tx queue for a driver
supporting multi tx queue with ndo_select_queue implemented since
currently selected vlan tx queue is unaligned to selected queue by
real net_devce ndo_select_queue.

Unaligned vlan tx queue selection causes thrash with higher vlan
tx lock contention for least fcoe traffic and wrong socket tx
queue_mapping for ixgbe having ndo_select_queue implemented.

-v2

As per Eric Dumazet<eric.dumazet@gmail.com> comments, mirrored
vlan net_device_ops to have them with and without vlan_dev_select_queue
and then select according to real dev ndo_select_queue present or not
for a vlan net_device. This is to completely skip vlan_dev_select_queue
calling for real net_device not supporting ndo_select_queue.

Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31b24b95

net/8021q/vlan_dev.c

+68 −3
Original line number Diff line number Diff line
@@ -361,6 +361,14 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, 
	return ret;

}



static u16 vlan_dev_select_queue(struct net_device *dev, struct sk_buff *skb)

{

	struct net_device *rdev = vlan_dev_info(dev)->real_dev;

	const struct net_device_ops *ops = rdev->netdev_ops;



	return ops->ndo_select_queue(rdev, skb);

}



static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)

{

	/* TODO: gotta make sure the underlying layer can handle it,
@@ -688,7 +696,8 @@ static const struct header_ops vlan_header_ops = { 
	.parse	 = eth_header_parse,

};



static const struct net_device_ops vlan_netdev_ops, vlan_netdev_accel_ops;

static const struct net_device_ops vlan_netdev_ops, vlan_netdev_accel_ops,

		    vlan_netdev_ops_sq, vlan_netdev_accel_ops_sq;



static int vlan_dev_init(struct net_device *dev)

{
@@ -722,10 +731,16 @@ static int vlan_dev_init(struct net_device *dev) 
	if (real_dev->features & NETIF_F_HW_VLAN_TX) {

		dev->header_ops      = real_dev->header_ops;

		dev->hard_header_len = real_dev->hard_header_len;

		if (real_dev->netdev_ops->ndo_select_queue)

			dev->netdev_ops = &vlan_netdev_accel_ops_sq;

		else

			dev->netdev_ops = &vlan_netdev_accel_ops;

	} else {

		dev->header_ops      = &vlan_header_ops;

		dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;

		if (real_dev->netdev_ops->ndo_select_queue)

			dev->netdev_ops = &vlan_netdev_ops_sq;

		else

			dev->netdev_ops = &vlan_netdev_ops;

	}
@@ -865,6 +880,56 @@ static const struct net_device_ops vlan_netdev_accel_ops = { 
#endif

};



static const struct net_device_ops vlan_netdev_ops_sq = {

	.ndo_select_queue	= vlan_dev_select_queue,

	.ndo_change_mtu		= vlan_dev_change_mtu,

	.ndo_init		= vlan_dev_init,

	.ndo_uninit		= vlan_dev_uninit,

	.ndo_open		= vlan_dev_open,

	.ndo_stop		= vlan_dev_stop,

	.ndo_start_xmit =  vlan_dev_hard_start_xmit,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= vlan_dev_set_mac_address,

	.ndo_set_rx_mode	= vlan_dev_set_rx_mode,

	.ndo_set_multicast_list	= vlan_dev_set_rx_mode,

	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,

	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_neigh_setup	= vlan_dev_neigh_setup,

	.ndo_get_stats		= vlan_dev_get_stats,

#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

	.ndo_fcoe_ddp_setup	= vlan_dev_fcoe_ddp_setup,

	.ndo_fcoe_ddp_done	= vlan_dev_fcoe_ddp_done,

	.ndo_fcoe_enable	= vlan_dev_fcoe_enable,

	.ndo_fcoe_disable	= vlan_dev_fcoe_disable,

	.ndo_fcoe_get_wwn	= vlan_dev_fcoe_get_wwn,

#endif

};



static const struct net_device_ops vlan_netdev_accel_ops_sq = {

	.ndo_select_queue	= vlan_dev_select_queue,

	.ndo_change_mtu		= vlan_dev_change_mtu,

	.ndo_init		= vlan_dev_init,

	.ndo_uninit		= vlan_dev_uninit,

	.ndo_open		= vlan_dev_open,

	.ndo_stop		= vlan_dev_stop,

	.ndo_start_xmit =  vlan_dev_hwaccel_hard_start_xmit,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= vlan_dev_set_mac_address,

	.ndo_set_rx_mode	= vlan_dev_set_rx_mode,

	.ndo_set_multicast_list	= vlan_dev_set_rx_mode,

	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,

	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_neigh_setup	= vlan_dev_neigh_setup,

	.ndo_get_stats		= vlan_dev_get_stats,

#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

	.ndo_fcoe_ddp_setup	= vlan_dev_fcoe_ddp_setup,

	.ndo_fcoe_ddp_done	= vlan_dev_fcoe_ddp_done,

	.ndo_fcoe_enable	= vlan_dev_fcoe_enable,

	.ndo_fcoe_disable	= vlan_dev_fcoe_disable,

	.ndo_fcoe_get_wwn	= vlan_dev_fcoe_get_wwn,

#endif

};



void vlan_setup(struct net_device *dev)

{

	ether_setup(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE