ethdev: remove assumption that port will not be detached

[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 077d430..b702039 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -175,6 +175,11 @@ enum {
        STAT_QMAP_RX
 };
 
+enum {
+       DEV_DETACHED = 0,
+       DEV_ATTACHED
+};
+
 static inline void
 rte_eth_dev_data_alloc(void)
 {
@@ -201,19 +206,34 @@ rte_eth_dev_allocated(const char *name)
 {
        unsigned i;
 
-       for (i = 0; i < nb_ports; i++) {
-               if (strcmp(rte_eth_devices[i].data->name, name) == 0)
+       for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+               if ((rte_eth_devices[i].attached == DEV_ATTACHED) &&
+                   strcmp(rte_eth_devices[i].data->name, name) == 0)
                        return &rte_eth_devices[i];
        }
        return NULL;
 }
 
+static uint8_t
+rte_eth_dev_find_free_port(void)
+{
+       unsigned i;
+
+       for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+               if (rte_eth_devices[i].attached == DEV_DETACHED)
+                       return i;
+       }
+       return RTE_MAX_ETHPORTS;
+}
+
 struct rte_eth_dev *
 rte_eth_dev_allocate(const char *name)
 {
+       uint8_t port_id;
        struct rte_eth_dev *eth_dev;
 
-       if (nb_ports == RTE_MAX_ETHPORTS) {
+       port_id = rte_eth_dev_find_free_port();
+       if (port_id == RTE_MAX_ETHPORTS) {
                PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n");
                return NULL;
        }
@@ -226,10 +246,12 @@ rte_eth_dev_allocate(const char *name)
                return NULL;
        }
 
-       eth_dev = &rte_eth_devices[nb_ports];
-       eth_dev->data = &rte_eth_dev_data[nb_ports];
+       eth_dev = &rte_eth_devices[port_id];
+       eth_dev->data = &rte_eth_dev_data[port_id];
        snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name);
-       eth_dev->data->port_id = nb_ports++;
+       eth_dev->data->port_id = port_id;
+       eth_dev->attached = DEV_ATTACHED;
+       nb_ports++;
        return eth_dev;
 }
 
@@ -265,7 +287,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_dev->data->rx_mbuf_alloc_failed = 0;
 
        /* init user callbacks */
-       TAILQ_INIT(&(eth_dev->callbacks));
+       TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
        /*
         * Set the default MTU.
@@ -283,6 +305,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
                        (unsigned) pci_dev->id.device_id);
        if (rte_eal_process_type() == RTE_PROC_PRIMARY)
                rte_free(eth_dev->data->dev_private);
+       eth_dev->attached = DEV_DETACHED;
        nb_ports--;
        return diag;
 }
@@ -308,10 +331,20 @@ rte_eth_driver_register(struct eth_driver *eth_drv)
        rte_eal_pci_register(&eth_drv->pci_drv);
 }
 
+static int
+rte_eth_dev_is_valid_port(uint8_t port_id)
+{
+       if (port_id >= RTE_MAX_ETHPORTS ||
+           rte_eth_devices[port_id].attached != DEV_ATTACHED)
+               return 0;
+       else
+               return 1;
+}
+
 int
 rte_eth_dev_socket_id(uint8_t port_id)
 {
-       if (port_id >= nb_ports)
+       if (!rte_eth_dev_is_valid_port(port_id))
                return -1;
        return rte_eth_devices[port_id].pci_dev->numa_node;
 }
@@ -337,6 +370,19 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                        dev->data->nb_rx_queues = 0;
                        return -(ENOMEM);
                }
+#ifdef RTE_ETHDEV_RXTX_CALLBACKS
+               dev->post_rx_burst_cbs = rte_zmalloc(
+                       "ethdev->post_rx_burst_cbs",
+                       sizeof(*dev->post_rx_burst_cbs) * nb_queues,
+                       RTE_CACHE_LINE_SIZE);
+               if (dev->post_rx_burst_cbs == NULL) {
+                       rte_free(dev->data->rx_queues);
+                       dev->data->rx_queues = NULL;
+                       dev->data->nb_rx_queues = 0;
+                       return -ENOMEM;
+               }
+#endif
+
        } else { /* re-configure */
                FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP);
 
