tailq: remove unneeded inclusions

[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 ecbe93c..03fce08 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -52,7 +52,6 @@
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -175,6 +174,11 @@ enum {
        STAT_QMAP_RX
 };
 
+enum {
+       DEV_DETACHED = 0,
+       DEV_ATTACHED
+};
+
 static inline void
 rte_eth_dev_data_alloc(void)
 {
@@ -196,24 +200,39 @@ rte_eth_dev_data_alloc(void)
                                RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data));
 }
 
-static struct rte_eth_dev *
+struct rte_eth_dev *
 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)
+rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type)
 {
+       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,13 +245,44 @@ 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;
+       eth_dev->dev_type = type;
+       nb_ports++;
        return eth_dev;
 }
 
+static inline int
+rte_eth_dev_create_unique_device_name(char *name, size_t size,
+               struct rte_pci_device *pci_dev)
+{
+       int ret;
+
+       if ((name == NULL) || (pci_dev == NULL))
+               return -EINVAL;
+
+       ret = snprintf(name, size, "%d:%d.%d",
+                       pci_dev->addr.bus, pci_dev->addr.devid,
+                       pci_dev->addr.function);
+       if (ret < 0)
+               return ret;
+       return 0;
+}
+
+int
+rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
+{
+       if (eth_dev == NULL)
+               return -EINVAL;
+
+       eth_dev->attached = 0;
+       nb_ports--;
+       return 0;
+}
+
 static int
 rte_eth_dev_init(struct rte_pci_driver *pci_drv,
                 struct rte_pci_device *pci_dev)
@@ -246,10 +296,10 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_drv = (struct eth_driver *)pci_drv;
 
        /* Create unique Ethernet device name using PCI address */
-       snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "%d:%d.%d",
-                       pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
 
-       eth_dev = rte_eth_dev_allocate(ethdev_name);
+       eth_dev = rte_eth_dev_allocate(ethdev_name, RTE_ETH_DEV_PCI);
        if (eth_dev == NULL)
                return -ENOMEM;
 
@@ -273,7 +323,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_dev->data->mtu = ETHER_MTU;
 
        /* Invoke PMD device initialization function */
-       diag = (*eth_drv->eth_dev_init)(eth_drv, eth_dev);
+       diag = (*eth_drv->eth_dev_init)(eth_dev);
        if (diag == 0)
                return (0);
 
@@ -283,10 +333,52 @@ 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;
 }
 
