ixgbe: move CPU variable from ring into q_vector, add ring->q_vector

This is the start of work to sort out what belongs in the rings and what
belongs in the q_vector. Items like the CPU variable for make much more
sense in the q_vector since the CPU is a per-interrupt thing rather than a
per ring thing.
I also added a back-pointer from the ring to the q_vector.

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>

2 files changed, 111 insertions, 72 deletions

diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index dc4b97e5777f..e87b0ffd5832 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -183,11 +183,6 @@ struct ixgbe_ring {
         unsigned int total_bytes;
         unsigned int total_packets;
 
-#ifdef CONFIG_IXGBE_DCA
-        /* cpu for tx queue */
-        int cpu;
-#endif
-
         u16 work_limit;                 /* max work per interrupt */
         u16 reg_idx;                    /* holds the special value that gets
                                          * the hardware register offset
@@ -206,6 +201,7 @@ struct ixgbe_ring {
         unsigned int size;              /* length in bytes */
         dma_addr_t dma;                 /* phys. address of descriptor ring */
         struct rcu_head rcu;
+        struct ixgbe_q_vector *q_vector; /* back-pointer to host q_vector */
 } ____cacheline_internodealigned_in_smp;
 
 enum ixgbe_ring_f_enum {
@@ -251,6 +247,9 @@ struct ixgbe_q_vector {
         unsigned int v_idx; /* index of q_vector within array, also used for
                              * finding the bit in EICR and friends that
                              * represents the vector for this ring */
+#ifdef CONFIG_IXGBE_DCA
+        int cpu;            /* CPU for DCA */
+#endif
         struct napi_struct napi;
         DECLARE_BITMAP(rxr_idx, MAX_RX_QUEUES); /* Rx ring indices */
         DECLARE_BITMAP(txr_idx, MAX_TX_QUEUES); /* Tx ring indices */
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 75e25bc91a99..dc78736d3052 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -810,63 +810,98 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
 
 #ifdef CONFIG_IXGBE_DCA
 static void ixgbe_update_rx_dca(struct ixgbe_adapter *adapter,
-                                struct ixgbe_ring *rx_ring)
+                                struct ixgbe_ring *rx_ring,
+                                int cpu)
 {
+        struct ixgbe_hw *hw = &adapter->hw;
         u32 rxctrl;
-        int cpu = get_cpu();
-        int q = rx_ring->reg_idx;
+        u8 reg_idx = rx_ring->reg_idx;
 
-        if (rx_ring->cpu != cpu) {
-                rxctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_DCA_RXCTRL(q));
-                if (adapter->hw.mac.type == ixgbe_mac_82598EB) {
-                        rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK;
-                        rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
-                } else if (adapter->hw.mac.type == ixgbe_mac_82599EB) {
-                        rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK_82599;
-                        rxctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
-                                   IXGBE_DCA_RXCTRL_CPUID_SHIFT_82599);
-                }
-                rxctrl |= IXGBE_DCA_RXCTRL_DESC_DCA_EN;
-                rxctrl |= IXGBE_DCA_RXCTRL_HEAD_DCA_EN;
-                rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_RRO_EN);
-                rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_WRO_EN |
-                            IXGBE_DCA_RXCTRL_DESC_HSRO_EN);
-                IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_RXCTRL(q), rxctrl);
-                rx_ring->cpu = cpu;
+        rxctrl = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(reg_idx));
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK;
+                rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
+                break;
+        case ixgbe_mac_82599EB:
+                rxctrl &= ~IXGBE_DCA_RXCTRL_CPUID_MASK_82599;
+                rxctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
+                           IXGBE_DCA_RXCTRL_CPUID_SHIFT_82599);
+                break;
+        default:
+                break;
         }
-        put_cpu();
+        rxctrl |= IXGBE_DCA_RXCTRL_DESC_DCA_EN;
+        rxctrl |= IXGBE_DCA_RXCTRL_HEAD_DCA_EN;
+        rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_RRO_EN);
+        rxctrl &= ~(IXGBE_DCA_RXCTRL_DESC_WRO_EN |
+                    IXGBE_DCA_RXCTRL_DESC_HSRO_EN);
+        IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(reg_idx), rxctrl);
 }
 
 static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,
