ethdev: call Rx and Tx callbacks in the order they were added
[dpdk.git] / lib / librte_ether / rte_ethdev.c
index e13fde5..ddf3658 100644 (file)
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
                PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \
                return (retval); \
        } \
-} while(0)
+} while (0)
+
 #define PROC_PRIMARY_OR_RET() do { \
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) { \
                PMD_DEBUG_TRACE("Cannot run in secondary processes\n"); \
                return; \
        } \
-} while(0)
+} while (0)
 
-/* Macros to check for invlaid function pointers in dev_ops structure */
+/* Macros to check for invalid function pointers in dev_ops structure */
 #define FUNC_PTR_OR_ERR_RET(func, retval) do { \
        if ((func) == NULL) { \
                PMD_DEBUG_TRACE("Function not supported\n"); \
                return (retval); \
        } \
-} while(0)
+} while (0)
+
 #define FUNC_PTR_OR_RET(func) do { \
        if ((func) == NULL) { \
                PMD_DEBUG_TRACE("Function not supported\n"); \
                return; \
        } \
-} while(0)
+} while (0)
+
+/* Macros to check for valid port */
+#define VALID_PORTID_OR_ERR_RET(port_id, retval) do {          \
+       if (!rte_eth_dev_is_valid_port(port_id)) {              \
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); \
+               return -EINVAL;                                 \
+       }                                                       \
+} while (0)
+
+#define VALID_PORTID_OR_RET(port_id) do {                      \
+       if (!rte_eth_dev_is_valid_port(port_id)) {              \
+               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); \
+               return;                                         \
+       }                                                       \
+} while (0)
 
 static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data";
 struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
-static struct rte_eth_dev_data *rte_eth_dev_data = NULL;
-static uint8_t nb_ports = 0;
+static struct rte_eth_dev_data *rte_eth_dev_data;
+static uint8_t nb_ports;
 
 /* spinlock for eth device callbacks */
 static rte_spinlock_t rte_eth_dev_cb_lock = RTE_SPINLOCK_INITIALIZER;
@@ -185,7 +202,7 @@ rte_eth_dev_data_alloc(void)
        const unsigned flags = 0;
        const struct rte_memzone *mz;
 
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY){
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                mz = rte_memzone_reserve(MZ_RTE_ETH_DEV_DATA,
                                RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data),
                                rte_socket_id(), flags);
@@ -241,7 +258,8 @@ rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type)
                rte_eth_dev_data_alloc();
 
        if (rte_eth_dev_allocated(name) != NULL) {
-               PMD_DEBUG_TRACE("Ethernet Device with name %s already allocated!\n", name);
+               PMD_DEBUG_TRACE("Ethernet Device with name %s already allocated!\n",
+                               name);
                return NULL;
        }
 
@@ -303,7 +321,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        if (eth_dev == NULL)
                return -ENOMEM;
 
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY){
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                eth_dev->data->dev_private = rte_zmalloc("ethdev private structure",
                                  eth_drv->dev_private_size,
                                  RTE_CACHE_LINE_SIZE);
@@ -327,8 +345,8 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        if (diag == 0)
                return 0;
 
-       PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%u device_id=0x%x)"
-                       " failed\n", pci_drv->name,
+       PMD_DEBUG_TRACE("driver %s: eth_dev_init(vendor_id=0x%u device_id=0x%x) failed\n",
+                       pci_drv->name,
                        (unsigned) pci_dev->id.vendor_id,
                        (unsigned) pci_dev->id.device_id);
        if (rte_eal_process_type() == RTE_PROC_PRIMARY)
