Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97488bd1 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Update ixgbe driver to use __netdev_pick_tx in ixgbe_select_queue 



This change updates the ixgbe driver to use __netdev_pick_tx instead of
the current logic it is using to select a queue.  The main result of this
change is that ixgbe can now fully support XPS, and in the case of non-FCoE
enabled configs it means we don't need to have our own ndo_select_queue.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Reviewed-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fd786b7b

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+26 −22
Original line number Diff line number Diff line
@@ -6374,38 +6374,40 @@ static inline int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size) 
	return __ixgbe_maybe_stop_tx(tx_ring, size);

}



#ifdef IXGBE_FCOE

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

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	int txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) :

					       smp_processor_id();

#ifdef IXGBE_FCOE

	__be16 protocol = vlan_get_protocol(skb);



	if (((protocol == htons(ETH_P_FCOE)) ||

	    (protocol == htons(ETH_P_FIP))) &&

	    (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)) {

	struct ixgbe_adapter *adapter;

	struct ixgbe_ring_feature *f;

	int txq;



	/*

	 * only execute the code below if protocol is FCoE

	 * or FIP and we have FCoE enabled on the adapter

	 */

	switch (vlan_get_protocol(skb)) {

	case __constant_htons(ETH_P_FCOE):

	case __constant_htons(ETH_P_FIP):

		adapter = netdev_priv(dev);



		if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)

			break;

	default:

		return __netdev_pick_tx(dev, skb);

	}



	f = &adapter->ring_feature[RING_F_FCOE];



	txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) :

					   smp_processor_id();



	while (txq >= f->indices)

		txq -= f->indices;

		txq += adapter->ring_feature[RING_F_FCOE].offset;



		return txq;

	}

#endif



	if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {

		while (unlikely(txq >= dev->real_num_tx_queues))

			txq -= dev->real_num_tx_queues;

		return txq;

	}



	return skb_tx_hash(dev, skb);

	return txq + f->offset;

}



#endif

netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,

			  struct ixgbe_adapter *adapter,

			  struct ixgbe_ring *tx_ring)
@@ -7129,7 +7131,9 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_open		= ixgbe_open,

	.ndo_stop		= ixgbe_close,

	.ndo_start_xmit		= ixgbe_xmit_frame,

#ifdef IXGBE_FCOE

	.ndo_select_queue	= ixgbe_select_queue,

#endif

	.ndo_set_rx_mode	= ixgbe_set_rx_mode,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= ixgbe_set_mac,