@@ -348,10 +394,23 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                                RTE_CACHE_LINE_SIZE);
                if (rxq == NULL)
                        return -(ENOMEM);
-
-               if (nb_queues > old_nb_queues)
+#ifdef RTE_ETHDEV_RXTX_CALLBACKS
+               dev->post_rx_burst_cbs = rte_realloc(
+                       dev->post_rx_burst_cbs,
+                       sizeof(*dev->post_rx_burst_cbs) *
+                               nb_queues, RTE_CACHE_LINE_SIZE);
+               if (dev->post_rx_burst_cbs == NULL)
+                       return -ENOMEM;
+#endif
+               if (nb_queues > old_nb_queues) {
+                       uint16_t new_qs = nb_queues - old_nb_queues;
                        memset(rxq + old_nb_queues, 0,
-                               sizeof(rxq[0]) * (nb_queues - old_nb_queues));
+                               sizeof(rxq[0]) * new_qs);
+#ifdef RTE_ETHDEV_RXTX_CALLBACKS
+                       memset(dev->post_rx_burst_cbs + old_nb_queues, 0,
+                               sizeof(dev->post_rx_burst_cbs[0]) * new_qs);
+#endif
+               }
 
                dev->data->rx_queues = rxq;
 
@@ -369,7 +428,7 @@ rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -EINVAL;
        }
@@ -395,7 +454,7 @@ rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -EINVAL;
        }
@@ -421,7 +480,7 @@ rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -EINVAL;
        }
@@ -447,7 +506,7 @@ rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -EINVAL;
        }
@@ -479,6 +538,19 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                        dev->data->nb_tx_queues = 0;
                        return -(ENOMEM);
                }
+#ifdef RTE_ETHDEV_RXTX_CALLBACKS
+               dev->pre_tx_burst_cbs = rte_zmalloc(
+                       "ethdev->pre_tx_burst_cbs",
+                       sizeof(*dev->pre_tx_burst_cbs) * nb_queues,
+                       RTE_CACHE_LINE_SIZE);
+               if (dev->pre_tx_burst_cbs == NULL) {
+                       rte_free(dev->data->tx_queues);
+                       dev->data->tx_queues = NULL;
+                       dev->data->nb_tx_queues = 0;
+                       return -ENOMEM;
+               }
+#endif
+
        } else { /* re-configure */
                FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP);
 
@@ -489,11 +561,24 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                txq = rte_realloc(txq, sizeof(txq[0]) * nb_queues,
                                RTE_CACHE_LINE_SIZE);
                if (txq == NULL)
-                       return -(ENOMEM);
-
-               if (nb_queues > old_nb_queues)
+                       return -ENOMEM;
+#ifdef RTE_ETHDEV_RXTX_CALLBACKS
+               dev->pre_tx_burst_cbs = rte_realloc(
+                       dev->pre_tx_burst_cbs,
+                       sizeof(*dev->pre_tx_burst_cbs) *
+                               nb_queues, RTE_CACHE_LINE_SIZE);
+               if (dev->pre_tx_burst_cbs == NULL)
+                       return -ENOMEM;
+#endif
+               if (nb_queues > old_nb_queues) {
+                       uint16_t new_qs = nb_queues - old_nb_queues;
                        memset(txq + old_nb_queues, 0,
-                               sizeof(txq[0]) * (nb_queues - old_nb_queues));
+                               sizeof(txq[0]) * new_qs);
+#ifdef RTE_ETHDEV_RXTX_CALLBACKS
+                       memset(dev->pre_tx_burst_cbs + old_nb_queues, 0,
+                               sizeof(dev->pre_tx_burst_cbs[0]) * new_qs);
+#endif
+               }
 
                dev->data->tx_queues = txq;
 
@@ -703,10 +788,11 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports || port_id >= RTE_MAX_ETHPORTS) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-EINVAL);
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
@@ -888,10 +974,11 @@ rte_eth_dev_start(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%" PRIu8 "\n", port_id);
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-EINVAL);
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP);
@@ -911,6 +998,10 @@ rte_eth_dev_start(uint8_t port_id)
 
        rte_eth_dev_config_restore(port_id);
 