+static int
+rte_eth_dev_uninit(struct rte_pci_device *pci_dev)
+{
+       const struct eth_driver *eth_drv;
+       struct rte_eth_dev *eth_dev;
+       char ethdev_name[RTE_ETH_NAME_MAX_LEN];
+       int ret;
+
+       if (pci_dev == NULL)
+               return -EINVAL;
+
+       /* Create unique Ethernet device name using PCI address */
+       rte_eth_dev_create_unique_device_name(ethdev_name,
+                       sizeof(ethdev_name), pci_dev);
+
+       eth_dev = rte_eth_dev_allocated(ethdev_name);
+       if (eth_dev == NULL)
+               return -ENODEV;
+
+       eth_drv = (const struct eth_driver *)pci_dev->driver;
+
+       /* Invoke PMD device uninit function */
+       if (*eth_drv->eth_dev_uninit) {
+               ret = (*eth_drv->eth_dev_uninit)(eth_dev);
+               if (ret)
+                       return ret;
+       }
+
+       /* free ether device */
+       rte_eth_dev_release_port(eth_dev);
+
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               rte_free(eth_dev->data->dev_private);
+
+       eth_dev->pci_dev = NULL;
+       eth_dev->driver = NULL;
+       eth_dev->data = NULL;
+
+       return 0;
+}
+
 /**
  * Register an Ethernet [Poll Mode] driver.
  *
@@ -305,13 +397,24 @@ void
 rte_eth_driver_register(struct eth_driver *eth_drv)
 {
        eth_drv->pci_drv.devinit = rte_eth_dev_init;
+       eth_drv->pci_drv.devuninit = rte_eth_dev_uninit;
        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;
 }
@@ -322,6 +425,307 @@ rte_eth_dev_count(void)
        return (nb_ports);
 }
 
+/* So far, DPDK hotplug function only supports linux */
+#ifdef RTE_LIBRTE_EAL_HOTPLUG
+
+static enum rte_eth_dev_type
+rte_eth_dev_get_device_type(uint8_t port_id)
+{
+       if (!rte_eth_dev_is_valid_port(port_id))
+               return RTE_ETH_DEV_UNKNOWN;
+       return rte_eth_devices[port_id].dev_type;
+}
+
+static int
+rte_eth_dev_save(struct rte_eth_dev *devs, size_t size)
+{
+       if ((devs == NULL) ||
+           (size != sizeof(struct rte_eth_dev) * RTE_MAX_ETHPORTS))
+               return -EINVAL;
+
+       /* save current rte_eth_devices */
+       memcpy(devs, rte_eth_devices, size);
+       return 0;
+}
+
+static int
+rte_eth_dev_get_changed_port(struct rte_eth_dev *devs, uint8_t *port_id)
+{
+       if ((devs == NULL) || (port_id == NULL))
+               return -EINVAL;
+
+       /* check which port was attached or detached */
+       for (*port_id = 0; *port_id < RTE_MAX_ETHPORTS; (*port_id)++, devs++) {
+               if (rte_eth_devices[*port_id].attached ^ devs->attached)
+                       return 0;
+       }
+       return -ENODEV;
+}
+
+static int
+rte_eth_dev_get_addr_by_port(uint8_t port_id, struct rte_pci_addr *addr)
+{
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return -EINVAL;
+       }
+
+       if (addr == NULL) {
+               PMD_DEBUG_TRACE("Null pointer is specified\n");
+               return -EINVAL;
+       }
+
+       *addr = rte_eth_devices[port_id].pci_dev->addr;
+       return 0;
+}
+
+static int
+rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)
+{
+       char *tmp;
+
+       if (!rte_eth_dev_is_valid_port(port_id)) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return -EINVAL;
+       }
+
+       if (name == NULL) {
+               PMD_DEBUG_TRACE("Null pointer is specified\n");
+               return -EINVAL;
+       }
+
+       /* shouldn't check 'rte_eth_devices[i].data',
+        * because it might be overwritten by VDEV PMD */
+       tmp = rte_eth_dev_data[port_id].name;
+       strcpy(name, tmp);
+       return 0;
+}
+
+static int
+rte_eth_dev_is_detachable(uint8_t port_id)
+{
+       uint32_t drv_flags;
+
+       if (port_id >= RTE_MAX_ETHPORTS) {
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+               return -EINVAL;
+       }
+
+       if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) {
+               switch (rte_eth_devices[port_id].pci_dev->pt_driver) {
+               case RTE_PT_IGB_UIO:
+               case RTE_PT_UIO_GENERIC:
+                       break;
+               case RTE_PT_VFIO:
+               default:
+                       return -ENOTSUP;
+               }
+       }
+
+       drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags;
+       return !(drv_flags & RTE_PCI_DRV_DETACHABLE);
+}
+
+/* attach the new physical device, then store port_id of the device */
+static int
+rte_eth_dev_attach_pdev(struct rte_pci_addr *addr, uint8_t *port_id)
+{
+       uint8_t new_port_id;
+       struct rte_eth_dev devs[RTE_MAX_ETHPORTS];
+
+       if ((addr == NULL) || (port_id == NULL))
+               goto err;
+
+       /* save current port status */
+       if (rte_eth_dev_save(devs, sizeof(devs)))
+               goto err;
+       /* re-construct pci_device_list */
+       if (rte_eal_pci_scan())
+               goto err;
+       /* invoke probe func of the driver can handle the new device.
+        * TODO:
+        * rte_eal_pci_probe_one() should return port_id.
+        * And rte_eth_dev_save() and rte_eth_dev_get_changed_port()
+        * should be removed. */
+       if (rte_eal_pci_probe_one(addr))
+               goto err;
+       /* get port_id enabled by above procedures */
+       if (rte_eth_dev_get_changed_port(devs, &new_port_id))
+               goto err;
+
+       *port_id = new_port_id;
+       return 0;
+err:
+       RTE_LOG(ERR, EAL, "Driver, cannot attach the device\n");
+       return -1;
+}
+
+/* detach the new physical device, then store pci_addr of the device */
+static int
+rte_eth_dev_detach_pdev(uint8_t port_id, struct rte_pci_addr *addr)
+{
+       struct rte_pci_addr freed_addr;
+       struct rte_pci_addr vp;
+
+       if (addr == NULL)
+               goto err;
+
+       /* check whether the driver supports detach feature, or not */
+       if (rte_eth_dev_is_detachable(port_id))
+               goto err;
+
+       /* get pci address by port id */
+       if (rte_eth_dev_get_addr_by_port(port_id, &freed_addr))
+               goto err;
+
+       /* Zerod pci addr means the port comes from virtual device */
+       vp.domain = vp.bus = vp.devid = vp.function = 0;
+       if (rte_eal_compare_pci_addr(&vp, &freed_addr) == 0)
+               goto err;
+
+       /* invoke close func of the driver,
+        * also remove the device from pci_device_list */
+       if (rte_eal_pci_close_one(&freed_addr))
+               goto err;
+
+       *addr = freed_addr;
+       return 0;
+err:
+       RTE_LOG(ERR, EAL, "Driver, cannot detach the device\n");
+       return -1;
+}
+
+/* attach the new virtual device, then store port_id of the device */
+static int
+rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id)
+{
+       char *name = NULL, *args = NULL;
+       uint8_t new_port_id;
+       struct rte_eth_dev devs[RTE_MAX_ETHPORTS];
+       int ret = -1;
+
+       if ((vdevargs == NULL) || (port_id == NULL))
+               goto end;
+
+       /* parse vdevargs, then retrieve device name and args */
+       if (rte_eal_parse_devargs_str(vdevargs, &name, &args))
+               goto end;
+
+       /* save current port status */
+       if (rte_eth_dev_save(devs, sizeof(devs)))
+               goto end;
+       /* walk around dev_driver_list to find the driver of the device,
+        * then invoke probe function o the driver.
+        * TODO:
+        * rte_eal_vdev_init() should return port_id,
+        * And rte_eth_dev_save() and rte_eth_dev_get_changed_port()
+        * should be removed. */
+       if (rte_eal_vdev_init(name, args))
+               goto end;
+       /* get port_id enabled by above procedures */
+       if (rte_eth_dev_get_changed_port(devs, &new_port_id))
+               goto end;
+       ret = 0;
+       *port_id = new_port_id;
+end:
+       if (name)
+               free(name);
+       if (args)
+               free(args);
+
+       if (ret < 0)
+               RTE_LOG(ERR, EAL, "Driver, cannot attach the device\n");
+       return ret;
+}
+
+/* detach the new virtual device, then store the name of the device */
+static int
+rte_eth_dev_detach_vdev(uint8_t port_id, char *vdevname)
+{
+       char name[RTE_ETH_NAME_MAX_LEN];
+
+       if (vdevname == NULL)
+               goto err;
+
+       /* check whether the driver supports detach feature, or not */
+       if (rte_eth_dev_is_detachable(port_id))
+               goto err;
+
+       /* get device name by port id */
+       if (rte_eth_dev_get_name_by_port(port_id, name))
+               goto err;
+       /* walk around dev_driver_list to find the driver of the device,
+        * then invoke close function o the driver */
+       if (rte_eal_vdev_uninit(name))
+               goto err;
+
+       strncpy(vdevname, name, sizeof(name));
+       return 0;
+err:
+       RTE_LOG(ERR, EAL, "Driver, cannot detach the device\n");
+       return -1;
+}
+
+/* attach the new device, then store port_id of the device */
+int
+rte_eth_dev_attach(const char *devargs, uint8_t *port_id)
+{
+       struct rte_pci_addr addr;
+
+       if ((devargs == NULL) || (port_id == NULL))
+               return -EINVAL;
+
+       if (eal_parse_pci_DomBDF(devargs, &addr) == 0)
+               return rte_eth_dev_attach_pdev(&addr, port_id);
+       else
+               return rte_eth_dev_attach_vdev(devargs, port_id);
+}
+
+/* detach the device, then store the name of the device */
+int
+rte_eth_dev_detach(uint8_t port_id, char *name)
+{
+       struct rte_pci_addr addr;
+       int ret;
+
+       if (name == NULL)
+               return -EINVAL;
+
+       if (rte_eth_dev_get_device_type(port_id) == RTE_ETH_DEV_PCI) {
+               ret = rte_eth_dev_get_addr_by_port(port_id, &addr);
+               if (ret < 0)
+                       return ret;
+
+               ret = rte_eth_dev_detach_pdev(port_id, &addr);
+               if (ret == 0)
+                       snprintf(name, RTE_ETH_NAME_MAX_LEN,
+                               "%04x:%02x:%02x.%d",
+                               addr.domain, addr.bus,
+                               addr.devid, addr.function);
+
+               return ret;
+       } else
+               return rte_eth_dev_detach_vdev(port_id, name);
+}
+#else /* RTE_LIBRTE_EAL_HOTPLUG */
+int
+rte_eth_dev_attach(const char *devargs __rte_unused,
+                       uint8_t *port_id __rte_unused)
+{
+       RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n");
+       return -1;
+}
+
+/* detach the device, then store the name of the device */
+int
+rte_eth_dev_detach(uint8_t port_id __rte_unused,
+                       char *name __rte_unused)
+{
+       RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n");
+       return -1;
+}
+#endif /* RTE_LIBRTE_EAL_HOTPLUG */
+
 static int
 rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
 {
@@ -395,7 +799,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;
        }
