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

Commit 2ea186ae authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

ixgbe: move TC_PRIO_CONTROL check into ixgbe_select_queue() 



Move TC_PRIO_CONTROL check and queue remapping into
ixgbe_select_queue().  Remapping queues after the qdisc
can result in the wrong qdisc queue being stopped with
netif_stop_subqueue().  Even if this is resolved and the
correct queue is stopped it can result in a queue being
blocked by TC_PRIO_CONTROL frames uneccesarily.  Moving
this into the select_queue routine maintains alignment
between tx_rings and qdisc queues.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Acked-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da3f5cf1

drivers/net/ixgbe/ixgbe_main.c

+11 −10
Original line number Diff line number Diff line
@@ -5639,8 +5639,14 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb) 
		return txq;

	}

#endif

	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)

		return (skb->vlan_tci & IXGBE_TX_FLAGS_VLAN_PRIO_MASK) >> 13;

	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {

		if (skb->priority == TC_PRIO_CONTROL)

			txq = adapter->ring_feature[RING_F_DCB].indices-1;

		else

			txq = (skb->vlan_tci & IXGBE_TX_FLAGS_VLAN_PRIO_MASK)

			       >> 13;

		return txq;

	}



	return skb_tx_hash(dev, skb);

}
@@ -5667,14 +5673,9 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, 
		tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;

		tx_flags |= IXGBE_TX_FLAGS_VLAN;

	} else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {

		if (skb->priority != TC_PRIO_CONTROL) {

		tx_flags |= ((skb->queue_mapping & 0x7) << 13);

		tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;

		tx_flags |= IXGBE_TX_FLAGS_VLAN;

		} else {

			skb->queue_mapping =

				adapter->ring_feature[RING_F_DCB].indices-1;

		}

	}



	tx_ring = adapter->tx_ring[skb->queue_mapping];