@@ -425,9 +443,6 @@ 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)
 {
@@ -465,10 +480,7 @@ rte_eth_dev_get_changed_port(struct rte_eth_dev *devs, uint8_t *port_id)
 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;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        if (addr == NULL) {
                PMD_DEBUG_TRACE("Null pointer is specified\n");
@@ -484,10 +496,7 @@ 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;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        if (name == NULL) {
                PMD_DEBUG_TRACE("Null pointer is specified\n");
@@ -515,6 +524,7 @@ rte_eth_dev_is_detachable(uint8_t port_id)
                switch (rte_eth_devices[port_id].pci_dev->kdrv) {
                case RTE_KDRV_IGB_UIO:
                case RTE_KDRV_UIO_GENERIC:
+               case RTE_KDRV_NIC_UIO:
                        break;
                case RTE_KDRV_VFIO:
                default:
@@ -578,7 +588,7 @@ rte_eth_dev_detach_pdev(uint8_t port_id, struct rte_pci_addr *addr)
        if (rte_eth_dev_get_addr_by_port(port_id, &freed_addr))
                goto err;
 
-       /* Zerod pci addr means the port comes from virtual device */
+       /* Zeroed 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;
@@ -707,24 +717,6 @@ rte_eth_dev_detach(uint8_t port_id, char *name)
        } 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)
@@ -754,6 +746,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                        return -(ENOMEM);
                if (nb_queues > old_nb_queues) {
                        uint16_t new_qs = nb_queues - old_nb_queues;
+
                        memset(rxq + old_nb_queues, 0,
                                sizeof(rxq[0]) * new_qs);
                }
@@ -774,10 +767,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
@@ -800,10 +790,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
@@ -826,10 +813,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        if (tx_queue_id >= dev->data->nb_tx_queues) {
@@ -852,10 +836,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        if (tx_queue_id >= dev->data->nb_tx_queues) {
@@ -878,8 +859,8 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
 
        if (dev->data->tx_queues == NULL) { /* first time configuration */
                dev->data->tx_queues = rte_zmalloc("ethdev->tx_queues",
-                               sizeof(dev->data->tx_queues[0]) * nb_queues,
-                               RTE_CACHE_LINE_SIZE);
+                                                  sizeof(dev->data->tx_queues[0]) * nb_queues,
+                                                  RTE_CACHE_LINE_SIZE);
                if (dev->data->tx_queues == NULL) {
                        dev->data->nb_tx_queues = 0;
                        return -(ENOMEM);
@@ -892,13 +873,14 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
                for (i = nb_queues; i < old_nb_queues; i++)
                        (*dev->dev_ops->tx_queue_release)(txq[i]);
                txq = rte_realloc(txq, sizeof(txq[0]) * nb_queues,
-                               RTE_CACHE_LINE_SIZE);
+                                 RTE_CACHE_LINE_SIZE);
                if (txq == NULL)
                        return -ENOMEM;
                if (nb_queues > old_nb_queues) {
                        uint16_t new_qs = nb_queues - old_nb_queues;
+
                        memset(txq + old_nb_queues, 0,
-                               sizeof(txq[0]) * new_qs);
+                              sizeof(txq[0]) * new_qs);
                }
 
                dev->data->tx_queues = txq;
@@ -912,6 +894,7 @@ static int
 rte_eth_dev_check_vf_rss_rxq_num(uint8_t port_id, uint16_t nb_rx_q)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+
        switch (nb_rx_q) {
        case 1:
        case 2:
@@ -935,7 +918,7 @@ rte_eth_dev_check_vf_rss_rxq_num(uint8_t port_id, uint16_t nb_rx_q)
 
 static int
 rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
-                     const struct rte_eth_conf *dev_conf)
+                         const struct rte_eth_conf *dev_conf)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
 
@@ -976,10 +959,10 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                        if (nb_rx_q <= RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool)
                                if (rte_eth_dev_check_vf_rss_rxq_num(port_id, nb_rx_q) != 0) {
                                        PMD_DEBUG_TRACE("ethdev port_id=%d"
-                                               " SRIOV active, invalid queue"
-                                               " number for VMDQ RSS, allowed"
-                                               " value are 1, 2 or 4\n",
-                                               port_id);
+                                                       " SRIOV active, invalid queue"
+                                                       " number for VMDQ RSS, allowed"
+                                                       " value are 1, 2 or 4\n",
+                                                       port_id);
                                        return -EINVAL;
                                }
                        break;
@@ -1009,8 +992,9 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                if ((nb_rx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) ||
                    (nb_tx_q > RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool)) {
                        PMD_DEBUG_TRACE("ethdev port_id=%d SRIOV active, "
-                                   "queue number must less equal to %d\n",
-                                       port_id, RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool);
+                                       "queue number must less equal to %d\n",
+                                       port_id,
+                                       RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool);
                        return -EINVAL;
                }
        } else {
@@ -1025,8 +1009,8 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                return -EINVAL;
                        }
                        conf = &(dev_conf->rx_adv_conf.vmdq_dcb_conf);
-                       if (! (conf->nb_queue_pools == ETH_16_POOLS ||
-                              conf->nb_queue_pools == ETH_32_POOLS)) {
+                       if (!(conf->nb_queue_pools == ETH_16_POOLS ||
+                             conf->nb_queue_pools == ETH_32_POOLS)) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
                                                "nb_queue_pools must be %d or %d\n",
                                                port_id, ETH_16_POOLS, ETH_32_POOLS);
@@ -1043,8 +1027,8 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                return -EINVAL;
                        }
                        conf = &(dev_conf->tx_adv_conf.vmdq_dcb_tx_conf);
