net/sfc: support VLAN offload on transmit path

[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 a240610..86bcfec 100644 (file)
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -54,10 +54,11 @@
 #define SFC_TX_QFLUSH_POLL_ATTEMPTS    (2000)
 
 static int
-sfc_tx_qcheck_conf(struct sfc_adapter *sa,
+sfc_tx_qcheck_conf(struct sfc_adapter *sa, uint16_t nb_tx_desc,
                   const struct rte_eth_txconf *tx_conf)
 {
        unsigned int flags = tx_conf->txq_flags;
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
        int rc = 0;
 
        if (tx_conf->tx_rs_thresh != 0) {
@@ -65,14 +66,10 @@ sfc_tx_qcheck_conf(struct sfc_adapter *sa,
                rc = EINVAL;
        }
 
-       if (tx_conf->tx_free_thresh != 0) {
+       if (tx_conf->tx_free_thresh > EFX_TXQ_LIMIT(nb_tx_desc)) {
                sfc_err(sa,
-                       "setting explicit TX free threshold is not supported");
-               rc = EINVAL;
-       }
-
-       if (tx_conf->tx_deferred_start != 0) {
-               sfc_err(sa, "TX queue deferred start is not supported (yet)");
+                       "TxQ free threshold too large: %u vs maximum %u",
+                       tx_conf->tx_free_thresh, EFX_TXQ_LIMIT(nb_tx_desc));
                rc = EINVAL;
        }
 
@@ -84,7 +81,8 @@ sfc_tx_qcheck_conf(struct sfc_adapter *sa,
                rc = EINVAL;
        }
 
-       if ((flags & ETH_TXQ_FLAGS_NOVLANOFFL) == 0) {
+       if (!encp->enc_hw_tx_insert_vlan_enabled &&
+           (flags & ETH_TXQ_FLAGS_NOVLANOFFL) == 0) {
                sfc_err(sa, "VLAN offload is not supported");
                rc = EINVAL;
        }
@@ -147,7 +145,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 
        sfc_log_init(sa, "TxQ = %u", sw_index);
 
-       rc = sfc_tx_qcheck_conf(sa, tx_conf);
+       rc = sfc_tx_qcheck_conf(sa, nb_tx_desc, tx_conf);
        if (rc != 0)
                goto fail_bad_conf;
 
@@ -188,6 +186,8 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
 
        txq->state = SFC_TXQ_INITIALIZED;
        txq->ptr_mask = txq_info->entries - 1;
+       txq->free_thresh = (tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh :
+                                                    SFC_TX_DEFAULT_FREE_THRESH;
        txq->hw_index = sw_index;
        txq->flags = tx_conf->txq_flags;
        txq->evq = evq;
@@ -195,6 +195,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
        evq->txq = txq;
 
        txq_info->txq = txq;
+       txq_info->deferred_start = (tx_conf->tx_deferred_start != 0);
 
        return 0;
 
@@ -385,6 +386,7 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
                goto fail_tx_qcreate;
 
        txq->added = txq->pending = txq->completed = desc_index;
+       txq->hw_vlan_tci = 0;
 
        efx_tx_qenable(txq->common);
 
@@ -422,6 +424,9 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)
 
        txq = txq_info->txq;
 
+       if (txq->state == SFC_TXQ_INITIALIZED)
+               return;
+
        SFC_ASSERT(txq->state & SFC_TXQ_STARTED);
 
        txq->state &= ~SFC_TXQ_RUNNING;
@@ -494,9 +499,12 @@ sfc_tx_start(struct sfc_adapter *sa)
                goto fail_efx_tx_init;
 
        for (sw_index = 0; sw_index < sa->txq_count; ++sw_index) {
-               rc = sfc_tx_qstart(sa, sw_index);
-               if (rc != 0)
-                       goto fail_tx_qstart;
+               if (!(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;
+               }
        }
 
        return 0;
@@ -528,6 +536,37 @@ sfc_tx_stop(struct sfc_adapter *sa)
        efx_tx_fini(sa->nic);
 }
 
+/*
+ * The function is used to insert or update VLAN tag;
+ * the firmware has state of the firmware tag to insert per TxQ
+ * (controlled by option descriptors), hence, if the tag of the
+ * packet to be sent is different from one remembered by the firmware,
+ * the function will update it
+ */
+static unsigned int
+sfc_tx_maybe_insert_tag(struct sfc_txq *txq, struct rte_mbuf *m,
+                       efx_desc_t **pend)
+{
+       uint16_t this_tag = ((m->ol_flags & PKT_TX_VLAN_PKT) ?
+                            m->vlan_tci : 0);
+
+       if (this_tag == txq->hw_vlan_tci)
+               return 0;
+
+       /*
+        * The expression inside SFC_ASSERT() is not desired to be checked in
+        * a non-debug build because it might be too expensive on the data path
+        */
+       SFC_ASSERT(efx_nic_cfg_get(txq->evq->sa->nic)->enc_hw_tx_insert_vlan_enabled);
+
+       efx_tx_qdesc_vlantci_create(txq->common, rte_cpu_to_be_16(this_tag),
+                                   *pend);
+       (*pend)++;
+       txq->hw_vlan_tci = this_tag;
+
+       return 1;
+}
+
 uint16_t
 sfc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
@@ -537,8 +576,7 @@ sfc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
        unsigned int pkts_sent = 0;
        efx_desc_t *pend = &txq->pend_desc[0];
        const unsigned int hard_max_fill = EFX_TXQ_LIMIT(txq->ptr_mask + 1);
-       const unsigned int soft_max_fill = hard_max_fill -
-                                          SFC_TX_MAX_PKT_DESC;
+       const unsigned int soft_max_fill = hard_max_fill - txq->free_thresh;
        unsigned int fill_level = added - txq->completed;
        boolean_t reap_done;
        int rc __rte_unused;
@@ -570,6 +608,15 @@ sfc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                size_t                  pkt_len = m_seg->pkt_len;
                unsigned int            pkt_descs = 0;
 
+               /*
+                * Here VLAN TCI is expected to be zero in case if no
+                * DEV_TX_VLAN_OFFLOAD capability is advertised;
+                * if the calling app ignores the absence of
+                * DEV_TX_VLAN_OFFLOAD and pushes VLAN TCI, then
+                * TX_ERROR will occur
+                */
+               pkt_descs += sfc_tx_maybe_insert_tag(txq, m_seg, &pend);
+
                for (; m_seg != NULL; m_seg = m_seg->next) {
                        efsys_dma_addr_t        next_frag;
                        size_t                  seg_len;