ixgbe: move TC_PRIO_CONTROL check into ixgbe_select_queue()
Subsystems (2)
PATCH 1/1 ixgbe: move TC_PRIO_CONTROL check into ixgbe_select_queue()
From: John Fastabend <[email protected]>
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.
---
drivers/net/ixgbe/ixgbe_main.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +11 -10
@@ -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_flags |= ((skb->queue_mapping &0x7 ) <<13 ); + tx_flags <<=IXGBE_TX_FLAGS_VLAN_SHIFT ; + tx_flags |=IXGBE_TX_FLAGS_VLAN ; } tx_ring = adapter->tx_ring[skb->queue_mapping];
From: Jeff Kirsher <[email protected]>
Date: Fri, 26 Feb 2010 16:21:36 -0800
Quoted 11 lines
From: John Fastabend <[email protected]>
Move
TC_PRIO_CONTROLcheck and queue remapping intoixgbe_select_queue(). Remapping queues after the qdisc can result in the wrong qdisc queue being stopped withnetif_stop_subqueue(). Even if this is resolved and the correct queue is stopped it can result in a queue being blocked byTC_PRIO_CONTROLframes uneccesarily. Moving this into theselect_queueroutine maintains alignment betweentx_ringsand qdisc queues.
Quoted 3 lines
Signed-off-by John Fastabend <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied, thanks.