net/failsafe: fix crash on slave queue release

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

diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index 579bfab..8af08b3 100644 (file)
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -171,7 +171,6 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
        txq->free_thresh =
                (tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh :
                SFC_TX_DEFAULT_FREE_THRESH;
-       txq->flags = tx_conf->txq_flags;
        txq->offloads = offloads;
 
        rc = sfc_dma_alloc(sa, "txq", sw_index, EFX_TXQ_SIZE(txq_info->entries),
@@ -182,7 +181,6 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
        memset(&info, 0, sizeof(info));
        info.max_fill_level = txq_max_fill_level;
        info.free_thresh = txq->free_thresh;
-       info.flags = tx_conf->txq_flags;
        info.offloads = offloads;
        info.txq_entries = txq_info->entries;
        info.dma_desc_size_max = encp->enc_tx_dma_desc_size_max;
@@ -423,6 +421,7 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 
        txq = txq_info->txq;
 
+       SFC_ASSERT(txq != NULL);
        SFC_ASSERT(txq->state == SFC_TXQ_INITIALIZED);
 
        evq = txq->evq;
@@ -431,39 +430,21 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
        if (rc != 0)
                goto fail_ev_qstart;
 
-       /*
-        * The absence of ETH_TXQ_FLAGS_IGNORE is associated with a legacy
-        * application which expects that IPv4 checksum offload is enabled
-        * all the time as there is no legacy flag to turn off the offload.
-        */
-       if ((txq->offloads & DEV_TX_OFFLOAD_IPV4_CKSUM) ||
-           (~txq->flags & ETH_TXQ_FLAGS_IGNORE))
+       if (txq->offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)
                flags |= EFX_TXQ_CKSUM_IPV4;
 
-       if ((txq->offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
-           ((~txq->flags & ETH_TXQ_FLAGS_IGNORE) &&
-            (offloads_supported & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)))
+       if (txq->offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
                flags |= EFX_TXQ_CKSUM_INNER_IPV4;
 
        if ((txq->offloads & DEV_TX_OFFLOAD_TCP_CKSUM) ||
            (txq->offloads & DEV_TX_OFFLOAD_UDP_CKSUM)) {
                flags |= EFX_TXQ_CKSUM_TCPUDP;
 
-               if ((~txq->flags & ETH_TXQ_FLAGS_IGNORE) &&
-                   (offloads_supported & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM))
+               if (offloads_supported & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM)
                        flags |= EFX_TXQ_CKSUM_INNER_TCPUDP;
        }
 
-       /*
-        * The absence of ETH_TXQ_FLAGS_IGNORE is associated with a legacy
-        * application. In turn, the absence of ETH_TXQ_FLAGS_NOXSUMTCP is
-        * associated specifically with a legacy application which expects
-        * both TCP checksum offload and TSO to be enabled because the legacy
-        * API does not provide a dedicated mechanism to control TSO.
-        */
-       if ((txq->offloads & DEV_TX_OFFLOAD_TCP_TSO) ||
-           ((~txq->flags & ETH_TXQ_FLAGS_IGNORE) &&
-            (~txq->flags & ETH_TXQ_FLAGS_NOXSUMTCP)))
+       if (txq->offloads & DEV_TX_OFFLOAD_TCP_TSO)
                flags |= EFX_TXQ_FATSOV2;
 
        rc = efx_tx_qcreate(sa->nic, sw_index, 0, &txq->mem,
@@ -521,7 +502,7 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)
 
        txq = txq_info->txq;
 
-       if (txq->state == SFC_TXQ_INITIALIZED)
+       if (txq == NULL || txq->state == SFC_TXQ_INITIALIZED)
                return;
 
        SFC_ASSERT(txq->state & SFC_TXQ_STARTED);
@@ -598,8 +579,9 @@ sfc_tx_start(struct sfc_adapter *sa)
                goto fail_efx_tx_init;
 
        for (sw_index = 0; sw_index < sa->txq_count; ++sw_index) {
-               if (!(sa->txq_info[sw_index].deferred_start) ||
-                   sa->txq_info[sw_index].deferred_started) {
+               if (sa->txq_info[sw_index].txq != NULL &&
+                   (!(sa->txq_info[sw_index].deferred_start) ||
+                    sa->txq_info[sw_index].deferred_started)) {
                        rc = sfc_tx_qstart(sa, sw_index);
                        if (rc != 0)
                                goto fail_tx_qstart;