ethdev: move egress metadata to dynamic field
[dpdk.git] / lib / librte_ethdev / rte_ethdev.c
index af82360..652c369 100644 (file)
@@ -37,8 +37,8 @@
 #include <rte_string_fns.h>
 #include <rte_kvargs.h>
 #include <rte_class.h>
+#include <rte_ether.h>
 
-#include "rte_ether.h"
 #include "rte_ethdev.h"
 #include "rte_ethdev_driver.h"
 #include "ethdev_profile.h"
@@ -161,7 +161,6 @@ static const struct {
        RTE_TX_OFFLOAD_BIT2STR(UDP_TNL_TSO),
        RTE_TX_OFFLOAD_BIT2STR(IP_TNL_TSO),
        RTE_TX_OFFLOAD_BIT2STR(OUTER_UDP_CKSUM),
-       RTE_TX_OFFLOAD_BIT2STR(MATCH_METADATA),
 };
 
 #undef RTE_TX_OFFLOAD_BIT2STR
@@ -753,12 +752,6 @@ rte_eth_dev_get_sec_ctx(uint16_t port_id)
        return rte_eth_devices[port_id].security_ctx;
 }
 
-uint16_t
-rte_eth_dev_count(void)
-{
-       return rte_eth_dev_count_avail();
-}
-
 uint16_t
 rte_eth_dev_count_avail(void)
 {
@@ -904,6 +897,13 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id)
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP);
 
+       if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) {
+               RTE_ETHDEV_LOG(INFO,
+                       "Can't start Rx hairpin queue %"PRIu16" of device with port_id=%"PRIu16"\n",
+                       rx_queue_id, port_id);
+               return -EINVAL;
+       }
+
        if (dev->data->rx_queue_state[rx_queue_id] != RTE_ETH_QUEUE_STATE_STOPPED) {
                RTE_ETHDEV_LOG(INFO,
                        "Queue %"PRIu16" of device with port_id=%"PRIu16" already started\n",
@@ -931,6 +931,13 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id)
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP);
 
+       if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) {
+               RTE_ETHDEV_LOG(INFO,
+                       "Can't stop Rx hairpin queue %"PRIu16" of device with port_id=%"PRIu16"\n",
+                       rx_queue_id, port_id);
+               return -EINVAL;
+       }
+
        if (dev->data->rx_queue_state[rx_queue_id] == RTE_ETH_QUEUE_STATE_STOPPED) {
                RTE_ETHDEV_LOG(INFO,
                        "Queue %"PRIu16" of device with port_id=%"PRIu16" already stopped\n",
@@ -964,6 +971,13 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id)
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP);
 
+       if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) {
+               RTE_ETHDEV_LOG(INFO,
+                       "Can't start Tx hairpin queue %"PRIu16" of device with port_id=%"PRIu16"\n",
+                       tx_queue_id, port_id);
+               return -EINVAL;
+       }
+
        if (dev->data->tx_queue_state[tx_queue_id] != RTE_ETH_QUEUE_STATE_STOPPED) {
                RTE_ETHDEV_LOG(INFO,
                        "Queue %"PRIu16" of device with port_id=%"PRIu16" already started\n",
@@ -989,6 +1003,13 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id)
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP);
 
