i40e/i40evf: Clean up logic for adaptive ITR

The logic for dynamic ITR update is confusing at best as there were odd
paths chosen for how to find the rings associated with a given queue based
on the vector index and other inconsistencies throughout the code.

This patch is an attempt to clean up the logic so that we can more easily
understand what is going on. Specifically if there is a Rx or Tx ring that
is enabled in dynamic mode on the q_vector it is allowed to override the
other side of the interrupt moderation. While it isn't correct all this
patch is doing is cleaning up the logic for now so that when we come
through and fix it we can more easily identify that this is wrong.

The other big change made here is that we replace references to:
	vsi->rx_rings[q_vector->v_idx]->itr_setting
with:
	q_vector->rx.ring->itr_setting

The general idea is we can avoid the long pointer chase since just
accessing q_vector->rx.ring is a single pointer access versus having to
chase down vsi->rx_rings, and then finding the pointer in the array, and
finally chasing down the itr_setting from there.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

2 files changed, 28 insertions, 86 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index b9121a87ee46..6b3fe5d26dc1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1016,6 +1016,9 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc)
         int bytes_per_usec;
         unsigned int usecs, estimated_usecs;
 
+        if (!rc->ring || !ITR_IS_DYNAMIC(rc->ring->itr_setting))
+                return false;
+
         if (rc->total_packets == 0 || !rc->itr)
                 return false;
 
@@ -2288,15 +2291,6 @@ static u32 i40e_buildreg_itr(const int type, const u16 itr)
 
 /* a small macro to shorten up some long lines */
 #define INTREG I40E_PFINT_DYN_CTLN
-static inline int get_rx_itr(struct i40e_vsi *vsi, int idx)
-{
-        return vsi->rx_rings[idx]->itr_setting;
-}
-
-static inline int get_tx_itr(struct i40e_vsi *vsi, int idx)
-{
-        return vsi->tx_rings[idx]->itr_setting;
-}
 
 /**
  * i40e_update_enable_itr - Update itr and re-enable MSIX interrupt
@@ -2309,9 +2303,7 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
 {
         struct i40e_hw *hw = &vsi->back->hw;
         bool rx = false, tx = false;
-        u32 rxval, txval;
-        int idx = q_vector->v_idx;
-        int rx_itr_setting, tx_itr_setting;
+        u32 txval;
 
         /* If we don't have MSIX, then we only need to re-enable icr0 */
         if (!(vsi->back->flags & I40E_FLAG_MSIX_ENABLED)) {
@@ -2319,29 +2311,15 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
                 return;
         }
 
-        /* avoid dynamic calculation if in countdown mode OR if
-         * all dynamic is disabled
-         */
         txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);
 
-        rx_itr_setting = get_rx_itr(vsi, idx);
-        tx_itr_setting = get_tx_itr(vsi, idx);
-
-        if (q_vector->itr_countdown > 0 ||
-            (!ITR_IS_DYNAMIC(rx_itr_setting) &&
-             !ITR_IS_DYNAMIC(tx_itr_setting))) {
+        /* avoid dynamic calculation if in countdown mode */
+        if (q_vector->itr_countdown > 0)
                 goto enable_int;
-        }
 
-        if (ITR_IS_DYNAMIC(rx_itr_setting)) {
-                rx = i40e_set_new_dynamic_itr(&q_vector->rx);
-                rxval = i40e_buildreg_itr(I40E_RX_ITR, q_vector->rx.itr);
-        }
-
-        if (ITR_IS_DYNAMIC(tx_itr_setting)) {
-                tx = i40e_set_new_dynamic_itr(&q_vector->tx);
-                txval = i40e_buildreg_itr(I40E_TX_ITR, q_vector->tx.itr);
-        }
+        /* these will return false if dynamic mode is disabled */
+        rx = i40e_set_new_dynamic_itr(&q_vector->rx);
+        tx = i40e_set_new_dynamic_itr(&q_vector->tx);
 
         if (rx || tx) {
                 /* get the higher of the two ITR adjustments and
@@ -2349,25 +2327,20 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
                  * when in adaptive mode (Rx and/or Tx)
                  */
                 u16 itr = max(q_vector->tx.itr, q_vector->rx.itr);
+                u32 rxval;
 
                 q_vector->tx.itr = q_vector->rx.itr = itr;
-                txval = i40e_buildreg_itr(I40E_TX_ITR, itr);
-                tx = true;
-                rxval = i40e_buildreg_itr(I40E_RX_ITR, itr);
-                rx = true;
-        }
 