-                                struct ixgbe_ring *tx_ring)
+                                struct ixgbe_ring *tx_ring,
+                                int cpu)
 {
+        struct ixgbe_hw *hw = &adapter->hw;
         u32 txctrl;
+        u8 reg_idx = tx_ring->reg_idx;
+
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(reg_idx));
+                txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK;
+                txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
+                txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
+                txctrl &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
+                IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(reg_idx), txctrl);
+                break;
+        case ixgbe_mac_82599EB:
+                txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(reg_idx));
+                txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK_82599;
+                txctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
+                           IXGBE_DCA_TXCTRL_CPUID_SHIFT_82599);
+                txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
+                txctrl &= ~IXGBE_DCA_TXCTRL_TX_WB_RO_EN;
+                IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(reg_idx), txctrl);
+                break;
+        default:
+                break;
+        }
+}
+
+static void ixgbe_update_dca(struct ixgbe_q_vector *q_vector)
+{
+        struct ixgbe_adapter *adapter = q_vector->adapter;
         int cpu = get_cpu();
-        int q = tx_ring->reg_idx;
-        struct ixgbe_hw *hw = &adapter->hw;
+        long r_idx;
+        int i;
 
-        if (tx_ring->cpu != cpu) {
-                if (adapter->hw.mac.type == ixgbe_mac_82598EB) {
-                        txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(q));
-                        txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK;
-                        txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
-                        txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
-                        IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(q), txctrl);
-                } else if (adapter->hw.mac.type == ixgbe_mac_82599EB) {
-                        txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(q));
-                        txctrl &= ~IXGBE_DCA_TXCTRL_CPUID_MASK_82599;
-                        txctrl |= (dca3_get_tag(&adapter->pdev->dev, cpu) <<
-                                  IXGBE_DCA_TXCTRL_CPUID_SHIFT_82599);
-                        txctrl |= IXGBE_DCA_TXCTRL_DESC_DCA_EN;
-                        IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(q), txctrl);
-                }
-                tx_ring->cpu = cpu;
+        if (q_vector->cpu == cpu)
+                goto out_no_update;
+
+        r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
+        for (i = 0; i < q_vector->txr_count; i++) {
+                ixgbe_update_tx_dca(adapter, adapter->tx_ring[r_idx], cpu);
+                r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
+                                      r_idx + 1);
         }
+
+        r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+        for (i = 0; i < q_vector->rxr_count; i++) {
+                ixgbe_update_rx_dca(adapter, adapter->rx_ring[r_idx], cpu);
+                r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
+                                      r_idx + 1);
+        }
+
+        q_vector->cpu = cpu;
+out_no_update:
         put_cpu();
 }
 
 static void ixgbe_setup_dca(struct ixgbe_adapter *adapter)
 {
+        int num_q_vectors;
         int i;
 
         if (!(adapter->flags & IXGBE_FLAG_DCA_ENABLED))
@@ -875,13 +910,14 @@ static void ixgbe_setup_dca(struct ixgbe_adapter *adapter)
         /* always use CB2 mode, difference is masked in the CB driver */
         IXGBE_WRITE_REG(&adapter->hw, IXGBE_DCA_CTRL, 2);
 
-        for (i = 0; i < adapter->num_tx_queues; i++) {
-                adapter->tx_ring[i]->cpu = -1;
-                ixgbe_update_tx_dca(adapter, adapter->tx_ring[i]);
-        }
-        for (i = 0; i < adapter->num_rx_queues; i++) {
-                adapter->rx_ring[i]->cpu = -1;
-                ixgbe_update_rx_dca(adapter, adapter->rx_ring[i]);
+        if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED)
+                num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+        else
+                num_q_vectors = 1;
+
+        for (i = 0; i < num_q_vectors; i++) {
+                adapter->q_vector[i]->cpu = -1;
+                ixgbe_update_dca(adapter->q_vector[i]);
         }
 }
 
@@ -890,6 +926,9 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)
         struct ixgbe_adapter *adapter = dev_get_drvdata(dev);
         unsigned long event = *(unsigned long *)data;
 