-                       if (! (conf->nb_queue_pools == ETH_16_POOLS ||
-                              conf->nb_queue_pools == ETH_32_POOLS)) {
+                       if (!(conf->nb_queue_pools == ETH_16_POOLS ||
+                             conf->nb_queue_pools == ETH_32_POOLS)) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, "
                                                "nb_queue_pools != %d or nb_queue_pools "
                                                "!= %d\n",
@@ -1064,8 +1048,8 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                return -EINVAL;
                        }
                        conf = &(dev_conf->rx_adv_conf.dcb_rx_conf);
-                       if (! (conf->nb_tcs == ETH_4_TCS ||
-                              conf->nb_tcs == ETH_8_TCS)) {
+                       if (!(conf->nb_tcs == ETH_4_TCS ||
+                             conf->nb_tcs == ETH_8_TCS)) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
                                                "nb_tcs != %d or nb_tcs "
                                                "!= %d\n",
@@ -1084,8 +1068,8 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                return -EINVAL;
                        }
                        conf = &(dev_conf->tx_adv_conf.dcb_tx_conf);
-                       if (! (conf->nb_tcs == ETH_4_TCS ||
-                              conf->nb_tcs == ETH_8_TCS)) {
+                       if (!(conf->nb_tcs == ETH_4_TCS ||
+                             conf->nb_tcs == ETH_8_TCS)) {
                                PMD_DEBUG_TRACE("ethdev port_id=%d DCB selected, "
                                                "nb_tcs != %d or nb_tcs "
                                                "!= %d\n",
@@ -1109,10 +1093,7 @@ 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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        if (nb_rx_q > RTE_MAX_QUEUES_PER_PORT) {
                PMD_DEBUG_TRACE(
@@ -1195,8 +1176,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                (unsigned)dev_conf->rxmode.max_rx_pkt_len,
                                (unsigned)dev_info.max_rx_pktlen);
                        return -EINVAL;
-               }
-               else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) {
+               } else if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN) {
                        PMD_DEBUG_TRACE("ethdev port_id=%d max_rx_pkt_len %u"
                                " < min valid value %u\n",
                                port_id,
@@ -1212,7 +1192,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                                                        ETHER_MAX_LEN;
        }
 
-       /* multipe queue mode checking */
+       /* multiple queue mode checking */
        diag = rte_eth_dev_check_mq_mode(port_id, nb_rx_q, nb_tx_q, dev_conf);
        if (diag != 0) {
                PMD_DEBUG_TRACE("port%d rte_eth_dev_check_mq_mode = %d\n",
@@ -1292,7 +1272,7 @@ rte_eth_dev_config_restore(uint8_t port_id)
        else if (rte_eth_promiscuous_get(port_id) == 0)
                rte_eth_promiscuous_disable(port_id);
 
-       /* replay allmulticast configuration */
+       /* replay all multicast configuration */
        if (rte_eth_allmulticast_get(port_id) == 1)
                rte_eth_allmulticast_enable(port_id);
        else if (rte_eth_allmulticast_get(port_id) == 0)
@@ -1309,10 +1289,7 @@ rte_eth_dev_start(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
 
@@ -1349,11 +1326,7 @@ rte_eth_dev_stop(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_RET();
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
@@ -1378,10 +1351,7 @@ rte_eth_dev_set_link_up(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
 
@@ -1398,10 +1368,7 @@ rte_eth_dev_set_link_down(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
 
@@ -1418,11 +1385,7 @@ rte_eth_dev_close(uint8_t port_id)
         * in a multi-process setup*/
        PROC_PRIMARY_OR_RET();
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->dev_close);
@@ -1445,10 +1408,7 @@ 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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
@@ -1518,10 +1478,7 @@ 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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        if (tx_queue_id >= dev->data->nb_tx_queues) {
@@ -1552,11 +1509,7 @@ rte_eth_promiscuous_enable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_enable);
@@ -1569,11 +1522,7 @@ rte_eth_promiscuous_disable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_disable);
@@ -1586,10 +1535,7 @@ rte_eth_promiscuous_get(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -1;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        return dev->data->promiscuous;
@@ -1600,11 +1546,7 @@ rte_eth_allmulticast_enable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_enable);
@@ -1617,11 +1559,7 @@ rte_eth_allmulticast_disable(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_disable);
@@ -1634,10 +1572,7 @@ rte_eth_allmulticast_get(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -1;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        return dev->data->all_multicast;
@@ -1662,11 +1597,7 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.intr_conf.lsc != 0)
@@ -1683,11 +1614,7 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.intr_conf.lsc != 0)
@@ -1704,10 +1631,7 @@ rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        memset(stats, 0, sizeof(*stats));
@@ -1723,11 +1647,7 @@ rte_eth_stats_reset(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset);
@@ -1742,13 +1662,9 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
        struct rte_eth_stats eth_stats;
        struct rte_eth_dev *dev;
        unsigned count, i, q;
-       uint64_t val;
-       char *stats_ptr;
+       uint64_t val, *stats_ptr;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -1;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
 
@@ -1770,8 +1686,9 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
 
        /* global stats */
        for (i = 0; i < RTE_NB_STATS; i++) {
-               stats_ptr = (char *)&eth_stats + rte_stats_strings[i].offset;
-               val = *(uint64_t *)stats_ptr;
+               stats_ptr = RTE_PTR_ADD(&eth_stats,
+                                       rte_stats_strings[i].offset);
+               val = *stats_ptr;
                snprintf(xstats[count].name, sizeof(xstats[count].name),
                        "%s", rte_stats_strings[i].name);
                xstats[count++].value = val;
@@ -1780,10 +1697,10 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
        /* per-rxq stats */
        for (q = 0; q < dev->data->nb_rx_queues; q++) {
                for (i = 0; i < RTE_NB_RXQ_STATS; i++) {
-                       stats_ptr = (char *)&eth_stats;
-                       stats_ptr += rte_rxq_stats_strings[i].offset;
-                       stats_ptr += q * sizeof(uint64_t);
-                       val = *(uint64_t *)stats_ptr;
+                       stats_ptr = RTE_PTR_ADD(&eth_stats,
+                                       rte_rxq_stats_strings[i].offset +
+                                       q * sizeof(uint64_t));
+                       val = *stats_ptr;
                        snprintf(xstats[count].name, sizeof(xstats[count].name),
                                "rx_queue_%u_%s", q,
                                rte_rxq_stats_strings[i].name);
@@ -1794,10 +1711,10 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
        /* per-txq stats */
        for (q = 0; q < dev->data->nb_tx_queues; q++) {
                for (i = 0; i < RTE_NB_TXQ_STATS; i++) {
-                       stats_ptr = (char *)&eth_stats;
-                       stats_ptr += rte_txq_stats_strings[i].offset;
-                       stats_ptr += q * sizeof(uint64_t);
-                       val = *(uint64_t *)stats_ptr;
+                       stats_ptr = RTE_PTR_ADD(&eth_stats,
+                                       rte_txq_stats_strings[i].offset +
+                                       q * sizeof(uint64_t));
+                       val = *stats_ptr;
                        snprintf(xstats[count].name, sizeof(xstats[count].name),
                                "tx_queue_%u_%s", q,
                                rte_txq_stats_strings[i].name);
@@ -1814,11 +1731,7 @@ rte_eth_xstats_reset(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        /* implemented by the driver */
@@ -1837,10 +1750,7 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
 
@@ -1873,11 +1783,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
 
        memset(dev_info, 0, sizeof(struct rte_eth_dev_info));
@@ -1894,11 +1800,7 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return;
-       }
-
+       VALID_PORTID_OR_RET(port_id);
        dev = &rte_eth_devices[port_id];
        ether_addr_copy(&dev->data->mac_addrs[0], mac_addr);
 }
@@ -1909,10 +1811,7 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        *mtu = dev->data->mtu;
@@ -1925,11 +1824,7 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)
        int ret;
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mtu_set, -ENOTSUP);
 
@@ -1945,13 +1840,9 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
-       if (! (dev->data->dev_conf.rxmode.hw_vlan_filter)) {
+       if (!(dev->data->dev_conf.rxmode.hw_vlan_filter)) {
                PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id);
                return -ENOSYS;
        }
@@ -1971,11 +1862,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        if (rx_queue_id >= dev->data->nb_rx_queues) {
                PMD_DEBUG_TRACE("Invalid rx_queue_id=%d\n", port_id);
@@ -1993,11 +1880,7 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP);
        (*dev->dev_ops->vlan_tpid_set)(dev, tpid);
@@ -2013,37 +1896,33 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
        int mask = 0;
        int cur, org = 0;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        /*check which option changed by application*/
        cur = !!(offload_mask & ETH_VLAN_STRIP_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_strip);
-       if (cur != org){
+       if (cur != org) {
                dev->data->dev_conf.rxmode.hw_vlan_strip = (uint8_t)cur;
                mask |= ETH_VLAN_STRIP_MASK;
        }
 
        cur = !!(offload_mask & ETH_VLAN_FILTER_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_filter);
-       if (cur != org){
+       if (cur != org) {
                dev->data->dev_conf.rxmode.hw_vlan_filter = (uint8_t)cur;
                mask |= ETH_VLAN_FILTER_MASK;
        }
 
        cur = !!(offload_mask & ETH_VLAN_EXTEND_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.hw_vlan_extend);
-       if (cur != org){
+       if (cur != org) {
                dev->data->dev_conf.rxmode.hw_vlan_extend = (uint8_t)cur;
                mask |= ETH_VLAN_EXTEND_MASK;
        }
 
        /*no change*/
-       if(mask == 0)
+       if (mask == 0)
                return ret;
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP);
@@ -2058,21 +1937,17 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id)
        struct rte_eth_dev *dev;
        int ret = 0;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.rxmode.hw_vlan_strip)
-               ret |= ETH_VLAN_STRIP_OFFLOAD ;
+               ret |= ETH_VLAN_STRIP_OFFLOAD;
 
        if (dev->data->dev_conf.rxmode.hw_vlan_filter)
-               ret |= ETH_VLAN_FILTER_OFFLOAD ;
+               ret |= ETH_VLAN_FILTER_OFFLOAD;
 
        if (dev->data->dev_conf.rxmode.hw_vlan_extend)
-               ret |= ETH_VLAN_EXTEND_OFFLOAD ;
+               ret |= ETH_VLAN_EXTEND_OFFLOAD;
 
        return ret;
 }
@@ -2082,11 +1957,7 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -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);
@@ -2101,11 +1972,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
@@ -2117,8 +1984,8 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id,
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
             || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
            && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
+               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and "
+                               "None l4type, source & destinations ports "
                                "should be null!\n");
                return -EINVAL;
        }
@@ -2135,11 +2002,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
@@ -2151,8 +2014,8 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id,
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
             || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
            && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
+               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and "
+                               "None l4type, source & destinations ports "
                                "should be null!\n");
                return -EINVAL;
        }
@@ -2169,11 +2032,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) {
@@ -2185,8 +2044,8 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id,
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
             || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
            && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type source & destinations ports " \
+               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and "
+                               "None l4type source & destinations ports "
                                "should be null!\n");
                return -EINVAL;
        }
