ixgbe: Make descriptor ring allocations NUMA-aware

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.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 33b79e812b4d..bffbe0d52d33 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -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 */