+        if (!(adapter->flags & IXGBE_FLAG_DCA_ENABLED))
+                return 0;
+
         switch (event) {
         case DCA_PROVIDER_ADD:
                 /* if we're already enabled, don't do it again */
@@ -1827,8 +1866,13 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
         int r_idx;
         int i;
 
+#ifdef CONFIG_IXGBE_DCA
+        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+                ixgbe_update_dca(q_vector);
+#endif
+
         r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-        for (i = 0;  i < q_vector->rxr_count; i++) {
+        for (i = 0; i < q_vector->rxr_count; i++) {
                 rx_ring = adapter->rx_ring[r_idx];
                 rx_ring->total_bytes = 0;
                 rx_ring->total_packets = 0;
@@ -1839,7 +1883,6 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
         if (!q_vector->rxr_count)
                 return IRQ_HANDLED;
 
-        /* disable interrupts on this vector only */
         /* EIAM disabled interrupts (on this vector) for us */
         napi_schedule(&q_vector->napi);
 
@@ -1898,13 +1941,14 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
         int work_done = 0;
         long r_idx;
 
-        r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
-        rx_ring = adapter->rx_ring[r_idx];
 #ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-                ixgbe_update_rx_dca(adapter, rx_ring);
+                ixgbe_update_dca(q_vector);
 #endif
 
+        r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
+        rx_ring = adapter->rx_ring[r_idx];
+
         ixgbe_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
 
         /* If all Rx work done, exit the polling mode */
@@ -1938,13 +1982,14 @@ static int ixgbe_clean_rxtx_many(struct napi_struct *napi, int budget)
         long r_idx;
         bool tx_clean_complete = true;
 
+#ifdef CONFIG_IXGBE_DCA
+        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+                ixgbe_update_dca(q_vector);
+#endif
+
         r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
         for (i = 0; i < q_vector->txr_count; i++) {
                 ring = adapter->tx_ring[r_idx];
-#ifdef CONFIG_IXGBE_DCA
-                if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-                        ixgbe_update_tx_dca(adapter, ring);
-#endif
                 tx_clean_complete &= ixgbe_clean_tx_irq(q_vector, ring);
                 r_idx = find_next_bit(q_vector->txr_idx, adapter->num_tx_queues,
                                       r_idx + 1);
@@ -1957,10 +2002,6 @@ static int ixgbe_clean_rxtx_many(struct napi_struct *napi, int budget)
         r_idx = find_first_bit(q_vector->rxr_idx, adapter->num_rx_queues);
         for (i = 0; i < q_vector->rxr_count; i++) {
                 ring = adapter->rx_ring[r_idx];
-#ifdef CONFIG_IXGBE_DCA
-                if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-                        ixgbe_update_rx_dca(adapter, ring);
-#endif
                 ixgbe_clean_rx_irq(q_vector, ring, &work_done, budget);
                 r_idx = find_next_bit(q_vector->rxr_idx, adapter->num_rx_queues,
                                       r_idx + 1);
@@ -1999,13 +2040,14 @@ static int ixgbe_clean_txonly(struct napi_struct *napi, int budget)
         int work_done = 0;
         long r_idx;
 
-        r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
-        tx_ring = adapter->tx_ring[r_idx];
 #ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-                ixgbe_update_tx_dca(adapter, tx_ring);
+                ixgbe_update_dca(q_vector);
 #endif
 
+        r_idx = find_first_bit(q_vector->txr_idx, adapter->num_tx_queues);
+        tx_ring = adapter->tx_ring[r_idx];
+
         if (!ixgbe_clean_tx_irq(q_vector, tx_ring))
                 work_done = budget;
 
@@ -3880,10 +3922,8 @@ static int ixgbe_poll(struct napi_struct *napi, int budget)
         int tx_clean_complete, work_done = 0;
 
 #ifdef CONFIG_IXGBE_DCA
-        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {
-                ixgbe_update_tx_dca(adapter, adapter->tx_ring[0]);
-                ixgbe_update_rx_dca(adapter, adapter->rx_ring[0]);
-        }
+        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
+                ixgbe_update_dca(q_vector);
 #endif
 
         tx_clean_complete = ixgbe_clean_tx_irq(q_vector, adapter->tx_ring[0]);