net/mlx5: fix using flow tunnel before null check

[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 cc7d5d1..b4953ac 100644 (file)
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2019-2021 Xilinx, Inc.
  * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -162,6 +162,32 @@ sfc_ev_dp_rx(void *arg, __rte_unused uint32_t label, uint32_t id,
        return evq->sa->priv.dp_rx->qrx_ev(dp_rxq, id);
 }
 
+static boolean_t
+sfc_ev_nop_rx_packets(void *arg, uint32_t label, unsigned int num_packets,
+                     uint32_t flags)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa,
+               "EVQ %u unexpected Rx packets event label=%u num=%u flags=%#x",
+               evq->evq_index, label, num_packets, flags);
+       return B_TRUE;
+}
+
+static boolean_t
+sfc_ev_dp_rx_packets(void *arg, __rte_unused uint32_t label,
+                    unsigned int num_packets, __rte_unused uint32_t flags)
+{
+       struct sfc_evq *evq = arg;
+       struct sfc_dp_rxq *dp_rxq;
+
+       dp_rxq = evq->dp_rxq;
+       SFC_ASSERT(dp_rxq != NULL);
+
+       SFC_ASSERT(evq->sa->priv.dp_rx->qrx_ev != NULL);
+       return evq->sa->priv.dp_rx->qrx_ev(dp_rxq, num_packets);
+}
+
 static boolean_t
 sfc_ev_nop_rx_ps(void *arg, uint32_t label, uint32_t id,
                 uint32_t pkt_count, uint16_t flags)
@@ -243,6 +269,30 @@ sfc_ev_dp_tx(void *arg, __rte_unused uint32_t label, uint32_t id)
        return evq->sa->priv.dp_tx->qtx_ev(dp_txq, id);
 }
 
+static boolean_t
+sfc_ev_nop_tx_ndescs(void *arg, uint32_t label, unsigned int ndescs)
+{
+       struct sfc_evq *evq = arg;
+
+       sfc_err(evq->sa, "EVQ %u unexpected Tx event label=%u ndescs=%#x",
+               evq->evq_index, label, ndescs);
+       return B_TRUE;
+}
+
+static boolean_t
+sfc_ev_dp_tx_ndescs(void *arg, __rte_unused uint32_t label,
+                     unsigned int ndescs)
+{
+       struct sfc_evq *evq = arg;
+       struct sfc_dp_txq *dp_txq;
+
+       dp_txq = evq->dp_txq;
+       SFC_ASSERT(dp_txq != NULL);
+
+       SFC_ASSERT(evq->sa->priv.dp_tx->qtx_ev != NULL);
+       return evq->sa->priv.dp_tx->qtx_ev(dp_txq, ndescs);
+}
+
 static boolean_t
 sfc_ev_exception(void *arg, uint32_t code, __rte_unused uint32_t data)
 {
@@ -429,8 +479,10 @@ sfc_ev_link_change(void *arg, efx_link_mode_t link_mode)
 static const efx_ev_callbacks_t sfc_ev_callbacks = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_nop_rx,
+       .eec_rx_packets         = sfc_ev_nop_rx_packets,
        .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_nop_tx,
+       .eec_tx_ndescs          = sfc_ev_nop_tx_ndescs,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
        .eec_rxq_flush_failed   = sfc_ev_nop_rxq_flush_failed,
@@ -445,8 +497,10 @@ static const efx_ev_callbacks_t sfc_ev_callbacks = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_efx_rx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_efx_rx,
+       .eec_rx_packets         = sfc_ev_nop_rx_packets,
        .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_nop_tx,
+       .eec_tx_ndescs          = sfc_ev_nop_tx_ndescs,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_rxq_flush_done,
        .eec_rxq_flush_failed   = sfc_ev_rxq_flush_failed,
@@ -461,8 +515,10 @@ static const efx_ev_callbacks_t sfc_ev_callbacks_efx_rx = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_dp_rx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_dp_rx,
+       .eec_rx_packets         = sfc_ev_dp_rx_packets,
        .eec_rx_ps              = sfc_ev_dp_rx_ps,
        .eec_tx                 = sfc_ev_nop_tx,
+       .eec_tx_ndescs          = sfc_ev_nop_tx_ndescs,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_rxq_flush_done,
        .eec_rxq_flush_failed   = sfc_ev_rxq_flush_failed,
@@ -477,8 +533,10 @@ static const efx_ev_callbacks_t sfc_ev_callbacks_dp_rx = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_efx_tx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_nop_rx,
+       .eec_rx_packets         = sfc_ev_nop_rx_packets,
        .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_tx,
+       .eec_tx_ndescs          = sfc_ev_nop_tx_ndescs,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
        .eec_rxq_flush_failed   = sfc_ev_nop_rxq_flush_failed,
@@ -493,8 +551,10 @@ static const efx_ev_callbacks_t sfc_ev_callbacks_efx_tx = {
 static const efx_ev_callbacks_t sfc_ev_callbacks_dp_tx = {
        .eec_initialized        = sfc_ev_initialized,
        .eec_rx                 = sfc_ev_nop_rx,
+       .eec_rx_packets         = sfc_ev_nop_rx_packets,
        .eec_rx_ps              = sfc_ev_nop_rx_ps,
        .eec_tx                 = sfc_ev_dp_tx,
+       .eec_tx_ndescs          = sfc_ev_dp_tx_ndescs,
        .eec_exception          = sfc_ev_exception,
        .eec_rxq_flush_done     = sfc_ev_nop_rxq_flush_done,
        .eec_rxq_flush_failed   = sfc_ev_nop_rxq_flush_failed,