+       if (dev->data->dev_conf.intr_conf.lsc != 0) {
+               FUNC_PTR_OR_ERR_RET(*dev->dev_ops->link_update, -ENOTSUP);
+               (*dev->dev_ops->link_update)(dev, 0);
+       }
        return 0;
 }
 
@@ -923,10 +1014,11 @@ rte_eth_dev_stop(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_RET();
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%" PRIu8 "\n", port_id);
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
@@ -951,10 +1043,11 @@ rte_eth_dev_set_link_up(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -EINVAL;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_up, -ENOTSUP);
@@ -970,10 +1063,11 @@ rte_eth_dev_set_link_down(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -EINVAL;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_down, -ENOTSUP);
@@ -989,7 +1083,7 @@ rte_eth_dev_close(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_RET();
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
@@ -1017,10 +1111,11 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-EINVAL);
        }
+
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
                PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id);
@@ -1090,10 +1185,11 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (port_id >= RTE_MAX_ETHPORTS || port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-EINVAL);
        }
+
        dev = &rte_eth_devices[port_id];
        if (tx_queue_id >= dev->data->nb_tx_queues) {
                PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id);
@@ -1123,10 +1219,11 @@ rte_eth_promiscuous_enable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_enable);
@@ -1139,10 +1236,11 @@ rte_eth_promiscuous_disable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_disable);
@@ -1155,7 +1253,7 @@ rte_eth_promiscuous_get(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -1;
        }
@@ -1169,10 +1267,11 @@ rte_eth_allmulticast_enable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_enable);
@@ -1185,10 +1284,11 @@ rte_eth_allmulticast_disable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_disable);
@@ -1201,7 +1301,7 @@ rte_eth_allmulticast_get(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -1;
        }
@@ -1229,10 +1329,11 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.intr_conf.lsc != 0)
@@ -1249,10 +1350,11 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.intr_conf.lsc != 0)
@@ -1264,21 +1366,23 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)
        }
 }
 
-void
+int
 rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
+               return (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        memset(stats, 0, sizeof(*stats));
 
-       FUNC_PTR_OR_RET(*dev->dev_ops->stats_get);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP);
        (*dev->dev_ops->stats_get)(dev, stats);
        stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed;
+       return 0;
 }
 
 void
@@ -1286,10 +1390,11 @@ rte_eth_stats_reset(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset);
@@ -1307,10 +1412,11 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
        uint64_t val;
        char *stats_ptr;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -1;
        }
+
        dev = &rte_eth_devices[port_id];
 
        /* implemented by the driver */
@@ -1376,10 +1482,11 @@ rte_eth_xstats_reset(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        /* implemented by the driver */
@@ -1398,10 +1505,11 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -ENODEV;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_stats_mapping_set, -ENOTSUP);
@@ -1433,10 +1541,11 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
 
        memset(dev_info, 0, sizeof(struct rte_eth_dev_info));
@@ -1453,10 +1562,11 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return;
        }
+
        dev = &rte_eth_devices[port_id];
        ether_addr_copy(&dev->data->mac_addrs[0], mac_addr);
 }
@@ -1467,7 +1577,7 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1483,7 +1593,7 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)
        int ret;
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1503,10 +1613,11 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        if (! (dev->data->dev_conf.rxmode.hw_vlan_filter)) {
                PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id);
@@ -1528,7 +1639,7 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1550,7 +1661,7 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1570,7 +1681,7 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
        int mask = 0;
        int cur, org = 0;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1615,7 +1726,7 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id)
        struct rte_eth_dev *dev;
        int ret = 0;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1639,10 +1750,11 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_pvid_set, -ENOTSUP);
        (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on);
@@ -1657,7 +1769,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1691,7 +1803,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1725,7 +1837,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1756,7 +1868,7 @@ rte_eth_dev_fdir_get_infos(uint8_t port_id, struct rte_eth_fdir *fdir)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1781,7 +1893,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1821,7 +1933,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1859,7 +1971,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1895,7 +2007,7 @@ rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1915,7 +2027,7 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1931,7 +2043,7 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -1951,7 +2063,7 @@ rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2030,7 +2142,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id,
        struct rte_eth_dev *dev;
        int ret;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -ENODEV;
        }
