ixgbe: fix tx queue index
Subsystems (2)
PATCH 1/2 ixgbe: fix tx queue index
From: Wu Fengguang <[email protected]>
Don't do the num_tx_queues based masking on calculating tx queue index.
1) num_tx_queues is not always power-of-2, because it also depends on the online cpu numbers. So the masking could be a performance bug on a 6 cpu system.
2) queue_mapping will be limited by real_num_tx_queues=num_tx_queues in the generic netdev function set_cur_queue_map(). So the bound limiting here is not necessary.
---
drivers/net/ixgbe/ixgbe_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +1 -1
@@ -4342,7 +4342,7 @@ static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)int count =0 ;unsigned int f; - r_idx = (adapter->num_tx_queues -1 ) & skb->queue_mapping; + r_idx = skb->queue_mapping; tx_ring = &adapter->tx_ring[r_idx];if (adapter->vlgrp &&vlan_tx_tag_present (skb)) {
PATCH 2/2 ixgbe: update real_num_tx_queues on changing num_rx_queues
From: Wu Fengguang <[email protected]>
Move the update of real_num_tx_queues from ixgbe_acquire_msix_vectors() to ixgbe_set_num_queues(), to ensure it be always in sync with num_tx_queues.
---
drivers/net/ixgbe/ixgbe_main.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +10 -9
@@ -2723,17 +2723,21 @@ static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)**/ static void ixgbe_set_num_queues (struct ixgbe_adapter *adapter) { -/* Start with base case */ - adapter->num_rx_queues =1 ; - adapter->num_tx_queues =1 ; -#ifdef CONFIG_IXGBE_DCB if (ixgbe_set_dcb_queues (adapter)) -return ; + goto done;#endif if (ixgbe_set_rss_queues (adapter)) -return ; + goto done; + +/* fallback to base case */ + adapter->num_rx_queues =1 ; + adapter->num_tx_queues =1 ; + +done: +/* Notify the stack of the (possibly) reduced Tx Queue count. */ + adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; } static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
@@ -2992,9 +2996,6 @@ try_msi: } out: -/* Notify the stack of the (possibly) reduced Tx Queue count. */ - adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; -return err; }
Re: [net-2.6 PATCH 2/2] ixgbe: update real_num_tx_queues on changing num_rx_queues
From: Jeff Kirsher <[email protected]>
Date: Tue, 14 Apr 2009 20:52:17 -0700
Quoted 6 lines
Move the update of
real_num_tx_queuesfromixgbe_acquire_msix_vectors()toixgbe_set_num_queues(), to ensure it be always in sync withnum_tx_queues.Signed-off-by Wu Fengguang <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Tue, 14 Apr 2009 20:51:58 -0700
Quoted 10 lines
Don't do the
num_tx_queuesbased masking on calculating tx queue index.1)
num_tx_queuesis not always power-of-2, because it also depends on the online cpu numbers. So the masking could be a performance bug on a 6 cpu system.
2)queue_mappingwill be limited by real_num_tx_queues=num_tx_queues in the generic netdev functionset_cur_queue_map(). So the bound limiting here is not necessary.
Quoted 2 lines
Signed-off-by Wu Fengguang <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.