ethdev: add vlan type when setting ether type

[dpdk.git] / lib / librte_ether / rte_ethdev.c

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 6506757..82e06c3 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -671,7 +671,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
        void **rxq;
        unsigned i;
 
-       if (dev->data->rx_queues == NULL) { /* first time configuration */
+       if (dev->data->rx_queues == NULL && nb_queues != 0) { /* first time configuration */
                dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues",
                                sizeof(dev->data->rx_queues[0]) * nb_queues,
                                RTE_CACHE_LINE_SIZE);
@@ -679,7 +679,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                        dev->data->nb_rx_queues = 0;
                        return -(ENOMEM);
                }
-       } else { /* re-configure */
+       } else if (dev->data->rx_queues != NULL && nb_queues != 0) { /* re-configure */
                RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP);
 
                rxq = dev->data->rx_queues;
@@ -699,6 +699,13 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
 
                dev->data->rx_queues = rxq;
 
+       } else if (dev->data->rx_queues != NULL && nb_queues == 0) {
+               RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP);
+
+               rxq = dev->data->rx_queues;
+
+               for (i = nb_queues; i < old_nb_queues; i++)
+                       (*dev->dev_ops->rx_queue_release)(rxq[i]);
        }
        dev->data->nb_rx_queues = nb_queues;
        return 0;
@@ -815,7 +822,7 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
        void **txq;
        unsigned i;
 
-       if (dev->data->tx_queues == NULL) { /* first time configuration */
+       if (dev->data->tx_queues == NULL && nb_queues != 0) { /* first time configuration */
                dev->data->tx_queues = rte_zmalloc("ethdev->tx_queues",
                                                   sizeof(dev->data->tx_queues[0]) * nb_queues,
                                                   RTE_CACHE_LINE_SIZE);
@@ -823,7 +830,7 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                        dev->data->nb_tx_queues = 0;
                        return -(ENOMEM);
                }
-       } else { /* re-configure */
+       } else if (dev->data->tx_queues != NULL && nb_queues != 0) { /* re-configure */
                RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP);
 
                txq = dev->data->tx_queues;
@@ -843,6 +850,13 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
 
                dev->data->tx_queues = txq;
 
+       } else if (dev->data->tx_queues != NULL && nb_queues == 0) {
+               RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP);
+
+               txq = dev->data->tx_queues;
+
+               for (i = nb_queues; i < old_nb_queues; i++)
+                       (*dev->dev_ops->tx_queue_release)(txq[i]);
        }
        dev->data->nb_tx_queues = nb_queues;
        return 0;
@@ -889,25 +903,23 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
         * configured device.
         */
        (*dev->dev_ops->dev_infos_get)(dev, &dev_info);
+
+       if (nb_rx_q == 0 && nb_tx_q == 0) {
+               RTE_PMD_DEBUG_TRACE("ethdev port_id=%d both rx and tx queue cannot be 0\n", port_id);
+               return -EINVAL;
+       }
+
        if (nb_rx_q > dev_info.max_rx_queues) {
                RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n",
                                port_id, nb_rx_q, dev_info.max_rx_queues);
                return -EINVAL;
        }
-       if (nb_rx_q == 0) {
-               RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_q == 0\n", port_id);
-               return -EINVAL;
-       }
 
        if (nb_tx_q > dev_info.max_tx_queues) {
                RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n",
                                port_id, nb_tx_q, dev_info.max_tx_queues);
                return -EINVAL;
        }
-       if (nb_tx_q == 0) {
-               RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_q == 0\n", port_id);
-               return -EINVAL;
-       }
 
        /* Copy the dev_conf parameter into the dev structure */
        memcpy(&dev->data->dev_conf, dev_conf, sizeof(dev->data->dev_conf));
@@ -1258,6 +1270,52 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
                                               socket_id, tx_conf);
 }
 
+void
+rte_eth_tx_buffer_drop_callback(struct rte_mbuf **pkts, uint16_t unsent,
+               void *userdata __rte_unused)
+{
+       unsigned i;
+
+       for (i = 0; i < unsent; i++)
+               rte_pktmbuf_free(pkts[i]);
+}
+
+void
+rte_eth_tx_buffer_count_callback(struct rte_mbuf **pkts, uint16_t unsent,
+               void *userdata)
+{
+       uint64_t *count = userdata;
+       unsigned i;
+
+       for (i = 0; i < unsent; i++)
+               rte_pktmbuf_free(pkts[i]);
+
+       *count += unsent;
+}
+
+int
+rte_eth_tx_buffer_set_err_callback(struct rte_eth_dev_tx_buffer *buffer,
+               buffer_tx_error_fn cbfn, void *userdata)
+{
+       buffer->error_callback = cbfn;
+       buffer->error_userdata = userdata;
+       return 0;
+}
+
+int
+rte_eth_tx_buffer_init(struct rte_eth_dev_tx_buffer *buffer, uint16_t size)
+{
+       if (buffer == NULL)
+               return -EINVAL;
+
+       buffer->size = size;
+       if (buffer->error_callback == NULL)
+               rte_eth_tx_buffer_set_err_callback(buffer,
+                               rte_eth_tx_buffer_drop_callback, NULL);
+
+       return 0;
+}
+
 void
 rte_eth_promiscuous_enable(uint8_t port_id)
 {
@@ -1645,16 +1703,17 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o
 }
 
 int
-rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid)
+rte_eth_dev_set_vlan_ether_type(uint8_t port_id,
+                               enum rte_vlan_type vlan_type,
+                               uint16_t tpid)
 {
        struct rte_eth_dev *dev;
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP);
-       (*dev->dev_ops->vlan_tpid_set)(dev, tpid);
 
-       return 0;
+       return (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, tpid);
 }
 
 int
@@ -1807,7 +1866,7 @@ rte_eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf,
 static int
 rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf,
                         uint16_t reta_size,
-                        uint8_t max_rxq)
+                        uint16_t max_rxq)
 {
        uint16_t i, idx, shift;