ixgbe: Move interrupt related values out of ring and into q_vector

This change moves work_limit, total_packets, and total_bytes into the ring
container struct of the q_vector.  The advantage of this is that it should
reduce the size of memory used in the event of multiple rings being
assigned to a single q_vector.  In addition it should help to reduce the
total workload for calculating itr since now total_packets and total_bytes
will be the total work done of the interrupt instead of for the ring.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index a5ed9fd69fdd..fbae7352b036 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -214,12 +214,10 @@ struct ixgbe_ring {
                 struct ixgbe_rx_buffer *rx_buffer_info;
         };
         unsigned long state;
-        u8 atr_sample_rate;
-        u8 atr_count;
+        u8 __iomem *tail;
+
         u16 count;                      /* amount of descriptors */
         u16 rx_buf_len;
-        u16 next_to_use;
-        u16 next_to_clean;
 
         u8 queue_index; /* needed for multiqueue queue management */
         u8 reg_idx;                     /* holds the special value that gets
@@ -227,15 +225,13 @@ struct ixgbe_ring {
                                          * associated with this ring, which is
                                          * different for DCB and RSS modes
                                          */
-        u8 dcb_tc;
-
-        u16 work_limit;                 /* max work per interrupt */
-
-        u8 __iomem *tail;
+        u8 atr_sample_rate;
+        u8 atr_count;
 
-        unsigned int total_bytes;
-        unsigned int total_packets;
+        u16 next_to_use;
+        u16 next_to_clean;
 
+        u8 dcb_tc;
         struct ixgbe_queue_stats stats;
         struct u64_stats_sync syncp;
         union {
@@ -283,6 +279,9 @@ struct ixgbe_ring_container {
 #else
         DECLARE_BITMAP(idx, MAX_TX_QUEUES);
 #endif
+        unsigned int total_bytes;       /* total bytes processed this int */
+        unsigned int total_packets;     /* total packets processed this int */
+        u16 work_limit;                 /* total work allowed per interrupt */
         u8 count;                       /* total number of rings in vector */
         u8 itr;                         /* current ITR setting for ring */
 };
@@ -417,6 +416,9 @@ struct ixgbe_adapter {
         u16 eitr_low;
         u16 eitr_high;
 
+        /* Work limits */
+        u16 tx_work_limit;
+
         /* TX */
         struct ixgbe_ring *tx_ring[MAX_TX_QUEUES] ____cacheline_aligned_in_smp;
         int num_tx_queues;