net/sfc: restart RxQ in case of exception on event queue

[dpdk.git] / drivers / net / sfc / sfc_ev.c

diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index d9e8459..36aede8 100644 (file)
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -30,6 +30,7 @@
 #include <rte_debug.h>
 #include <rte_cycles.h>
 #include <rte_alarm.h>
+#include <rte_branch_prediction.h>
 
 #include "efx.h"
 
@@ -38,6 +39,7 @@
 #include "sfc_log.h"
 #include "sfc_ev.h"
 #include "sfc_rx.h"
+#include "sfc_tx.h"
 
 
 /* Initial delay when waiting for event queue init complete event */
@@ -91,7 +93,27 @@ sfc_ev_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
        delta = (stop >= pending_id) ? (stop - pending_id) :
                (rxq->ptr_mask + 1 - pending_id + stop);
 
-       if (unlikely(delta > rxq->batch_max)) {
+       if (delta == 0) {
+               /*
+                * Rx event with no new descriptors done and zero length
+                * is used to abort scattered packet when there is no room
+                * for the tail.
+                */
+               if (unlikely(size != 0)) {
+                       evq->exception = B_TRUE;
+                       sfc_err(evq->sa,
+                               "EVQ %u RxQ %u invalid RX abort "
+                               "(id=%#x size=%u flags=%#x); needs restart\n",
+                               evq->evq_index, sfc_rxq_sw_index(rxq),
+                               id, size, flags);
+                       goto done;
+               }
+
+               /* Add discard flag to the first fragment */
+               rxq->sw_desc[pending_id].flags |= EFX_DISCARD;
+               /* Remove continue flag from the last fragment */
+               rxq->sw_desc[id].flags &= ~EFX_PKT_CONT;
+       } else if (unlikely(delta > rxq->batch_max)) {
                evq->exception = B_TRUE;
 
                sfc_err(evq->sa,
@@ -119,12 +141,30 @@ done:
 }
 
 static boolean_t
-sfc_ev_tx(void *arg, __rte_unused uint32_t label, __rte_unused uint32_t id)
+sfc_ev_tx(void *arg, __rte_unused uint32_t label, uint32_t id)
 {
        struct sfc_evq *evq = arg;
+       struct sfc_txq *txq;
+       unsigned int stop;
+       unsigned int delta;
 
-       sfc_err(evq->sa, "EVQ %u unexpected Tx event", evq->evq_index);
-       return B_TRUE;
+       txq = evq->txq;
+
+       SFC_ASSERT(txq != NULL);
+       SFC_ASSERT(txq->evq == evq);
+
+       if (unlikely((txq->state & SFC_TXQ_STARTED) == 0))
+               goto done;
+
+       stop = (id + 1) & txq->ptr_mask;
+       id = txq->pending & txq->ptr_mask;
+
+       delta = (stop >= id) ? (stop - id) : (txq->ptr_mask + 1 - id + stop);
+
+       txq->pending += delta;
+
+done:
+       return B_FALSE;
 }
 
 static boolean_t
@@ -188,10 +228,15 @@ static boolean_t
 sfc_ev_txq_flush_done(void *arg, __rte_unused uint32_t txq_hw_index)
 {
        struct sfc_evq *evq = arg;
+       struct sfc_txq *txq;
 
-       sfc_err(evq->sa, "EVQ %u unexpected Tx flush done event",
-               evq->evq_index);
-       return B_TRUE;
+       txq = evq->txq;
+       SFC_ASSERT(txq != NULL);
+       SFC_ASSERT(txq->hw_index == txq_hw_index);
+       SFC_ASSERT(txq->evq == evq);
+       sfc_tx_qflush_done(txq);
+
+       return B_FALSE;
 }
 
 static boolean_t
@@ -276,6 +321,31 @@ sfc_ev_qpoll(struct sfc_evq *evq)
 
        efx_ev_qpoll(evq->common, &evq->read_ptr, &sfc_ev_callbacks, evq);
 
+       if (unlikely(evq->exception) && sfc_adapter_trylock(evq->sa)) {
+               struct sfc_adapter *sa = evq->sa;
+               int rc;
+
+               if ((evq->rxq != NULL) && (evq->rxq->state & SFC_RXQ_RUNNING)) {
+                       unsigned int rxq_sw_index = sfc_rxq_sw_index(evq->rxq);
+
+                       sfc_warn(sa,
+                                "restart RxQ %u because of exception on its EvQ %u",
+                                rxq_sw_index, evq->evq_index);
+
+                       sfc_rx_qstop(sa, rxq_sw_index);
+                       rc = sfc_rx_qstart(sa, rxq_sw_index);
+                       if (rc != 0)
+                               sfc_err(sa, "cannot restart RxQ %u",
+                                       rxq_sw_index);
+               }
+
+               if (evq->exception)
+                       sfc_panic(sa, "unrecoverable exception on EvQ %u",
+                                 evq->evq_index);
+
+               sfc_adapter_unlock(sa);
+       }
+
        /* Poll-mode driver does not re-prime the event queue for interrupts */
 }