@@ -421,7 +825,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;
        }
@@ -447,7 +851,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;
        }
@@ -473,7 +877,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;
        }
@@ -755,10 +1159,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);
@@ -940,10 +1345,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);
@@ -979,10 +1385,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);
@@ -1007,10 +1414,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);
@@ -1026,10 +1434,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);
@@ -1045,7 +1454,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;
        }
@@ -1073,10 +1482,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);
@@ -1146,10 +1556,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);
@@ -1179,10 +1590,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);
@@ -1195,10 +1607,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);
@@ -1211,7 +1624,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;
        }
@@ -1225,10 +1638,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);
@@ -1241,10 +1655,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);
@@ -1257,7 +1672,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;
        }
@@ -1285,10 +1700,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)
@@ -1305,10 +1721,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)
@@ -1325,10 +1742,11 @@ 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 (-ENODEV);
        }
+
        dev = &rte_eth_devices[port_id];
        memset(stats, 0, sizeof(*stats));
 
@@ -1343,10 +1761,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);
@@ -1364,10 +1783,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 */
@@ -1433,10 +1853,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 */
@@ -1455,10 +1876,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);
@@ -1490,10 +1912,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));
@@ -1510,10 +1933,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);
 }
@@ -1524,7 +1948,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);
        }
@@ -1540,7 +1964,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);
        }
