net/sfc: set up and release Tx queues

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 3a511a4..4a4c4dd 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -39,6 +39,7 @@
 #include "sfc_kvargs.h"
 #include "sfc_ev.h"
 #include "sfc_rx.h"
+#include "sfc_tx.h"
 
 
 static void
@@ -267,6 +268,61 @@ sfc_rx_queue_release(void *queue)
        sfc_adapter_unlock(sa);
 }
 
+static int
+sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
+                  uint16_t nb_tx_desc, unsigned int socket_id,
+                  const struct rte_eth_txconf *tx_conf)
+{
+       struct sfc_adapter *sa = dev->data->dev_private;
+       int rc;
+
+       sfc_log_init(sa, "TxQ = %u, nb_tx_desc = %u, socket_id = %u",
+                    tx_queue_id, nb_tx_desc, socket_id);
+
+       sfc_adapter_lock(sa);
+
+       rc = sfc_tx_qinit(sa, tx_queue_id, nb_tx_desc, socket_id, tx_conf);
+       if (rc != 0)
+               goto fail_tx_qinit;
+
+       dev->data->tx_queues[tx_queue_id] = sa->txq_info[tx_queue_id].txq;
+
+       sfc_adapter_unlock(sa);
+       return 0;
+
+fail_tx_qinit:
+       sfc_adapter_unlock(sa);
+       SFC_ASSERT(rc > 0);
+       return -rc;
+}
+
+static void
+sfc_tx_queue_release(void *queue)
+{
+       struct sfc_txq *txq = queue;
+       unsigned int sw_index;
+       struct sfc_adapter *sa;
+
+       if (txq == NULL)
+               return;
+
+       sw_index = sfc_txq_sw_index(txq);
+
+       SFC_ASSERT(txq->evq != NULL);
+       sa = txq->evq->sa;
+
+       sfc_log_init(sa, "TxQ = %u", sw_index);
+
+       sfc_adapter_lock(sa);
+
+       SFC_ASSERT(sw_index < sa->eth_dev->data->nb_tx_queues);
+       sa->eth_dev->data->tx_queues[sw_index] = NULL;
+
+       sfc_tx_qfini(sa, sw_index);
+
+       sfc_adapter_unlock(sa);
+}
+
 static const struct eth_dev_ops sfc_eth_dev_ops = {
        .dev_configure                  = sfc_dev_configure,
        .dev_start                      = sfc_dev_start,
@@ -276,6 +332,8 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {
        .dev_infos_get                  = sfc_dev_infos_get,
        .rx_queue_setup                 = sfc_rx_queue_setup,
        .rx_queue_release               = sfc_rx_queue_release,
+       .tx_queue_setup                 = sfc_tx_queue_setup,
+       .tx_queue_release               = sfc_tx_queue_release,
 };
 
 static int

diff --git a/drivers/net/sfc/sfc_ev.h b/drivers/net/sfc/sfc_ev.h
index f38e6b8..110f3b6 100644 (file)
--- a/drivers/net/sfc/sfc_ev.h
+++ b/drivers/net/sfc/sfc_ev.h
@@ -41,6 +41,7 @@ extern "C" {
 
 struct sfc_adapter;
 struct sfc_rxq;
+struct sfc_txq;
 
 enum sfc_evq_state {
        SFC_EVQ_UNINITIALIZED = 0,
@@ -58,6 +59,7 @@ struct sfc_evq {
        boolean_t               exception;
        efsys_mem_t             mem;
        struct sfc_rxq          *rxq;
+       struct sfc_txq          *txq;
 
        /* Not used on datapath */
        struct sfc_adapter      *sa;

diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index 9c4d6b7..8e042f5 100644 (file)
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -32,6 +32,165 @@
 #include "sfc_ev.h"
 #include "sfc_tx.h"
 
+static int
+sfc_tx_qcheck_conf(struct sfc_adapter *sa,
+                  const struct rte_eth_txconf *tx_conf)
+{
+       unsigned int flags = tx_conf->txq_flags;
+       int rc = 0;
+
+       if (tx_conf->tx_rs_thresh != 0) {
+               sfc_err(sa, "RS bit in transmit descriptor is not supported");
+               rc = EINVAL;
+       }
+
+       if (tx_conf->tx_free_thresh != 0) {
+               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)");
+               rc = EINVAL;
+       }
+
+       if (tx_conf->tx_thresh.pthresh != 0 ||
+           tx_conf->tx_thresh.hthresh != 0 ||
+           tx_conf->tx_thresh.wthresh != 0) {
+               sfc_err(sa,
+                       "prefetch/host/writeback thresholds are not supported");
+               rc = EINVAL;
+       }
+
+       if ((flags & ETH_TXQ_FLAGS_NOVLANOFFL) == 0) {
+               sfc_err(sa, "VLAN offload is not supported");
+               rc = EINVAL;
+       }
+
+       if ((flags & ETH_TXQ_FLAGS_NOXSUMSCTP) == 0) {
+               sfc_err(sa, "SCTP offload is not supported");
+               rc = EINVAL;
+       }
+
+       /* We either perform both TCP and UDP offload, or no offload at all */
+       if (((flags & ETH_TXQ_FLAGS_NOXSUMTCP) == 0) !=
+           ((flags & ETH_TXQ_FLAGS_NOXSUMUDP) == 0)) {
+               sfc_err(sa, "TCP and UDP offloads can't be set independently");
+               rc = EINVAL;
+       }
+
+       return rc;
+}
+
+int
+sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
+            uint16_t nb_tx_desc, unsigned int socket_id,
+            const struct rte_eth_txconf *tx_conf)
+{
+       struct sfc_txq_info *txq_info;
+       struct sfc_evq *evq;
+       struct sfc_txq *txq;
+       unsigned int evq_index = sfc_evq_index_by_txq_sw_index(sa, sw_index);
+       int rc = 0;
+
+       sfc_log_init(sa, "TxQ = %u", sw_index);
+
+       rc = sfc_tx_qcheck_conf(sa, tx_conf);
+       if (rc != 0)
+               goto fail_bad_conf;
+
+       SFC_ASSERT(sw_index < sa->txq_count);
+       txq_info = &sa->txq_info[sw_index];
+
+       SFC_ASSERT(nb_tx_desc <= sa->txq_max_entries);
+       txq_info->entries = nb_tx_desc;
+
+       rc = sfc_ev_qinit(sa, evq_index, txq_info->entries, socket_id);
+       if (rc != 0)
+               goto fail_ev_qinit;
+
+       evq = sa->evq_info[evq_index].evq;
+
+       rc = ENOMEM;
+       txq = rte_zmalloc_socket("sfc-txq", sizeof(*txq), 0, socket_id);
+       if (txq == NULL)
+               goto fail_txq_alloc;
+
+       rc = sfc_dma_alloc(sa, "txq", sw_index, EFX_TXQ_SIZE(txq_info->entries),
+                          socket_id, &txq->mem);
+       if (rc != 0)
+               goto fail_dma_alloc;
+
+       rc = ENOMEM;
+       txq->pend_desc = rte_calloc_socket("sfc-txq-pend-desc",
+                                          EFX_TXQ_LIMIT(txq_info->entries),
+                                          sizeof(efx_desc_t), 0, socket_id);
+       if (txq->pend_desc == NULL)
+               goto fail_pend_desc_alloc;
+
+       rc = ENOMEM;
+       txq->sw_ring = rte_calloc_socket("sfc-txq-desc", txq_info->entries,
+                                        sizeof(*txq->sw_ring), 0, socket_id);
+       if (txq->sw_ring == NULL)
+               goto fail_desc_alloc;
+
+       txq->state = SFC_TXQ_INITIALIZED;
+       txq->ptr_mask = txq_info->entries - 1;
+       txq->hw_index = sw_index;
+       txq->flags = tx_conf->txq_flags;
+       txq->evq = evq;
+
+       evq->txq = txq;
+
+       txq_info->txq = txq;
+
+       return 0;
+
+fail_desc_alloc:
+       rte_free(txq->pend_desc);
+
+fail_pend_desc_alloc:
+       sfc_dma_free(sa, &txq->mem);
+
+fail_dma_alloc:
+       rte_free(txq);
+
+fail_txq_alloc:
+       sfc_ev_qfini(sa, evq_index);
+
+fail_ev_qinit:
+       txq_info->entries = 0;
+
+fail_bad_conf:
+       sfc_log_init(sa, "failed (TxQ = %u, rc = %d)", sw_index, rc);
+       return rc;
+}
+
+void
+sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
+{
+       struct sfc_txq_info *txq_info;
+       struct sfc_txq *txq;
+
+       sfc_log_init(sa, "TxQ = %u", sw_index);
+
+       SFC_ASSERT(sw_index < sa->txq_count);
+       txq_info = &sa->txq_info[sw_index];
+
+       txq = txq_info->txq;
+       SFC_ASSERT(txq != NULL);
+       SFC_ASSERT(txq->state == SFC_TXQ_INITIALIZED);
+
+       txq_info->txq = NULL;
+       txq_info->entries = 0;
+
+       rte_free(txq->sw_ring);
+       rte_free(txq->pend_desc);
+       sfc_dma_free(sa, &txq->mem);
+       rte_free(txq);
+}
+
 static int
 sfc_tx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)
 {
@@ -118,6 +277,14 @@ fail_check_mode:
 void
 sfc_tx_fini(struct sfc_adapter *sa)
 {
+       int sw_index;
+
+       sw_index = sa->txq_count;
+       while (--sw_index >= 0) {
+               if (sa->txq_info[sw_index].txq != NULL)
+                       sfc_tx_qfini(sa, sw_index);
+       }
+
        rte_free(sa->txq_info);
        sa->txq_info = NULL;
        sa->txq_count = 0;

diff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h
index 549abc4..e8dd578 100644 (file)
--- a/drivers/net/sfc/sfc_tx.h
+++ b/drivers/net/sfc/sfc_tx.h
@@ -40,13 +40,49 @@ extern "C" {
 #endif
 
 struct sfc_adapter;
+struct sfc_evq;
+
+struct sfc_tx_sw_desc {
+       struct rte_mbuf         *mbuf;
+};
+
+enum sfc_txq_state_bit {
+       SFC_TXQ_INITIALIZED_BIT = 0,
+#define SFC_TXQ_INITIALIZED    (1 << SFC_TXQ_INITIALIZED_BIT)
+};
+
+struct sfc_txq {
+       struct sfc_evq          *evq;
+       struct sfc_tx_sw_desc   *sw_ring;
+       unsigned int            state;
+       unsigned int            ptr_mask;
+       efx_desc_t              *pend_desc;
+       efx_txq_t               *common;
+       efsys_mem_t             mem;
+
+       unsigned int            hw_index;
+       unsigned int            flags;
+};
+
+static inline unsigned int
+sfc_txq_sw_index(const struct sfc_txq *txq)
+{
+       return txq->hw_index;
+}
 
 struct sfc_txq_info {
+       unsigned int            entries;
+       struct sfc_txq          *txq;
 };
 
 int sfc_tx_init(struct sfc_adapter *sa);
 void sfc_tx_fini(struct sfc_adapter *sa);
 
+int sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
+                uint16_t nb_tx_desc, unsigned int socket_id,
+                const struct rte_eth_txconf *tx_conf);
+void sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index);
+
 #ifdef __cplusplus
 }
 #endif