@@ -2200,13 +2059,9 @@ rte_eth_dev_fdir_get_infos(uint8_t port_id, struct rte_eth_fdir *fdir)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
-       if (! (dev->data->dev_conf.fdir_conf.mode)) {
+       if (!(dev->data->dev_conf.fdir_conf.mode)) {
                PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id);
                return -ENOSYS;
        }
@@ -2225,11 +2080,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
@@ -2241,8 +2092,8 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id,
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
             || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
            && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
+               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and "
+                               "None l4type, source & destinations ports "
                                "should be null!\n");
                return -EINVAL;
        }
@@ -2265,11 +2116,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
@@ -2281,8 +2128,8 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id,
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
             || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
            && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
+               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and "
+                               "None l4type, source & destinations ports "
                                "should be null!\n");
                return -EINVAL;
        }
@@ -2303,11 +2150,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) {
@@ -2319,8 +2162,8 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id,
        if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP
             || fdir_filter->l4type == RTE_FDIR_L4TYPE_NONE)
            && (fdir_filter->port_src || fdir_filter->port_dst)) {
-               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \
-                               "None l4type, source & destinations ports " \
+               PMD_DEBUG_TRACE(" Port are meaningless for SCTP and "
+                               "None l4type, source & destinations ports "
                                "should be null!\n");
                return -EINVAL;
        }
@@ -2339,13 +2182,9 @@ rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
-       if (! (dev->data->dev_conf.fdir_conf.mode)) {
+       if (!(dev->data->dev_conf.fdir_conf.mode)) {
                PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id);
                return -ENOSYS;
        }
@@ -2359,11 +2198,7 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_get, -ENOTSUP);
        memset(fc_conf, 0, sizeof(*fc_conf));
@@ -2375,11 +2210,7 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        if ((fc_conf->send_xon != 0) && (fc_conf->send_xon != 1)) {
                PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n");
                return -EINVAL;
@@ -2395,11 +2226,7 @@ rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) {
                PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n");
                return -EINVAL;
@@ -2474,11 +2301,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id,
        struct rte_eth_dev *dev;
        int ret;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        /* Check mask bits */
        ret = rte_eth_check_reta_mask(reta_conf, reta_size);
        if (ret < 0)
@@ -2525,11 +2348,7 @@ 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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        rss_hash_protos = rss_conf->rss_hf;
        if ((rss_hash_protos != 0) &&
            ((rss_hash_protos & ETH_RSS_PROTO_MASK) == 0)) {
@@ -2548,11 +2367,7 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -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);
@@ -2564,11 +2379,7 @@ rte_eth_dev_udp_tunnel_add(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        if (udp_tunnel == NULL) {
                PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n");
                return -EINVAL;
@@ -2590,15 +2401,11 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
        if (udp_tunnel == NULL) {
-               PMD_DEBUG_TRACE("Invalid udp_tunnel parametr\n");
+               PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n");
                return -EINVAL;
        }
 
@@ -2616,11 +2423,7 @@ rte_eth_led_on(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_on, -ENOTSUP);
        return (*dev->dev_ops->dev_led_on)(dev);
@@ -2631,11 +2434,7 @@ rte_eth_led_off(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_off, -ENOTSUP);
        return (*dev->dev_ops->dev_led_off)(dev);
@@ -2671,11 +2470,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
        int index;
        uint64_t pool_mask;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
 
@@ -2685,7 +2480,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
                return -EINVAL;
        }
        if (pool >= ETH_64_POOLS) {
-               PMD_DEBUG_TRACE("pool id must be 0-%d\n",ETH_64_POOLS - 1);
+               PMD_DEBUG_TRACE("pool id must be 0-%d\n", ETH_64_POOLS - 1);
                return -EINVAL;
        }
 
@@ -2700,7 +2495,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
        } else {
                pool_mask = dev->data->mac_pool_sel[index];
 
-               /* Check if both MAC address and pool is alread there, and do nothing */
+               /* Check if both MAC address and pool is already there, and do nothing */
                if (pool_mask & (1ULL << pool))
                        return 0;
        }
@@ -2723,11 +2518,7 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
        struct rte_eth_dev *dev;
        int index;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_remove, -ENOTSUP);
 
@@ -2758,23 +2549,18 @@ 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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n",
-                               port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 
        num_vfs = dev_info.max_vfs;
-       if (vf > num_vfs)
-       {
+       if (vf > num_vfs) {
                PMD_DEBUG_TRACE("set VF RX mode:invalid VF id %d\n", vf);
                return -EINVAL;
        }
-       if (rx_mode == 0)
-       {
+
+       if (rx_mode == 0) {
                PMD_DEBUG_TRACE("set VF RX mode:mode mask ca not be zero\n");
                return -EINVAL;
        }
@@ -2813,11 +2599,7 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
        int ret;
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
-                       port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        if (is_zero_ether_addr(addr)) {
@@ -2833,7 +2615,7 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
 
        if (index < 0) {
                if (!on) {
-                       PMD_DEBUG_TRACE("port %d: the MAC address was not"
+                       PMD_DEBUG_TRACE("port %d: the MAC address was not "
                                "set in UTA\n", port_id);
                        return -EINVAL;
                }
@@ -2866,11 +2648,7 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
-                       port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
 
@@ -2879,85 +2657,73 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
 }
 
 int
-rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on)
+rte_eth_dev_set_vf_rx(uint8_t port_id, uint16_t vf, uint8_t on)
 {
        uint16_t num_vfs;
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 
        num_vfs = dev_info.max_vfs;
-       if (vf > num_vfs)
-       {
+       if (vf > num_vfs) {
                PMD_DEBUG_TRACE("port %d: invalid vf id\n", port_id);
                return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx, -ENOTSUP);
-       return (*dev->dev_ops->set_vf_rx)(dev, vf,on);
+       return (*dev->dev_ops->set_vf_rx)(dev, vf, on);
 }
 
 int
-rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
+rte_eth_dev_set_vf_tx(uint8_t port_id, uint16_t vf, uint8_t on)
 {
        uint16_t num_vfs;
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
 
        num_vfs = dev_info.max_vfs;
-       if (vf > num_vfs)
-       {
+       if (vf > num_vfs) {
                PMD_DEBUG_TRACE("set pool tx:invalid pool id=%d\n", vf);
                return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_tx, -ENOTSUP);
-       return (*dev->dev_ops->set_vf_tx)(dev, vf,on);
+       return (*dev->dev_ops->set_vf_tx)(dev, vf, on);
 }
 
 int
 rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id,
-                                uint64_t vf_mask,uint8_t vlan_on)
+                              uint64_t vf_mask, uint8_t vlan_on)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n",
-                               port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
        dev = &rte_eth_devices[port_id];
 
-       if(vlan_id > ETHER_MAX_VLAN_ID)
-       {
+       if (vlan_id > ETHER_MAX_VLAN_ID) {
                PMD_DEBUG_TRACE("VF VLAN filter:invalid VLAN id=%d\n",
                        vlan_id);
                return -EINVAL;
        }
-       if (vf_mask == 0)
-       {
+
+       if (vf_mask == 0) {
                PMD_DEBUG_TRACE("VF VLAN filter:pool_mask can not be 0\n");
                return -EINVAL;
        }
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_vlan_filter, -ENOTSUP);
        return (*dev->dev_ops->set_vf_vlan_filter)(dev, vlan_id,
-                                               vf_mask,vlan_on);
+                                                  vf_mask, vlan_on);
 }
 
 int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,
@@ -2967,11 +2733,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("set queue rate limit:invalid port id=%d\n",
-                               port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
@@ -3004,11 +2766,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("set VF rate limit:invalid port id=%d\n",
-                               port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        rte_eth_dev_info_get(port_id, &dev_info);
@@ -3033,38 +2791,33 @@ int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate,
 
 int
 rte_eth_mirror_rule_set(uint8_t port_id,
-                       struct rte_eth_vmdq_mirror_conf *mirror_conf,
+                       struct rte_eth_mirror_conf *mirror_conf,
                        uint8_t rule_id, uint8_t on)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       if (mirror_conf->rule_type_mask == 0) {
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       if (mirror_conf->rule_type == 0) {
                PMD_DEBUG_TRACE("mirror rule type can not be 0.\n");
                return -EINVAL;
        }
 
        if (mirror_conf->dst_pool >= ETH_64_POOLS) {
-               PMD_DEBUG_TRACE("Invalid dst pool, pool id must"
-                       "be 0-%d\n",ETH_64_POOLS - 1);
+               PMD_DEBUG_TRACE("Invalid dst pool, pool id must be 0-%d\n",
+                               ETH_64_POOLS - 1);
                return -EINVAL;
        }
 
-       if ((mirror_conf->rule_type_mask & ETH_VMDQ_POOL_MIRROR) &&
-               (mirror_conf->pool_mask == 0)) {
-               PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not"
-                               "be 0.\n");
+       if ((mirror_conf->rule_type & (ETH_MIRROR_VIRTUAL_POOL_UP |
+            ETH_MIRROR_VIRTUAL_POOL_DOWN)) &&
+           (mirror_conf->pool_mask == 0)) {
+               PMD_DEBUG_TRACE("Invalid mirror pool, pool mask can not be 0.\n");
                return -EINVAL;
        }
 
-       if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)
-       {
-               PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n",
-                       ETH_VMDQ_NUM_MIRROR_RULE - 1);
+       if ((mirror_conf->rule_type & ETH_MIRROR_VLAN) &&
+           mirror_conf->vlan.vlan_mask == 0) {
+               PMD_DEBUG_TRACE("Invalid vlan mask, vlan mask can not be 0.\n");
                return -EINVAL;
        }
 
@@ -3079,17 +2832,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 (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)
-       {
-               PMD_DEBUG_TRACE("Invalid rule_id, rule_id must be 0-%d\n",
-                       ETH_VMDQ_NUM_MIRROR_RULE-1);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mirror_rule_reset, -ENOTSUP);
@@ -3104,10 +2847,7 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return 0;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, 0);
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0);
@@ -3125,10 +2865,7 @@ rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return 0;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, 0);
 
        dev = &rte_eth_devices[port_id];
 
@@ -3146,10 +2883,7 @@ rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return 0;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, 0);
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, 0);
@@ -3161,15 +2895,12 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -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)( \
-               dev->data->rx_queues[queue_id], offset);
+       return (*dev->dev_ops->rx_descriptor_done)(dev->data->rx_queues[queue_id],
+                                                  offset);
 }
 #endif
 
@@ -3184,10 +2915,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
        if (!cb_fn)
                return -EINVAL;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
@@ -3201,8 +2929,9 @@ rte_eth_dev_callback_register(uint8_t port_id,
        }
 
        /* create a new callback. */
-       if (user_cb == NULL && (user_cb = rte_zmalloc("INTR_USER_CALLBACK",
-                       sizeof(struct rte_eth_dev_callback), 0)) != NULL) {
+       if (user_cb == NULL &&
+           (user_cb = rte_zmalloc("INTR_USER_CALLBACK",
+                                  sizeof(struct rte_eth_dev_callback), 0))) {
                user_cb->cb_fn = cb_fn;
                user_cb->cb_arg = cb_arg;
                user_cb->event = event;
@@ -3225,10 +2954,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
        if (!cb_fn)
                return -EINVAL;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -EINVAL;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
        dev = &rte_eth_devices[port_id];
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
@@ -3285,16 +3011,9 @@ int rte_eth_dev_bypass_init(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
+       dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_init, -ENOTSUP);
        (*dev->dev_ops->bypass_init)(dev);
        return 0;
@@ -3305,15 +3024,9 @@ rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP);
        (*dev->dev_ops->bypass_state_show)(dev, state);
        return 0;
@@ -3324,16 +3037,9 @@ rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
+       dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_set, -ENOTSUP);
        (*dev->dev_ops->bypass_state_set)(dev, new_state);
        return 0;
@@ -3344,16 +3050,9 @@ rte_eth_dev_bypass_event_show(uint8_t port_id, uint32_t event, uint32_t *state)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
-
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
+       dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP);
        (*dev->dev_ops->bypass_event_show)(dev, event, state);
        return 0;
@@ -3364,15 +3063,9 @@ rte_eth_dev_bypass_event_store(uint8_t port_id, uint32_t event, uint32_t state)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_event_set, -ENOTSUP);
        (*dev->dev_ops->bypass_event_set)(dev, event, state);
@@ -3384,15 +3077,9 @@ rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_set, -ENOTSUP);
        (*dev->dev_ops->bypass_wd_timeout_set)(dev, timeout);
@@ -3404,15 +3091,9 @@ rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_ver_show, -ENOTSUP);
        (*dev->dev_ops->bypass_ver_show)(dev, ver);
@@ -3424,15 +3105,9 @@ rte_eth_dev_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_show, -ENOTSUP);
        (*dev->dev_ops->bypass_wd_timeout_show)(dev, wd_timeout);
@@ -3444,15 +3119,9 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
-       if ((dev= &rte_eth_devices[port_id]) == NULL) {
-               PMD_DEBUG_TRACE("Invalid port device\n");
-               return -ENODEV;
-       }
+       dev = &rte_eth_devices[port_id];
 
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_reset, -ENOTSUP);
        (*dev->dev_ops->bypass_wd_reset)(dev);
@@ -3465,10 +3134,7 @@ rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
@@ -3482,10 +3148,7 @@ rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP);
@@ -3516,8 +3179,20 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
 
        cb->fn.rx = 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;
+
+       /* Add the callbacks in fifo order. */
+       struct rte_eth_rxtx_callback *tail =
+               rte_eth_devices[port_id].post_rx_burst_cbs[queue_id];
+
+       if (!tail) {
+               rte_eth_devices[port_id].post_rx_burst_cbs[queue_id] = cb;
+
+       } else {
+               while (tail->next)
+                       tail = tail->next;
+               tail->next = cb;
+       }
+
        return cb;
 }
 
@@ -3545,8 +3220,20 @@ rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
 
        cb->fn.tx = 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;
+
+       /* Add the callbacks in fifo order. */
+       struct rte_eth_rxtx_callback *tail =
+               rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id];
+
+       if (!tail) {
+               rte_eth_devices[port_id].pre_tx_burst_cbs[queue_id] = cb;
+
+       } else {
+               while (tail->next)
+                       tail = tail->next;
+               tail->next = cb;
+       }
+
        return cb;
 }
 
@@ -3635,12 +3322,58 @@ rte_eth_dev_set_mc_addr_list(uint8_t port_id,
 {
        struct rte_eth_dev *dev;
 
-       if (!rte_eth_dev_is_valid_port(port_id)) {
-               PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
-               return -ENODEV;
-       }
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 
        dev = &rte_eth_devices[port_id];
        FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_mc_addr_list, -ENOTSUP);
        return dev->dev_ops->set_mc_addr_list(dev, mc_addr_set, nb_mc_addr);
 }
+
+int
+rte_eth_timesync_enable(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_enable, -ENOTSUP);
+       return (*dev->dev_ops->timesync_enable)(dev);
+}
+
+int
+rte_eth_timesync_disable(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_disable, -ENOTSUP);
+       return (*dev->dev_ops->timesync_disable)(dev);
+}
+
+int
+rte_eth_timesync_read_rx_timestamp(uint8_t port_id, struct timespec *timestamp,
+                                  uint32_t flags)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_read_rx_timestamp, -ENOTSUP);
+       return (*dev->dev_ops->timesync_read_rx_timestamp)(dev, timestamp, flags);
+}
+
+int
+rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp)
+{
+       struct rte_eth_dev *dev;
+
+       VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       FUNC_PTR_OR_ERR_RET(*dev->dev_ops->timesync_read_tx_timestamp, -ENOTSUP);
+       return (*dev->dev_ops->timesync_read_tx_timestamp)(dev, timestamp);
+}