@@ -2081,10 +2193,11 @@ rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)
        struct rte_eth_dev *dev;
        uint16_t rss_hash_protos;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
+
        rss_hash_protos = rss_conf->rss_hf;
        if ((rss_hash_protos != 0) &&
            ((rss_hash_protos & ETH_RSS_PROTO_MASK) == 0)) {
@@ -2103,10 +2216,11 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_conf_get, -ENOTSUP);
        return (*dev->dev_ops->rss_hash_conf_get)(dev, rss_conf);
@@ -2118,7 +2232,7 @@ rte_eth_dev_udp_tunnel_add(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -ENODEV;
        }
@@ -2144,10 +2258,11 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -ENODEV;
        }
+
        dev = &rte_eth_devices[port_id];
 
        if (udp_tunnel == NULL) {
@@ -2169,7 +2284,7 @@ rte_eth_led_on(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2184,7 +2299,7 @@ rte_eth_led_off(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2224,10 +2339,11 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
        int index;
        uint64_t pool_mask;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
 
@@ -2275,10 +2391,11 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
        struct rte_eth_dev *dev;
        int index;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_remove, -ENOTSUP);
 
@@ -2309,7 +2426,7 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id,  uint16_t vf,
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n",
                                port_id);
                return (-ENODEV);
@@ -2364,7 +2481,7 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
        int ret;
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
                return (-ENODEV);
@@ -2417,7 +2534,7 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
                        port_id);
                return (-ENODEV);
@@ -2436,7 +2553,7 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on)
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2462,7 +2579,7 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2487,7 +2604,7 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n",
                                port_id);
                return (-ENODEV);
@@ -2518,7 +2635,7 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,
        struct rte_eth_dev_info dev_info;
        struct rte_eth_link link;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("set queue rate limit:invalid port id=%d\n",
                                port_id);
                return -ENODEV;
@@ -2555,7 +2672,7 @@ int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate,
        if (q_msk == 0)
                return 0;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("set VF rate limit:invalid port id=%d\n",
                                port_id);
                return -ENODEV;
@@ -2589,7 +2706,7 @@ rte_eth_mirror_rule_set(uint8_t port_id,
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2630,7 +2747,7 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2655,10 +2772,11 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return 0;
        }
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0);
        if (queue_id >= dev->data->nb_rx_queues) {
@@ -2675,10 +2793,11 @@ rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id,
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return 0;
        }
+
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0);
@@ -2695,10 +2814,11 @@ rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return 0;
        }
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, 0);
        return (*dev->dev_ops->rx_queue_count)(dev, queue_id);