+       if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) {
+               RTE_ETHDEV_LOG(INFO,
+                       "Can't stop Tx hairpin queue %"PRIu16" of device with port_id=%"PRIu16"\n",
+                       tx_queue_id, port_id);
+               return -EINVAL;
+       }
+
        if (dev->data->tx_queue_state[tx_queue_id] == RTE_ETH_QUEUE_STATE_STOPPED) {
                RTE_ETHDEV_LOG(INFO,
                        "Queue %"PRIu16" of device with port_id=%"PRIu16" already stopped\n",
@@ -1269,6 +1290,9 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                goto rollback;
        }
 
+       dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf =
+               rte_eth_rss_hf_refine(dev_conf->rx_adv_conf.rss_conf.rss_hf);
+
        /* Check that device supports requested rss hash functions. */
        if ((dev_info.flow_type_rss_offloads |
             dev_conf->rx_adv_conf.rss_conf.rss_hf) !=
@@ -1757,6 +1781,78 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
        return eth_err(port_id, ret);
 }
 
+int
+rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
+                              uint16_t nb_rx_desc,
+                              const struct rte_eth_hairpin_conf *conf)
+{
+       int ret;
+       struct rte_eth_dev *dev;
+       struct rte_eth_hairpin_cap cap;
+       void **rxq;
+       int i;
+       int count;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       dev = &rte_eth_devices[port_id];
+       if (rx_queue_id >= dev->data->nb_rx_queues) {
+               RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u\n", rx_queue_id);
+               return -EINVAL;
+       }
+       ret = rte_eth_dev_hairpin_capability_get(port_id, &cap);
+       if (ret != 0)
+               return ret;
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_hairpin_queue_setup,
+                               -ENOTSUP);
+       /* if nb_rx_desc is zero use max number of desc from the driver. */
+       if (nb_rx_desc == 0)
+               nb_rx_desc = cap.max_nb_desc;
+       if (nb_rx_desc > cap.max_nb_desc) {
+               RTE_ETHDEV_LOG(ERR,
+                       "Invalid value for nb_rx_desc(=%hu), should be: <= %hu",
+                       nb_rx_desc, cap.max_nb_desc);
+               return -EINVAL;
+       }
+       if (conf->peer_count > cap.max_rx_2_tx) {
+               RTE_ETHDEV_LOG(ERR,
+                       "Invalid value for number of peers for Rx queue(=%hu), should be: <= %hu",
+                       conf->peer_count, cap.max_rx_2_tx);
+               return -EINVAL;
+       }
+       if (conf->peer_count == 0) {
+               RTE_ETHDEV_LOG(ERR,
+                       "Invalid value for number of peers for Rx queue(=%hu), should be: > 0",
+                       conf->peer_count);
+               return -EINVAL;
+       }
+       for (i = 0, count = 0; i < dev->data->nb_rx_queues &&
+            cap.max_nb_queues != UINT16_MAX; i++) {
+               if (i == rx_queue_id || rte_eth_dev_is_rx_hairpin_queue(dev, i))
+                       count++;
+       }
+       if (count > cap.max_nb_queues) {
+               RTE_ETHDEV_LOG(ERR, "To many Rx hairpin queues max is %d",
+               cap.max_nb_queues);
+               return -EINVAL;
+       }
+       if (dev->data->dev_started)
+               return -EBUSY;
+       rxq = dev->data->rx_queues;
+       if (rxq[rx_queue_id] != NULL) {
+               RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release,
+                                       -ENOTSUP);
+               (*dev->dev_ops->rx_queue_release)(rxq[rx_queue_id]);
+               rxq[rx_queue_id] = NULL;
+       }
+       ret = (*dev->dev_ops->rx_hairpin_queue_setup)(dev, rx_queue_id,
+                                                     nb_rx_desc, conf);
+       if (ret == 0)
+               dev->data->rx_queue_state[rx_queue_id] =
+                       RTE_ETH_QUEUE_STATE_HAIRPIN;
+       return eth_err(port_id, ret);
+}
+
 int
 rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
                       uint16_t nb_tx_desc, unsigned int socket_id,
@@ -1856,6 +1952,77 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
                       tx_queue_id, nb_tx_desc, socket_id, &local_conf));
 }
 
