ixgbe: Allocate driver resources per NUMA node
Subsystems (2)
PATCH v2 1/2 ixgbe: Allocate driver resources per NUMA node
From: Jesse Brandeburg <[email protected]>
The default policy for the current driver is to do all its memory allocation on whatever processor is running insmod/modprobe. This is less than optimal.
This driver's default mode of operation will be to use each node for each subsequent transmit/receive queue. The most efficient allocation will be to then have the interrupts bound in such a way as to match up the interrupt of the queue to the cpu where its memory was allocated.
---
drivers/net/ixgbe/ixgbe.h | 2 ++ drivers/net/ixgbe/ixgbe_main.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-)
drivers/net/ixgbe/ixgbe.h +2 -0
@@ -400,6 +400,8 @@ struct ixgbe_adapter {u32 wol;u16 eeprom_version; +int node; +/* SR-IOV */ DECLARE_BITMAP (active_vfs,IXGBE_MAX_VF_FUNCTIONS );unsigned int num_vfs;
drivers/net/ixgbe/ixgbe_main.c +34 -3
@@ -3946,7 +3946,11 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter) }for (q_idx =0 ; q_idx < num_q_vectors; q_idx++) { - q_vector =kzalloc (sizeof (struct ixgbe_q_vector ),GFP_KERNEL ); + q_vector =kzalloc_node (sizeof (struct ixgbe_q_vector ), +GFP_KERNEL , adapter->node); +if (!q_vector) + q_vector =kzalloc (sizeof (struct ixgbe_q_vector ), +GFP_KERNEL );if (!q_vector) goto err_out; q_vector->adapter = adapter;
@@ -4246,6 +4250,9 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)/* enable rx csum by default */ adapter->flags |=IXGBE_FLAG_RX_CSUM_ENABLED ; +/* get assigned NUMA node */ + adapter->node =dev_to_node (&pdev->dev); +set_bit (__IXGBE_DOWN, &adapter->state);return 0 ;
@@ -4265,7 +4272,9 @@ int ixgbe_setup_tx_resources(struct ixgbe_adapter *adapter,int size; size =sizeof (struct ixgbe_tx_buffer ) * tx_ring->count; - tx_ring->tx_buffer_info =vmalloc (size); + tx_ring->tx_buffer_info =vmalloc_node (size, adapter->node); +if (!tx_ring->tx_buffer_info) + tx_ring->tx_buffer_info =vmalloc (size);if (!tx_ring->tx_buffer_info) goto err;memset (tx_ring->tx_buffer_info,0 , size);
@@ -4305,8 +4314,15 @@ err:static int ixgbe_setup_all_tx_resources (struct ixgbe_adapter *adapter) {int i, err =0 ; +int orig_node = adapter->node;for (i =0 ; i < adapter->num_tx_queues; i++) { +if (orig_node ==-1 ) { +int cur_node =next_online_node (adapter->node); +if (cur_node ==MAX_NUMNODES ) + cur_node = first_online_node; + adapter->node = cur_node; + } err =ixgbe_setup_tx_resources (adapter, &adapter->tx_ring[i]);if (!err)continue ;
@@ -4314,6 +4330,9 @@ static int ixgbe_setup_all_tx_resources(struct ixgbe_adapter *adapter)break ; } +/* reset the node back to its starting value */ + adapter->node = orig_node; +return err; }
@@ -4331,7 +4350,9 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,int size; size =sizeof (struct ixgbe_rx_buffer ) * rx_ring->count; - rx_ring->rx_buffer_info =vmalloc (size); + rx_ring->rx_buffer_info =vmalloc_node (size, adapter->node); +if (!rx_ring->rx_buffer_info) + rx_ring->rx_buffer_info =vmalloc (size);if (!rx_ring->rx_buffer_info) {DPRINTK (PROBE ,ERR ,"vmalloc allocation failed for the rx desc ring\n" );
@@ -4375,8 +4396,15 @@ alloc_failed:static int ixgbe_setup_all_rx_resources (struct ixgbe_adapter *adapter) {int i, err =0 ; +int orig_node = adapter->node;for (i =0 ; i < adapter->num_rx_queues; i++) { +if (orig_node ==-1 ) { +int cur_node =next_online_node (adapter->node); +if (cur_node ==MAX_NUMNODES ) + cur_node = first_online_node; + adapter->node = cur_node; + } err =ixgbe_setup_rx_resources (adapter, &adapter->rx_ring[i]);if (!err)continue ;
@@ -4384,6 +4412,9 @@ static int ixgbe_setup_all_rx_resources(struct ixgbe_adapter *adapter)break ; } +/* reset the node back to its starting value */ + adapter->node = orig_node; +return err; }
PATCH v2 2/2 ixgbe: Make descriptor ring allocations NUMA-aware
From: PJ Waskiewicz <[email protected]>
This patch allocates the ring structures themselves on each NUMA node along with the buffer_info structures. This way we don't allocate the entire ring memory on a single node in one big block, thus reducing NUMA node memory crosstalk.
---
drivers/net/ixgbe/ixgbe.h | 5 - drivers/net/ixgbe/ixgbe_ethtool.c | 71 +++++----- drivers/net/ixgbe/ixgbe_fcoe.c | 4 - drivers/net/ixgbe/ixgbe_main.c | 276 ++++++++++++++++++++----------------- 4 files changed, 189 insertions(+), 167 deletions(-)
drivers/net/ixgbe/ixgbe.h +3 -2
@@ -175,6 +175,7 @@ struct ixgbe_ring {struct ixgbe_queue_stats stats;unsigned long reinit_state; +int numa_node;u64 rsc_count;/* stat for coalesced packets */ u64 rsc_flush;/* stats for flushed packets */ u32 restart_queue;/* track tx queue restarts */
@@ -293,7 +294,7 @@ struct ixgbe_adapter {u16 eitr_high;/* TX */ -struct ixgbe_ring *tx_ring____cacheline_aligned_in_smp ;/* One per active queue */ +struct ixgbe_ring *tx_ring[MAX_TX_QUEUES ]____cacheline_aligned_in_smp ;int num_tx_queues;u32 tx_timeout_count;bool detect_tx_hung;
@@ -302,7 +303,7 @@ struct ixgbe_adapter {u64 lsc_int;/* RX */ -struct ixgbe_ring *rx_ring____cacheline_aligned_in_smp ;/* One per active queue */ +struct ixgbe_ring *rx_ring[MAX_RX_QUEUES ]____cacheline_aligned_in_smp ;int num_rx_queues;int num_rx_pools;/* == num_rx_queues in 82598 */ int num_rx_queues_per_pool;/* 1 if 82598, can be many if 82599 */
drivers/net/ixgbe/ixgbe_ethtool.c +38 -33
163 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_fcoe.c +2 -2
@@ -525,7 +525,7 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)for (i =0 ; i <IXGBE_FCRETA_SIZE ; i++) { fcoe_i = f->mask + i % f->indices; fcoe_i &=IXGBE_FCRETA_ENTRY_MASK ; - fcoe_q = adapter->rx_ring[fcoe_i].reg_idx; + fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;IXGBE_WRITE_REG (hw,IXGBE_FCRETA (i), fcoe_q); }IXGBE_WRITE_REG (hw,IXGBE_FCRECTL ,IXGBE_FCRECTL_ENA );
@@ -533,7 +533,7 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter) }else {/* Use single rx queue for FCoE */ fcoe_i = f->mask; - fcoe_q = adapter->rx_ring[fcoe_i].reg_idx; + fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;IXGBE_WRITE_REG (hw,IXGBE_FCRECTL ,0 ); IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE), IXGBE_ETQS_QUEUE_EN |
drivers/net/ixgbe/ixgbe_main.c +146 -130
681 lines not on this page · raw message
Re: [net-next-2.6 PATCH v2 2/2] ixgbe: Make descriptor ring allocations NUMA-aware
From: Jeff Kirsher <[email protected]>
Date: Wed, 03 Feb 2010 16:19:12 -0800
Quoted 9 lines
From: PJ Waskiewicz <[email protected]>
This patch allocates the ring structures themselves on each NUMA node along with the
buffer_infostructures. This way we don't allocate the entire ring memory on a single node in one big block, thus reducing NUMA node memory crosstalk.Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 03 Feb 2010 16:18:50 -0800
Quoted 6 lines
From: Jesse Brandeburg <[email protected]>
The default policy for the current driver is to do all its memory allocation on whatever processor is running insmod/modprobe. This is less than optimal.
Quoted 8 lines
This driver's default mode of operation will be to use each node for each subsequent transmit/receive queue. The most efficient allocation will be to then have the interrupts bound in such a way as to match up the interrupt of the queue to the cpu where its memory was allocated.
Signed-off-by Jesse Brandeburg <[email protected]>Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.