@@ -2709,10 +2829,11 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_descriptor_done, -ENOTSUP);
        return (*dev->dev_ops->rx_descriptor_done)( \
@@ -2730,7 +2851,8 @@ rte_eth_dev_callback_register(uint8_t port_id,
 
        if (!cb_fn)
                return (-EINVAL);
-       if (port_id >= nb_ports) {
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-EINVAL);
        }
@@ -2738,7 +2860,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
        dev = &rte_eth_devices[port_id];
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
-       TAILQ_FOREACH(user_cb, &(dev->callbacks), next) {
+       TAILQ_FOREACH(user_cb, &(dev->link_intr_cbs), next) {
                if (user_cb->cb_fn == cb_fn &&
                        user_cb->cb_arg == cb_arg &&
                        user_cb->event == event) {
@@ -2752,7 +2874,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
                user_cb->cb_fn = cb_fn;
                user_cb->cb_arg = cb_arg;
                user_cb->event = event;
-               TAILQ_INSERT_TAIL(&(dev->callbacks), user_cb, next);
+               TAILQ_INSERT_TAIL(&(dev->link_intr_cbs), user_cb, next);
        }
 
        rte_spinlock_unlock(&rte_eth_dev_cb_lock);
@@ -2770,7 +2892,8 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
 
        if (!cb_fn)
                return (-EINVAL);
-       if (port_id >= nb_ports) {
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-EINVAL);
        }
@@ -2779,7 +2902,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
        ret = 0;
-       for (cb = TAILQ_FIRST(&dev->callbacks); cb != NULL; cb = next) {
+       for (cb = TAILQ_FIRST(&dev->link_intr_cbs); cb != NULL; cb = next) {
 
                next = TAILQ_NEXT(cb, next);
 
@@ -2793,7 +2916,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
                 * then remove it.
                 */
                if (cb->active == 0) {
-                       TAILQ_REMOVE(&(dev->callbacks), cb, next);
+                       TAILQ_REMOVE(&(dev->link_intr_cbs), cb, next);
                        rte_free(cb);
                } else {
                        ret = -EAGAIN;
@@ -2812,7 +2935,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
        struct rte_eth_dev_callback dev_cb;
 
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
-       TAILQ_FOREACH(cb_lst, &(dev->callbacks), next) {
+       TAILQ_FOREACH(cb_lst, &(dev->link_intr_cbs), next) {
                if (cb_lst->cb_fn == NULL || cb_lst->event != event)
                        continue;
                dev_cb = *cb_lst;
@@ -2830,7 +2953,7 @@ int rte_eth_dev_bypass_init(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2850,7 +2973,7 @@ rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2869,7 +2992,7 @@ rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2889,7 +3012,7 @@ rte_eth_dev_bypass_event_show(uint8_t port_id, uint32_t event, uint32_t *state)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2909,7 +3032,7 @@ rte_eth_dev_bypass_event_store(uint8_t port_id, uint32_t event, uint32_t state)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2929,7 +3052,7 @@ rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2949,7 +3072,7 @@ rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2969,7 +3092,7 @@ rte_eth_dev_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -2989,7 +3112,7 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return (-ENODEV);
        }
@@ -3006,307 +3129,169 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id)
 #endif
 
 int
-rte_eth_dev_add_syn_filter(uint8_t port_id,
-                       struct rte_syn_filter *filter, uint16_t rx_queue)
-{
-       struct rte_eth_dev *dev;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_syn_filter, -ENOTSUP);
-       return (*dev->dev_ops->add_syn_filter)(dev, filter, rx_queue);
-}
-
-int
-rte_eth_dev_remove_syn_filter(uint8_t port_id)
-{
-       struct rte_eth_dev *dev;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_syn_filter, -ENOTSUP);
-       return (*dev->dev_ops->remove_syn_filter)(dev);
-}
-
-int
-rte_eth_dev_get_syn_filter(uint8_t port_id,
-                       struct rte_syn_filter *filter, uint16_t *rx_queue)
-{
-       struct rte_eth_dev *dev;
-
-       if (filter == NULL || rx_queue == NULL)
-               return -EINVAL;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_syn_filter, -ENOTSUP);
-       return (*dev->dev_ops->get_syn_filter)(dev, filter, rx_queue);
-}
-
-int
-rte_eth_dev_add_ethertype_filter(uint8_t port_id, uint16_t index,
-                       struct rte_ethertype_filter *filter, uint16_t rx_queue)
-{
-       struct rte_eth_dev *dev;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-       if (filter->ethertype == ETHER_TYPE_IPv4 ||
-               filter->ethertype == ETHER_TYPE_IPv6){
-               PMD_DEBUG_TRACE("IP and IPv6 are not supported"
-                       " in ethertype filter\n");
-               return -EINVAL;
-       }
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_ethertype_filter, -ENOTSUP);
-       return (*dev->dev_ops->add_ethertype_filter)(dev, index,
-                                       filter, rx_queue);
-}
-
-int
-rte_eth_dev_remove_ethertype_filter(uint8_t port_id,  uint16_t index)
+rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -ENODEV;
        }
 
        dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_ethertype_filter, -ENOTSUP);
-       return (*dev->dev_ops->remove_ethertype_filter)(dev, index);
-}
-
-int
-rte_eth_dev_get_ethertype_filter(uint8_t port_id, uint16_t index,
-                       struct rte_ethertype_filter *filter, uint16_t *rx_queue)
-{
-       struct rte_eth_dev *dev;
-
-       if (filter == NULL || rx_queue == NULL)
-               return -EINVAL;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_ethertype_filter, -ENOTSUP);
-       return (*dev->dev_ops->get_ethertype_filter)(dev, index,
-                                               filter, rx_queue);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
+       return (*dev->dev_ops->filter_ctrl)(dev, filter_type,
+                               RTE_ETH_FILTER_NOP, NULL);
 }
 
 int