+int
+rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
+                              uint16_t nb_tx_desc,
+                              const struct rte_eth_hairpin_conf *conf)
+{
+       struct rte_eth_dev *dev;
+       struct rte_eth_hairpin_cap cap;
+       void **txq;
+       int i;
+       int count;
+       int ret;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+       dev = &rte_eth_devices[port_id];
+       if (tx_queue_id >= dev->data->nb_tx_queues) {
+               RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", tx_queue_id);
+               return -EINVAL;
+       }
+       ret = rte_eth_dev_hairpin_capability_get(port_id, &cap);
+       if (ret != 0)
+               return ret;
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_hairpin_queue_setup,
+                               -ENOTSUP);
+       /* if nb_rx_desc is zero use max number of desc from the driver. */
+       if (nb_tx_desc == 0)
+               nb_tx_desc = cap.max_nb_desc;
+       if (nb_tx_desc > cap.max_nb_desc) {
+               RTE_ETHDEV_LOG(ERR,
+                       "Invalid value for nb_tx_desc(=%hu), should be: <= %hu",
+                       nb_tx_desc, cap.max_nb_desc);
+               return -EINVAL;
+       }
+       if (conf->peer_count > cap.max_tx_2_rx) {
+               RTE_ETHDEV_LOG(ERR,
+                       "Invalid value for number of peers for Tx queue(=%hu), should be: <= %hu",
+                       conf->peer_count, cap.max_tx_2_rx);
+               return -EINVAL;
+       }
+       if (conf->peer_count == 0) {
+               RTE_ETHDEV_LOG(ERR,
+                       "Invalid value for number of peers for Tx queue(=%hu), should be: > 0",
+                       conf->peer_count);
+               return -EINVAL;
+       }
+       for (i = 0, count = 0; i < dev->data->nb_tx_queues &&
+            cap.max_nb_queues != UINT16_MAX; i++) {
+               if (i == tx_queue_id || rte_eth_dev_is_tx_hairpin_queue(dev, i))
+                       count++;
+       }
+       if (count > cap.max_nb_queues) {
+               RTE_ETHDEV_LOG(ERR, "To many Tx hairpin queues max is %d",
+               cap.max_nb_queues);
+               return -EINVAL;
+       }
+       if (dev->data->dev_started)
+               return -EBUSY;
+       txq = dev->data->tx_queues;
+       if (txq[tx_queue_id] != NULL) {
+               RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release,
+                                       -ENOTSUP);
+               (*dev->dev_ops->tx_queue_release)(txq[tx_queue_id]);
+               txq[tx_queue_id] = NULL;
+       }
+       ret = (*dev->dev_ops->tx_hairpin_queue_setup)
+               (dev, tx_queue_id, nb_tx_desc, conf);
+       if (ret == 0)
+               dev->data->tx_queue_state[tx_queue_id] =
+                       RTE_ETH_QUEUE_STATE_HAIRPIN;
+       return eth_err(port_id, ret);
+}
+
 void
 rte_eth_tx_buffer_drop_callback(struct rte_mbuf **pkts, uint16_t unsent,
                void *userdata __rte_unused)
@@ -1930,12 +2097,13 @@ rte_eth_promiscuous_enable(uint16_t port_id)
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
+       if (dev->data->promiscuous == 1)
+               return 0;
+
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->promiscuous_enable, -ENOTSUP);
 
-       if (dev->data->promiscuous == 0) {
-               diag = (*dev->dev_ops->promiscuous_enable)(dev);
-               dev->data->promiscuous = (diag == 0) ? 1 : 0;
-       }
+       diag = (*dev->dev_ops->promiscuous_enable)(dev);
+       dev->data->promiscuous = (diag == 0) ? 1 : 0;
 
        return eth_err(port_id, diag);
 }
@@ -1949,14 +2117,15 @@ rte_eth_promiscuous_disable(uint16_t port_id)
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
+       if (dev->data->promiscuous == 0)
+               return 0;
+
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->promiscuous_disable, -ENOTSUP);
 
-       if (dev->data->promiscuous == 1) {
-               dev->data->promiscuous = 0;
-               diag = (*dev->dev_ops->promiscuous_disable)(dev);
-               if (diag != 0)
-                       dev->data->promiscuous = 1;
-       }
+       dev->data->promiscuous = 0;
+       diag = (*dev->dev_ops->promiscuous_disable)(dev);
+       if (diag != 0)
+               dev->data->promiscuous = 1;
 
        return eth_err(port_id, diag);
 }
@@ -2936,7 +3105,7 @@ rte_eth_dev_get_vlan_offload(uint16_t port_id)
                ret |= ETH_VLAN_EXTEND_OFFLOAD;
 
        if (*dev_offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
-               ret |= DEV_RX_OFFLOAD_QINQ_STRIP;
+               ret |= ETH_QINQ_STRIP_OFFLOAD;
 
        return ret;
 }
@@ -3112,6 +3281,8 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
        if (ret != 0)
                return ret;
 
