i40e/i40evf: use SW variables for hang detection

The i40e_detect_recover_hung function uses the i40e_get_tx_pending
function to determine if there are packets stalled on the ring.
i40e_get_tx_pending calculates the pending packets using the head
writeback value and HW tail.  If the queue is stopped and we lose the
interrupt to update our next_to_clean then we a) won't get another
interrupt to clean because queue is stopped b) we won't catch the
problem with i40e_detect_recover_hung because the HW values look like
there's no packets waiting to be transmitted.  Using the SW values we
can catch the issue because next_to_clean will be out of sync with head
writeback.

This has the added benefit being less CPU intensive because we don't
need to reach into the hardware to get the values.

Signed-off-by: Alan Brady <[email protected]>
Tested-by: Andrew Bowers <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 1ec9b1d8023da96da0dad3ccad94d9cbe1ab23b0..97cfe944b5683aea32cbc3fed6ed0ab670a867e8 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -708,16 +708,22 @@ void i40e_free_tx_resources(struct i40e_ring *tx_ring)
 /**
  * i40e_get_tx_pending - how many tx descriptors not processed
  * @tx_ring: the ring of descriptors
 /**
  * i40e_get_tx_pending - how many tx descriptors not processed
  * @tx_ring: the ring of descriptors

+ * @in_sw: use SW variables

  *
  * Since there is no access to the ring head register
  * in XL710, we need to use our local copies
  **/
  *
  * Since there is no access to the ring head register
  * in XL710, we need to use our local copies
  **/

-u32 i40e_get_tx_pending(struct i40e_ring *ring)
+u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw)

 {
        u32 head, tail;
 
 {
        u32 head, tail;
 

-       head = i40e_get_head(ring);
-       tail = readl(ring->tail);
+       if (!in_sw) {
+               head = i40e_get_head(ring);
+               tail = readl(ring->tail);
+       } else {
+               head = ring->next_to_clean;
+               tail = ring->next_to_use;
+       }

 
        if (head != tail)
                return (head < tail) ?
 
        if (head != tail)
                return (head < tail) ?


@@ -774,7 +780,7 @@ void i40e_detect_recover_hung(struct i40e_vsi *vsi)
                         */
                        smp_rmb();
                        tx_ring->tx_stats.prev_pkt_ctr =
                         */
                        smp_rmb();
                        tx_ring->tx_stats.prev_pkt_ctr =

-                           i40e_get_tx_pending(tx_ring) ? packets : -1;
+                           i40e_get_tx_pending(tx_ring, true) ? packets : -1;

                }
        }
 }
                }
        }
 }


@@ -898,7 +904,7 @@ static bool i40e_clean_tx_irq(struct i40e_vsi *vsi,
                 * them to be written back in case we stay in NAPI.
                 * In this mode on X722 we do not enable Interrupt.
                 */
                 * them to be written back in case we stay in NAPI.
                 * In this mode on X722 we do not enable Interrupt.
                 */

-               unsigned int j = i40e_get_tx_pending(tx_ring);
+               unsigned int j = i40e_get_tx_pending(tx_ring, false);

 
                if (budget &&
                    ((j / WB_STRIDE) == 0) && (j > 0) &&
 
                if (budget &&
                    ((j / WB_STRIDE) == 0) && (j > 0) &&

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index f75a8fe68fcf0d60a1ab242a58db9ff262f009ed..3c80ea7843897075d37ce76cc441276efa85c852 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@ -505,7 +505,7 @@ void i40e_free_tx_resources(struct i40e_ring *tx_ring);
 void i40e_free_rx_resources(struct i40e_ring *rx_ring);
 int i40e_napi_poll(struct napi_struct *napi, int budget);
 void i40e_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector);
 void i40e_free_rx_resources(struct i40e_ring *rx_ring);
 int i40e_napi_poll(struct napi_struct *napi, int budget);
 void i40e_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector);

-u32 i40e_get_tx_pending(struct i40e_ring *ring);
+u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw);

 void i40e_detect_recover_hung(struct i40e_vsi *vsi);
 int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);
 bool __i40e_chk_linearize(struct sk_buff *skb);
 void i40e_detect_recover_hung(struct i40e_vsi *vsi);
 int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);
 bool __i40e_chk_linearize(struct sk_buff *skb);

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index eb8f3e327f6baf5742f0d8a1c725b736ac5827ad..e088d23eb083ff4dd8f5c28889f65ee385f4a095 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -196,7 +196,7 @@ void i40evf_detect_recover_hung(struct i40e_vsi *vsi)
                         */
                        smp_rmb();
                        tx_ring->tx_stats.prev_pkt_ctr =
                         */
                        smp_rmb();
                        tx_ring->tx_stats.prev_pkt_ctr =

-                         i40evf_get_tx_pending(tx_ring, false) ? packets : -1;
+                         i40evf_get_tx_pending(tx_ring, true) ? packets : -1;

                }
        }
 }
                }
        }
 }