-rte_eth_dev_add_2tuple_filter(uint8_t port_id, uint16_t index,
-                       struct rte_2tuple_filter *filter, uint16_t rx_queue)
+rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,
+                      enum rte_filter_op filter_op, void *arg)
 {
        struct rte_eth_dev *dev;
 
-       if (port_id >= nb_ports) {
+       if (!rte_eth_dev_is_valid_port(port_id)) {
                PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
                return -ENODEV;
        }
-       if (filter->protocol != IPPROTO_TCP &&
-               filter->tcp_flags != 0){
-               PMD_DEBUG_TRACE("tcp flags is 0x%x, but the protocol value"
-                       " is not TCP\n",
-                       filter->tcp_flags);
-               return -EINVAL;
-       }
 
        dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_2tuple_filter, -ENOTSUP);
-       return (*dev->dev_ops->add_2tuple_filter)(dev, index, filter, rx_queue);
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
+       return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op, arg);
 }
 
-int
-rte_eth_dev_remove_2tuple_filter(uint8_t port_id, uint16_t index)
+void *
+rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
+               rte_rxtx_callback_fn fn, void *user_param)
 {
-       struct rte_eth_dev *dev;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       rte_errno = ENOTSUP;
+       return NULL;
+#endif
+       /* check input parameters */
+       if (port_id >= nb_ports || fn == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
+               rte_errno = EINVAL;
+               return NULL;
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_2tuple_filter, -ENOTSUP);
-       return (*dev->dev_ops->remove_2tuple_filter)(dev, index);
-}
+       struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0);
 
-int
-rte_eth_dev_get_2tuple_filter(uint8_t port_id, uint16_t index,
-                       struct rte_2tuple_filter *filter, uint16_t *rx_queue)
-{
-       struct rte_eth_dev *dev;
-
-       if (filter == NULL || rx_queue == NULL)
-               return -EINVAL;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
+       if (cb == NULL) {
+               rte_errno = ENOMEM;
+               return NULL;
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_2tuple_filter, -ENOTSUP);
-       return (*dev->dev_ops->get_2tuple_filter)(dev, index, filter, rx_queue);
+       cb->fn = fn;
+       cb->param = user_param;
+       cb->next = rte_eth_devices[port_id].post_rx_burst_cbs[queue_id];
+       rte_eth_devices[port_id].post_rx_burst_cbs[queue_id] = cb;
+       return cb;
 }
 
-int
-rte_eth_dev_add_5tuple_filter(uint8_t port_id, uint16_t index,
-                       struct rte_5tuple_filter *filter, uint16_t rx_queue)
+void *
+rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
+               rte_rxtx_callback_fn fn, void *user_param)
 {
-       struct rte_eth_dev *dev;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       if (filter->protocol != IPPROTO_TCP &&
-               filter->tcp_flags != 0){
-               PMD_DEBUG_TRACE("tcp flags is 0x%x, but the protocol value"
-                       " is not TCP\n",
-                       filter->tcp_flags);
-               return -EINVAL;
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       rte_errno = ENOTSUP;
+       return NULL;
+#endif
+       /* check input parameters */
+       if (port_id >= nb_ports || fn == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
+               rte_errno = EINVAL;
+               return NULL;
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_5tuple_filter, -ENOTSUP);
-       return (*dev->dev_ops->add_5tuple_filter)(dev, index, filter, rx_queue);
-}
+       struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0);
 
-int
-rte_eth_dev_remove_5tuple_filter(uint8_t port_id, uint16_t index)
-{
-       struct rte_eth_dev *dev;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
+       if (cb == NULL) {
+               rte_errno = ENOMEM;
+               return NULL;
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_5tuple_filter, -ENOTSUP);
-       return (*dev->dev_ops->remove_5tuple_filter)(dev, index);
+       cb->fn = fn;
+       cb->param = user_param;
+       cb->next = rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id];
+       rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id] = cb;
+       return cb;
 }
 
 int
-rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index,
-                       struct rte_5tuple_filter *filter, uint16_t *rx_queue)
+rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
+               struct rte_eth_rxtx_callback *user_cb)
 {
-       struct rte_eth_dev *dev;
-
-       if (filter == NULL || rx_queue == NULL)
-               return -EINVAL;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       return (-ENOTSUP);
+#endif
+       /* Check input parameters. */
+       if (port_id >= nb_ports || user_cb == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
+               return (-EINVAL);
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_5tuple_filter, -ENOTSUP);
-       return (*dev->dev_ops->get_5tuple_filter)(dev, index, filter,
-                                               rx_queue);
-}
-
-int
-rte_eth_dev_add_flex_filter(uint8_t port_id, uint16_t index,
-                       struct rte_flex_filter *filter, uint16_t rx_queue)
-{
-       struct rte_eth_dev *dev;
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct rte_eth_rxtx_callback *cb = dev->post_rx_burst_cbs[queue_id];
+       struct rte_eth_rxtx_callback *prev_cb;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
+       /* Reset head pointer and remove user cb if first in the list. */
+       if (cb == user_cb) {
+               dev->post_rx_burst_cbs[queue_id] = user_cb->next;
+               return 0;
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_flex_filter, -ENOTSUP);
-       return (*dev->dev_ops->add_flex_filter)(dev, index, filter, rx_queue);
-}
+       /* Remove the user cb from the callback list. */
+       do {
+               prev_cb = cb;
+               cb = cb->next;
 
-int
-rte_eth_dev_remove_flex_filter(uint8_t port_id, uint16_t index)
-{
-       struct rte_eth_dev *dev;
+               if (cb == user_cb) {
+                       prev_cb->next = user_cb->next;
+                       return 0;
+               }
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       } while (cb != NULL);
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_flex_filter, -ENOTSUP);
-       return (*dev->dev_ops->remove_flex_filter)(dev, index);
+       /* Callback wasn't found. */
+       return (-EINVAL);
 }
 
 int
-rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index,
-                       struct rte_flex_filter *filter, uint16_t *rx_queue)
+rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
+               struct rte_eth_rxtx_callback *user_cb)
 {
-       struct rte_eth_dev *dev;
-
-       if (filter == NULL || rx_queue == NULL)
-               return -EINVAL;
-
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
+#ifndef RTE_ETHDEV_RXTX_CALLBACKS
+       return (-ENOTSUP);
+#endif
+       /* Check input parameters. */
+       if (port_id >= nb_ports || user_cb == NULL ||
+                   queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
+               return (-EINVAL);
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_flex_filter, -ENOTSUP);
-       return (*dev->dev_ops->get_flex_filter)(dev, index, filter,
-                                               rx_queue);
-}
-
-int
-rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)
-{
-       struct rte_eth_dev *dev;
+       struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+       struct rte_eth_rxtx_callback *cb = dev->pre_tx_burst_cbs[queue_id];
+       struct rte_eth_rxtx_callback *prev_cb;
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
+       /* Reset head pointer and remove user cb if first in the list. */
+       if (cb == user_cb) {
+               dev->pre_tx_burst_cbs[queue_id] = user_cb->next;
+               return 0;
        }
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
-       return (*dev->dev_ops->filter_ctrl)(dev, filter_type,
-                               RTE_ETH_FILTER_NOP, NULL);
-}
+       /* Remove the user cb from the callback list. */
+       do {
+               prev_cb = cb;
+               cb = cb->next;
 
-int
-rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,
-                      enum rte_filter_op filter_op, void *arg)
-{
-       struct rte_eth_dev *dev;
+               if (cb == user_cb) {
+                       prev_cb->next = user_cb->next;
+                       return 0;
+               }
 
-       if (port_id >= nb_ports) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       } while (cb != NULL);
 
-       dev = &rte_eth_devices[port_id];
-       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
-       return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op, arg);
+       /* Callback wasn't found. */
+       return (-EINVAL);
 }