+       rss_conf->rss_hf = rte_eth_rss_hf_refine(rss_conf->rss_hf);
+
        dev = &rte_eth_devices[port_id];
        if ((dev_info.flow_type_rss_offloads | rss_conf->rss_hf) !=
            dev_info.flow_type_rss_offloads) {
@@ -3981,12 +4152,19 @@ rte_eth_add_rx_callback(uint16_t port_id, uint16_t queue_id,
        rte_errno = ENOTSUP;
        return NULL;
 #endif
+       struct rte_eth_dev *dev;
+
        /* check input parameters */
        if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL ||
                    queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
                rte_errno = EINVAL;
                return NULL;
        }
+       dev = &rte_eth_devices[port_id];
+       if (rte_eth_dev_is_rx_hairpin_queue(dev, queue_id)) {
+               rte_errno = EINVAL;
+               return NULL;
+       }
        struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0);
 
        if (cb == NULL) {
@@ -4058,6 +4236,8 @@ rte_eth_add_tx_callback(uint16_t port_id, uint16_t queue_id,
        rte_errno = ENOTSUP;
        return NULL;
 #endif
+       struct rte_eth_dev *dev;
+
        /* check input parameters */
        if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL ||
                    queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
@@ -4065,6 +4245,12 @@ rte_eth_add_tx_callback(uint16_t port_id, uint16_t queue_id,
                return NULL;
        }
 
+       dev = &rte_eth_devices[port_id];
+       if (rte_eth_dev_is_tx_hairpin_queue(dev, queue_id)) {
+               rte_errno = EINVAL;
+               return NULL;
+       }
+
        struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0);
 
        if (cb == NULL) {
@@ -4178,6 +4364,13 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id,
                return -EINVAL;
        }
 
+       if (rte_eth_dev_is_rx_hairpin_queue(dev, queue_id)) {
+               RTE_ETHDEV_LOG(INFO,
+                       "Can't get hairpin Rx queue %"PRIu16" info of device with port_id=%"PRIu16"\n",
+                       queue_id, port_id);
+               return -EINVAL;
+       }
+
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rxq_info_get, -ENOTSUP);
 
        memset(qinfo, 0, sizeof(*qinfo));
@@ -4202,6 +4395,13 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id,
                return -EINVAL;
        }
 
+       if (rte_eth_dev_is_tx_hairpin_queue(dev, queue_id)) {
+               RTE_ETHDEV_LOG(INFO,
+                       "Can't get hairpin Tx queue %"PRIu16" info of device with port_id=%"PRIu16"\n",
+                       queue_id, port_id);
+               return -EINVAL;
+       }
+
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->txq_info_get, -ENOTSUP);
 
        memset(qinfo, 0, sizeof(*qinfo));
@@ -4210,6 +4410,54 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id,
        return 0;
 }
 
+int
+rte_eth_rx_burst_mode_get(uint16_t port_id, uint16_t queue_id,
+                         struct rte_eth_burst_mode *mode)
+{
+       struct rte_eth_dev *dev;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       if (mode == NULL)
+               return -EINVAL;
+
+       dev = &rte_eth_devices[port_id];
+
+       if (queue_id >= dev->data->nb_rx_queues) {
+               RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%u\n", queue_id);
+               return -EINVAL;
+       }
+
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_burst_mode_get, -ENOTSUP);
+       memset(mode, 0, sizeof(*mode));
+       return eth_err(port_id,
+                      dev->dev_ops->rx_burst_mode_get(dev, queue_id, mode));
+}
+
+int
+rte_eth_tx_burst_mode_get(uint16_t port_id, uint16_t queue_id,
+                         struct rte_eth_burst_mode *mode)
+{
+       struct rte_eth_dev *dev;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       if (mode == NULL)
+               return -EINVAL;
+
+       dev = &rte_eth_devices[port_id];
+
+       if (queue_id >= dev->data->nb_tx_queues) {
+               RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", queue_id);
+               return -EINVAL;
+       }
+
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_burst_mode_get, -ENOTSUP);
+       memset(mode, 0, sizeof(*mode));
+       return eth_err(port_id,
+                      dev->dev_ops->tx_burst_mode_get(dev, queue_id, mode));
+}
+
 int
 rte_eth_dev_set_mc_addr_list(uint16_t port_id,
                             struct rte_ether_addr *mc_addr_set,
@@ -4509,6 +4757,38 @@ rte_eth_dev_adjust_nb_rx_tx_desc(uint16_t port_id,
        return 0;
 }
 
+int
+rte_eth_dev_hairpin_capability_get(uint16_t port_id,
+                                  struct rte_eth_hairpin_cap *cap)
+{
+       struct rte_eth_dev *dev;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
+       dev = &rte_eth_devices[port_id];
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->hairpin_cap_get, -ENOTSUP);
+       memset(cap, 0, sizeof(*cap));
+       return eth_err(port_id, (*dev->dev_ops->hairpin_cap_get)(dev, cap));
+}
+
+int
+rte_eth_dev_is_rx_hairpin_queue(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+       if (dev->data->rx_queue_state[queue_id] ==
+           RTE_ETH_QUEUE_STATE_HAIRPIN)
+               return 1;
+       return 0;
+}
+
+int
+rte_eth_dev_is_tx_hairpin_queue(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+       if (dev->data->tx_queue_state[queue_id] ==
+           RTE_ETH_QUEUE_STATE_HAIRPIN)
+               return 1;
+       return 0;
+}
+
 int
 rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool)
 {