@@ -1560,10 +1984,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);
@@ -1576,8 +2001,8 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
                return (-EINVAL);
        }
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP);
-       (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
-       return (0);
+
+       return (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on);
 }
 
 int
@@ -1585,7 +2010,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);
        }
@@ -1607,7 +2032,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);
        }
@@ -1627,7 +2052,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);
        }
@@ -1672,7 +2097,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);
        }
@@ -1696,10 +2121,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);
@@ -1714,7 +2140,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);
        }
@@ -1748,7 +2174,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);
        }
@@ -1782,7 +2208,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);
        }
@@ -1813,7 +2239,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);
        }
@@ -1838,7 +2264,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);
        }
@@ -1878,7 +2304,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);
        }
@@ -1916,7 +2342,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);
        }
@@ -1952,7 +2378,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);
        }
@@ -1972,7 +2398,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);
        }
@@ -1988,7 +2414,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);
        }
@@ -2008,7 +2434,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);
        }
@@ -2087,7 +2513,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;
        }
@@ -2138,10 +2564,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)) {
@@ -2160,10 +2587,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);
@@ -2175,7 +2603,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;
        }
@@ -2201,10 +2629,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) {
@@ -2226,7 +2655,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);
        }
@@ -2241,7 +2670,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);
        }
@@ -2281,10 +2710,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);
 
@@ -2332,10 +2762,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);
 
@@ -2366,7 +2797,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);
@@ -2421,7 +2852,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);
@@ -2474,7 +2905,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);
@@ -2493,7 +2924,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);
        }
@@ -2519,7 +2950,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);
        }
@@ -2544,7 +2975,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);
@@ -2575,7 +3006,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;
@@ -2612,7 +3043,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;
@@ -2646,7 +3077,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);
        }
@@ -2687,7 +3118,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);
        }
@@ -2712,10 +3143,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) {
@@ -2732,10 +3164,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);
@@ -2752,10 +3185,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);
@@ -2766,10 +3200,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)( \
@@ -2787,7 +3222,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);
        }
@@ -2827,7 +3263,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);
        }
@@ -2887,7 +3324,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);
        }
@@ -2907,7 +3344,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);
        }
@@ -2926,7 +3363,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);
        }
@@ -2946,7 +3383,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);
        }
@@ -2966,7 +3403,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);
        }
@@ -2986,7 +3423,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);
        }
@@ -3006,7 +3443,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);
        }
@@ -3026,7 +3463,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);
        }
@@ -3046,7 +3483,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);
        }
@@ -3067,7 +3504,7 @@ 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;
        }
@@ -3084,7 +3521,7 @@ rte_eth_dev_filter_ctrl(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;
        }
@@ -3103,7 +3540,7 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
        return NULL;
 #endif
        /* check input parameters */
-       if (port_id >= nb_ports || fn == NULL ||
+       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;
@@ -3132,7 +3569,7 @@ rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
        return NULL;
 #endif
        /* check input parameters */
-       if (port_id >= nb_ports || fn == NULL ||
+       if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL ||
                    queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
                rte_errno = EINVAL;
                return NULL;
@@ -3160,7 +3597,7 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
        return (-ENOTSUP);
 #endif
        /* Check input parameters. */
-       if (port_id >= nb_ports || user_cb == NULL ||
+       if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
                    queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) {
                return (-EINVAL);
        }
@@ -3199,7 +3636,7 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
        return (-ENOTSUP);
 #endif
        /* Check input parameters. */
-       if (port_id >= nb_ports || user_cb == NULL ||
+       if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL ||
                    queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) {
                return (-EINVAL);
        }