-        /* only need to enable the interrupt once, but need
-         * to possibly update both ITR values
-         */
-        if (rx) {
                 /* set the INTENA_MSK_MASK so that this first write
                  * won't actually enable the interrupt, instead just
                  * updating the ITR (it's bit 31 PF and VF)
                  */
-                rxval |= BIT(31);
+                rxval = i40e_buildreg_itr(I40E_RX_ITR, itr) | BIT(31);
+
                 /* don't check _DOWN because interrupt isn't being enabled */
                 wr32(hw, INTREG(q_vector->reg_idx), rxval);
+
+                txval = i40e_buildreg_itr(I40E_TX_ITR, itr);
         }
 
 enable_int:
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 291130af2985..3fd7e9731f49 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -413,6 +413,9 @@ static bool i40e_set_new_dynamic_itr(struct i40e_ring_container *rc)
         int bytes_per_usec;
         unsigned int usecs, estimated_usecs;
 
+        if (!rc->ring || !ITR_IS_DYNAMIC(rc->ring->itr_setting))
+                return false;
+
         if (rc->total_packets == 0 || !rc->itr)
                 return false;
 
@@ -1471,19 +1474,6 @@ static u32 i40e_buildreg_itr(const int type, const u16 itr)
 
 /* a small macro to shorten up some long lines */
 #define INTREG I40E_VFINT_DYN_CTLN1
-static inline int get_rx_itr(struct i40e_vsi *vsi, int idx)
-{
-        struct i40evf_adapter *adapter = vsi->back;
-
-        return adapter->rx_rings[idx].itr_setting;
-}
-
-static inline int get_tx_itr(struct i40e_vsi *vsi, int idx)
-{
-        struct i40evf_adapter *adapter = vsi->back;
-
-        return adapter->tx_rings[idx].itr_setting;
-}
 
 /**
  * i40e_update_enable_itr - Update itr and re-enable MSIX interrupt
@@ -1496,33 +1486,17 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
 {
         struct i40e_hw *hw = &vsi->back->hw;
         bool rx = false, tx = false;
-        u32 rxval, txval;
-        int idx = q_vector->v_idx;
-        int rx_itr_setting, tx_itr_setting;
+        u32 txval;
 
-        /* avoid dynamic calculation if in countdown mode OR if
-         * all dynamic is disabled
-         */
         txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);
 
-        rx_itr_setting = get_rx_itr(vsi, idx);
-        tx_itr_setting = get_tx_itr(vsi, idx);
-
-        if (q_vector->itr_countdown > 0 ||
-            (!ITR_IS_DYNAMIC(rx_itr_setting) &&
-             !ITR_IS_DYNAMIC(tx_itr_setting))) {
+        /* avoid dynamic calculation if in countdown mode */
+        if (q_vector->itr_countdown > 0)
                 goto enable_int;
-        }
 
-        if (ITR_IS_DYNAMIC(rx_itr_setting)) {
-                rx = i40e_set_new_dynamic_itr(&q_vector->rx);
-                rxval = i40e_buildreg_itr(I40E_RX_ITR, q_vector->rx.itr);
-        }
-
-        if (ITR_IS_DYNAMIC(tx_itr_setting)) {
-                tx = i40e_set_new_dynamic_itr(&q_vector->tx);
-                txval = i40e_buildreg_itr(I40E_TX_ITR, q_vector->tx.itr);
-        }
+        /* these will return false if dynamic mode is disabled */
+        rx = i40e_set_new_dynamic_itr(&q_vector->rx);
+        tx = i40e_set_new_dynamic_itr(&q_vector->tx);
 
         if (rx || tx) {
                 /* get the higher of the two ITR adjustments and
@@ -1530,25 +1504,20 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
                  * when in adaptive mode (Rx and/or Tx)
                  */
                 u16 itr = max(q_vector->tx.itr, q_vector->rx.itr);
+                u32 rxval;
 
                 q_vector->tx.itr = q_vector->rx.itr = itr;
-                txval = i40e_buildreg_itr(I40E_TX_ITR, itr);
-                tx = true;
-                rxval = i40e_buildreg_itr(I40E_RX_ITR, itr);
-                rx = true;
-        }
 
-        /* only need to enable the interrupt once, but need
-         * to possibly update both ITR values
-         */
-        if (rx) {
                 /* set the INTENA_MSK_MASK so that this first write
                  * won't actually enable the interrupt, instead just
                  * updating the ITR (it's bit 31 PF and VF)
                  */
-                rxval |= BIT(31);
+                rxval = i40e_buildreg_itr(I40E_RX_ITR, itr) | BIT(31);
+
                 /* don't check _DOWN because interrupt isn't being enabled */
                 wr32(hw, INTREG(q_vector->reg_idx), rxval);
+
+                txval = i40e_buildreg_itr(I40E_TX_ITR, itr);
         }
 
 enable_int: