ethdev: fix missing imissed counter in xstats
[dpdk.git] / lib / librte_ether / rte_ethdev.c
index 59756dd..4f492e3 100644 (file)
@@ -47,7 +47,6 @@
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_interrupts.h>
-#include <rte_pci.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
@@ -94,6 +93,7 @@ static const struct rte_eth_xstats_name_off rte_stats_strings[] = {
        {"tx_good_packets", offsetof(struct rte_eth_stats, opackets)},
        {"rx_good_bytes", offsetof(struct rte_eth_stats, ibytes)},
        {"tx_good_bytes", offsetof(struct rte_eth_stats, obytes)},
+       {"rx_missed_errors", offsetof(struct rte_eth_stats, imissed)},
        {"rx_errors", offsetof(struct rte_eth_stats, ierrors)},
        {"tx_errors", offsetof(struct rte_eth_stats, oerrors)},
        {"rx_mbuf_allocation_errors", offsetof(struct rte_eth_stats,
@@ -139,8 +139,8 @@ enum {
        STAT_QMAP_RX
 };
 
-uint8_t
-rte_eth_find_next(uint8_t port_id)
+uint16_t
+rte_eth_find_next(uint16_t port_id)
 {
        while (port_id < RTE_MAX_ETHPORTS &&
               rte_eth_devices[port_id].state != RTE_ETH_DEV_ATTACHED)
@@ -179,16 +179,14 @@ rte_eth_dev_allocated(const char *name)
        unsigned i;
 
        for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
-               if (rte_eth_devices[i].state == RTE_ETH_DEV_ATTACHED &&
-                               rte_eth_devices[i].device) {
-                       if (!strcmp(rte_eth_devices[i].device->name, name))
-                               return &rte_eth_devices[i];
-               }
+               if ((rte_eth_devices[i].state == RTE_ETH_DEV_ATTACHED) &&
+                   strcmp(rte_eth_devices[i].data->name, name) == 0)
+                       return &rte_eth_devices[i];
        }
        return NULL;
 }
 
-static uint8_t
+static uint16_t
 rte_eth_dev_find_free_port(void)
 {
        unsigned i;
@@ -201,7 +199,7 @@ rte_eth_dev_find_free_port(void)
 }
 
 static struct rte_eth_dev *
-eth_dev_get(uint8_t port_id)
+eth_dev_get(uint16_t port_id)
 {
        struct rte_eth_dev *eth_dev = &rte_eth_devices[port_id];
 
@@ -217,7 +215,7 @@ eth_dev_get(uint8_t port_id)
 struct rte_eth_dev *
 rte_eth_dev_allocate(const char *name)
 {
-       uint8_t port_id;
+       uint16_t port_id;
        struct rte_eth_dev *eth_dev;
 
        port_id = rte_eth_dev_find_free_port();
@@ -252,7 +250,7 @@ rte_eth_dev_allocate(const char *name)
 struct rte_eth_dev *
 rte_eth_dev_attach_secondary(const char *name)
 {
-       uint8_t i;
+       uint16_t i;
        struct rte_eth_dev *eth_dev;
 
        if (rte_eth_dev_data == NULL)
@@ -286,7 +284,7 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
 }
 
 int
-rte_eth_dev_is_valid_port(uint8_t port_id)
+rte_eth_dev_is_valid_port(uint16_t port_id)
 {
        if (port_id >= RTE_MAX_ETHPORTS ||
            (rte_eth_devices[port_id].state != RTE_ETH_DEV_ATTACHED &&
@@ -297,17 +295,24 @@ rte_eth_dev_is_valid_port(uint8_t port_id)
 }
 
 int
-rte_eth_dev_socket_id(uint8_t port_id)
+rte_eth_dev_socket_id(uint16_t port_id)
 {
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -1);
        return rte_eth_devices[port_id].data->numa_node;
 }
 
-uint8_t
+void *
+rte_eth_dev_get_sec_ctx(uint8_t port_id)
+{
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, NULL);
+       return rte_eth_devices[port_id].security_ctx;
+}
+
+uint16_t
 rte_eth_dev_count(void)
 {
-       uint8_t p;
-       uint8_t count;
+       uint16_t p;
+       uint16_t count;
 
        count = 0;
 
@@ -318,9 +323,9 @@ rte_eth_dev_count(void)
 }
 
 int
-rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)
+rte_eth_dev_get_name_by_port(uint16_t port_id, char *name)
 {
-       const char *tmp;
+       char *tmp;
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
 
@@ -331,15 +336,14 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)
 
        /* shouldn't check 'rte_eth_devices[i].data',
         * because it might be overwritten by VDEV PMD */
-       tmp = rte_eth_devices[port_id].device->name;
+       tmp = rte_eth_dev_data[port_id].name;
        strcpy(name, tmp);
        return 0;
 }
 
 int
-rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id)
+rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id)
 {
-       int ret;
        int i;
 
        if (name == NULL) {
@@ -348,37 +352,20 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id)
        }
 
        RTE_ETH_FOREACH_DEV(i) {
-               if (!rte_eth_devices[i].device)
-                       continue;
+               if (!strncmp(name,
+                       rte_eth_dev_data[i].name, strlen(name))) {
 
-               ret = strncmp(name, rte_eth_devices[i].device->name,
-                               strlen(name));
-               if (ret == 0) {
                        *port_id = i;
+
                        return 0;
                }
        }
        return -ENODEV;
 }
 
-static int
-rte_eth_dev_is_detachable(uint8_t port_id)
-{
-       uint32_t dev_flags;
-
-       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
-
-       dev_flags = rte_eth_devices[port_id].data->dev_flags;
-       if ((dev_flags & RTE_ETH_DEV_DETACHABLE) &&
-               (!(dev_flags & RTE_ETH_DEV_BONDED_SLAVE)))
-               return 0;
-       else
-               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)
+rte_eth_dev_attach(const char *devargs, uint16_t *port_id)
 {
        int ret = -1;
        int current = rte_eth_dev_count();
@@ -424,21 +411,28 @@ err:
 
 /* detach the device, then store the name of the device */
 int
-rte_eth_dev_detach(uint8_t port_id, char *name)
+rte_eth_dev_detach(uint16_t port_id, char *name)
 {
+       uint32_t dev_flags;
        int ret = -1;
 
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+
        if (name == NULL) {
                ret = -EINVAL;
                goto err;
        }
 
-       /* FIXME: move this to eal, once device flags are relocated there */
-       if (rte_eth_dev_is_detachable(port_id))
+       dev_flags = rte_eth_devices[port_id].data->dev_flags;
+       if (dev_flags & RTE_ETH_DEV_BONDED_SLAVE) {
+               RTE_LOG(ERR, EAL, "Port %" PRIu16 " is bonded, cannot detach\n",
+                       port_id);
+               ret = -ENOTSUP;
                goto err;
+       }
 
-       snprintf(name, RTE_DEV_NAME_MAX_LEN, "%s",
-                rte_eth_devices[port_id].device->name);
+       snprintf(name, sizeof(rte_eth_devices[port_id].data->name),
+                "%s", rte_eth_devices[port_id].data->name);
 
        ret = rte_eal_dev_detach(rte_eth_devices[port_id].device);
        if (ret < 0)
@@ -502,7 +496,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues)
 }
 
 int
-rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id)
+rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id)
 {
        struct rte_eth_dev *dev;
 
@@ -528,7 +522,7 @@ rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id)
 }
 
 int
-rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id)
+rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id)
 {
        struct rte_eth_dev *dev;
 
@@ -554,7 +548,7 @@ rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id)
 }
 
 int
-rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id)
+rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id)
 {
        struct rte_eth_dev *dev;
 
@@ -580,7 +574,7 @@ rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id)
 }
 
 int
-rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id)
+rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id)
 {
        struct rte_eth_dev *dev;
 
@@ -715,6 +709,10 @@ rte_eth_convert_rx_offload_bitfield(const struct rte_eth_rxmode *rxmode,
                offloads |= DEV_RX_OFFLOAD_SCATTER;
        if (rxmode->enable_lro == 1)
                offloads |= DEV_RX_OFFLOAD_TCP_LRO;
+       if (rxmode->hw_timestamp == 1)
+               offloads |= DEV_RX_OFFLOAD_TIMESTAMP;
+       if (rxmode->security == 1)
+               offloads |= DEV_RX_OFFLOAD_SECURITY;
 
        *rx_offloads = offloads;
 }
@@ -763,10 +761,18 @@ rte_eth_convert_rx_offloads(const uint64_t rx_offloads,
                rxmode->enable_lro = 1;
        else
                rxmode->enable_lro = 0;
+       if (rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP)
+               rxmode->hw_timestamp = 1;
+       else
+               rxmode->hw_timestamp = 0;
+       if (rx_offloads & DEV_RX_OFFLOAD_SECURITY)
+               rxmode->security = 1;
+       else
+               rxmode->security = 0;
 }
 
 int
-rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
+rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                      const struct rte_eth_conf *dev_conf)
 {
        struct rte_eth_dev *dev;
@@ -940,7 +946,7 @@ _rte_eth_dev_reset(struct rte_eth_dev *dev)
 }
 
 static void
-rte_eth_dev_config_restore(uint8_t port_id)
+rte_eth_dev_config_restore(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
@@ -995,7 +1001,7 @@ rte_eth_dev_config_restore(uint8_t port_id)
 }
 
 int
-rte_eth_dev_start(uint8_t port_id)
+rte_eth_dev_start(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
        int diag;
@@ -1007,7 +1013,7 @@ rte_eth_dev_start(uint8_t port_id)
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP);
 
        if (dev->data->dev_started != 0) {
-               RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu8
+               RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu16
                        " already started\n",
                        port_id);
                return 0;
@@ -1029,7 +1035,7 @@ rte_eth_dev_start(uint8_t port_id)
 }
 
 void
-rte_eth_dev_stop(uint8_t port_id)
+rte_eth_dev_stop(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1039,7 +1045,7 @@ rte_eth_dev_stop(uint8_t port_id)
        RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
 
        if (dev->data->dev_started == 0) {
-               RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu8
+               RTE_PMD_DEBUG_TRACE("Device with port_id=%" PRIu16
                        " already stopped\n",
                        port_id);
                return;
@@ -1050,7 +1056,7 @@ rte_eth_dev_stop(uint8_t port_id)
 }
 
 int
-rte_eth_dev_set_link_up(uint8_t port_id)
+rte_eth_dev_set_link_up(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1063,7 +1069,7 @@ rte_eth_dev_set_link_up(uint8_t port_id)
 }
 
 int
-rte_eth_dev_set_link_down(uint8_t port_id)
+rte_eth_dev_set_link_down(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1076,7 +1082,7 @@ rte_eth_dev_set_link_down(uint8_t port_id)
 }
 
 void
-rte_eth_dev_close(uint8_t port_id)
+rte_eth_dev_close(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1096,7 +1102,7 @@ rte_eth_dev_close(uint8_t port_id)
 }
 
 int
-rte_eth_dev_reset(uint8_t port_id)
+rte_eth_dev_reset(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
        int ret;
@@ -1113,7 +1119,7 @@ rte_eth_dev_reset(uint8_t port_id)
 }
 
 int
-rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
+rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
                       uint16_t nb_rx_desc, unsigned int socket_id,
                       const struct rte_eth_rxconf *rx_conf,
                       struct rte_mempool *mp)
@@ -1264,7 +1270,7 @@ rte_eth_convert_txq_offloads(const uint64_t tx_offloads, uint32_t *txq_flags)
 }
 
 int
-rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
+rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
                       uint16_t nb_tx_desc, unsigned int socket_id,
                       const struct rte_eth_txconf *tx_conf)
 {
@@ -1384,7 +1390,7 @@ rte_eth_tx_buffer_init(struct rte_eth_dev_tx_buffer *buffer, uint16_t size)
 }
 
 int
-rte_eth_tx_done_cleanup(uint8_t port_id, uint16_t queue_id, uint32_t free_cnt)
+rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
 
@@ -1398,7 +1404,7 @@ rte_eth_tx_done_cleanup(uint8_t port_id, uint16_t queue_id, uint32_t free_cnt)
 }
 
 void
-rte_eth_promiscuous_enable(uint8_t port_id)
+rte_eth_promiscuous_enable(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1411,7 +1417,7 @@ rte_eth_promiscuous_enable(uint8_t port_id)
 }
 
 void
-rte_eth_promiscuous_disable(uint8_t port_id)
+rte_eth_promiscuous_disable(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1424,7 +1430,7 @@ rte_eth_promiscuous_disable(uint8_t port_id)
 }
 
 int
-rte_eth_promiscuous_get(uint8_t port_id)
+rte_eth_promiscuous_get(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1435,7 +1441,7 @@ rte_eth_promiscuous_get(uint8_t port_id)
 }
 
 void
-rte_eth_allmulticast_enable(uint8_t port_id)
+rte_eth_allmulticast_enable(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1448,7 +1454,7 @@ rte_eth_allmulticast_enable(uint8_t port_id)
 }
 
 void
-rte_eth_allmulticast_disable(uint8_t port_id)
+rte_eth_allmulticast_disable(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1461,7 +1467,7 @@ rte_eth_allmulticast_disable(uint8_t port_id)
 }
 
 int
-rte_eth_allmulticast_get(uint8_t port_id)
+rte_eth_allmulticast_get(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -1486,7 +1492,7 @@ rte_eth_dev_atomic_read_link_status(struct rte_eth_dev *dev,
 }
 
 void
-rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link)
+rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
@@ -1503,7 +1509,7 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link)
 }
 
 void
-rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)
+rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link)
 {
        struct rte_eth_dev *dev;
 
@@ -1520,7 +1526,7 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link)
 }
 
 int
-rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)
+rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats)
 {
        struct rte_eth_dev *dev;
 
@@ -1531,25 +1537,42 @@ rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats)
 
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP);
        stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed;
-       (*dev->dev_ops->stats_get)(dev, stats);
-       return 0;
+       return (*dev->dev_ops->stats_get)(dev, stats);
 }
 
-void
-rte_eth_stats_reset(uint8_t port_id)
+int
+rte_eth_stats_reset(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
-       RTE_ETH_VALID_PORTID_OR_RET(port_id);
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
-       RTE_FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset);
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_reset, -ENOTSUP);
        (*dev->dev_ops->stats_reset)(dev);
        dev->data->rx_mbuf_alloc_failed = 0;
+
+       return 0;
+}
+
+static inline int
+get_xstats_basic_count(struct rte_eth_dev *dev)
+{
+       uint16_t nb_rxqs, nb_txqs;
+       int count;
+
+       nb_rxqs = RTE_MIN(dev->data->nb_rx_queues, RTE_ETHDEV_QUEUE_STAT_CNTRS);
+       nb_txqs = RTE_MIN(dev->data->nb_tx_queues, RTE_ETHDEV_QUEUE_STAT_CNTRS);
+
+       count = RTE_NB_STATS;
+       count += nb_rxqs * RTE_NB_RXQ_STATS;
+       count += nb_txqs * RTE_NB_TXQ_STATS;
+
+       return count;
 }
 
 static int
-get_xstats_count(uint8_t port_id)
+get_xstats_count(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
        int count;
@@ -1569,16 +1592,14 @@ get_xstats_count(uint8_t port_id)
        } else
                count = 0;
 
-       count += RTE_NB_STATS;
-       count += RTE_MIN(dev->data->nb_rx_queues, RTE_ETHDEV_QUEUE_STAT_CNTRS) *
-                RTE_NB_RXQ_STATS;
-       count += RTE_MIN(dev->data->nb_tx_queues, RTE_ETHDEV_QUEUE_STAT_CNTRS) *
-                RTE_NB_TXQ_STATS;
+
+       count += get_xstats_basic_count(dev);
+
        return count;
 }
 
 int
-rte_eth_xstats_get_id_by_name(uint8_t port_id, const char *xstat_name,
+rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,
                uint64_t *id)
 {
        int cnt_xstats, idx_xstat;
@@ -1621,125 +1642,97 @@ rte_eth_xstats_get_id_by_name(uint8_t port_id, const char *xstat_name,
        return -EINVAL;
 }
 
+/* retrieve ethdev extended statistics names */
 int
-rte_eth_xstats_get_names_by_id(uint8_t port_id,
+rte_eth_xstats_get_names_by_id(uint16_t port_id,
        struct rte_eth_xstat_name *xstats_names, unsigned int size,
        uint64_t *ids)
 {
-       /* Get all xstats */
+       struct rte_eth_xstat_name *xstats_names_copy;
+       unsigned int no_basic_stat_requested = 1;
+       unsigned int expected_entries;
+       struct rte_eth_dev *dev;
+       unsigned int i;
+       int ret;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       dev = &rte_eth_devices[port_id];
+
+       ret = get_xstats_count(port_id);
+       if (ret < 0)
+               return ret;
+       expected_entries = (unsigned int)ret;
+
+       /* Return max number of stats if no ids given */
        if (!ids) {
-               struct rte_eth_dev *dev;
-               int cnt_used_entries;
-               int cnt_expected_entries;
-               int cnt_driver_entries;
-               uint32_t idx, id_queue;
-               uint16_t num_q;
-
-               cnt_expected_entries = get_xstats_count(port_id);
-               if (xstats_names == NULL || cnt_expected_entries < 0 ||
-                               (int)size < cnt_expected_entries)
-                       return cnt_expected_entries;
-
-               /* port_id checked in get_xstats_count() */
-               dev = &rte_eth_devices[port_id];
-               cnt_used_entries = 0;
-
-               for (idx = 0; idx < RTE_NB_STATS; idx++) {
-                       snprintf(xstats_names[cnt_used_entries].name,
-                               sizeof(xstats_names[0].name),
-                               "%s", rte_stats_strings[idx].name);
-                       cnt_used_entries++;
-               }
-               num_q = RTE_MIN(dev->data->nb_rx_queues,
-                               RTE_ETHDEV_QUEUE_STAT_CNTRS);
-               for (id_queue = 0; id_queue < num_q; id_queue++) {
-                       for (idx = 0; idx < RTE_NB_RXQ_STATS; idx++) {
-                               snprintf(xstats_names[cnt_used_entries].name,
-                                       sizeof(xstats_names[0].name),
-                                       "rx_q%u%s",
-                                       id_queue,
-                                       rte_rxq_stats_strings[idx].name);
-                               cnt_used_entries++;
-                       }
+               if (!xstats_names)
+                       return expected_entries;
+               else if (xstats_names && size < expected_entries)
+                       return expected_entries;
+       }
 
-               }
-               num_q = RTE_MIN(dev->data->nb_tx_queues,
-                               RTE_ETHDEV_QUEUE_STAT_CNTRS);
-               for (id_queue = 0; id_queue < num_q; id_queue++) {
-                       for (idx = 0; idx < RTE_NB_TXQ_STATS; idx++) {
-                               snprintf(xstats_names[cnt_used_entries].name,
-                                       sizeof(xstats_names[0].name),
-                                       "tx_q%u%s",
-                                       id_queue,
-                                       rte_txq_stats_strings[idx].name);
-                               cnt_used_entries++;
+       if (ids && !xstats_names)
+               return -EINVAL;
+
+       if (ids && dev->dev_ops->xstats_get_names_by_id != NULL && size > 0) {
+               unsigned int basic_count = get_xstats_basic_count(dev);
+               uint64_t ids_copy[size];
+
+               for (i = 0; i < size; i++) {
+                       if (ids[i] < basic_count) {
+                               no_basic_stat_requested = 0;
+                               break;
                        }
-               }
 
-               if (dev->dev_ops->xstats_get_names_by_id != NULL) {
-                       /* If there are any driver-specific xstats, append them
-                        * to end of list.
-                        */
-                       cnt_driver_entries =
-                               (*dev->dev_ops->xstats_get_names_by_id)(
-                               dev,
-                               xstats_names + cnt_used_entries,
-                               NULL,
-                               size - cnt_used_entries);
-                       if (cnt_driver_entries < 0)
-                               return cnt_driver_entries;
-                       cnt_used_entries += cnt_driver_entries;
-
-               } else if (dev->dev_ops->xstats_get_names != NULL) {
-                       /* If there are any driver-specific xstats, append them
-                        * to end of list.
+                       /*
+                        * Convert ids to xstats ids that PMD knows.
+                        * ids known by user are basic + extended stats.
                         */
-                       cnt_driver_entries = (*dev->dev_ops->xstats_get_names)(
-                               dev,
-                               xstats_names + cnt_used_entries,
-                               size - cnt_used_entries);
-                       if (cnt_driver_entries < 0)
-                               return cnt_driver_entries;
-                       cnt_used_entries += cnt_driver_entries;
+                       ids_copy[i] = ids[i] - basic_count;
                }
 
-               return cnt_used_entries;
+               if (no_basic_stat_requested)
+                       return (*dev->dev_ops->xstats_get_names_by_id)(dev,
+                                       xstats_names, ids_copy, size);
        }
-       /* Get only xstats given by IDS */
-       else {
-               uint16_t len, i;
-               struct rte_eth_xstat_name *xstats_names_copy;
 
-               len = rte_eth_xstats_get_names_by_id(port_id, NULL, 0, NULL);
+       /* Retrieve all stats */
+       if (!ids) {
+               int num_stats = rte_eth_xstats_get_names(port_id, xstats_names,
+                               expected_entries);
+               if (num_stats < 0 || num_stats > (int)expected_entries)
+                       return num_stats;
+               else
+                       return expected_entries;
+       }
 
-               xstats_names_copy =
-                               malloc(sizeof(struct rte_eth_xstat_name) * len);
-               if (!xstats_names_copy) {
-                       RTE_PMD_DEBUG_TRACE(
-                            "ERROR: can't allocate memory for values_copy\n");
-                       free(xstats_names_copy);
-                       return -1;
-               }
+       xstats_names_copy = calloc(expected_entries,
+               sizeof(struct rte_eth_xstat_name));
 
-               rte_eth_xstats_get_names_by_id(port_id, xstats_names_copy,
-                               len, NULL);
+       if (!xstats_names_copy) {
+               RTE_PMD_DEBUG_TRACE("ERROR: can't allocate memory");
+               return -ENOMEM;
+       }
 
-               for (i = 0; i < size; i++) {
-                       if (ids[i] >= len) {
-                               RTE_PMD_DEBUG_TRACE(
-                                       "ERROR: id value isn't valid\n");
-                               return -1;
-                       }
-                       strcpy(xstats_names[i].name,
-                                       xstats_names_copy[ids[i]].name);
+       /* Fill xstats_names_copy structure */
+       rte_eth_xstats_get_names(port_id, xstats_names_copy, expected_entries);
+
+       /* Filter stats */
+       for (i = 0; i < size; i++) {
+               if (ids[i] >= expected_entries) {
+                       RTE_PMD_DEBUG_TRACE("ERROR: id value isn't valid\n");
+                       free(xstats_names_copy);
+                       return -1;
                }
-               free(xstats_names_copy);
-               return size;
+               xstats_names[i] = xstats_names_copy[ids[i]];
        }
+
+       free(xstats_names_copy);
+       return size;
 }
 
 int
-rte_eth_xstats_get_names(uint8_t port_id,
+rte_eth_xstats_get_names(uint16_t port_id,
        struct rte_eth_xstat_name *xstats_names,
        unsigned int size)
 {
@@ -1805,133 +1798,80 @@ rte_eth_xstats_get_names(uint8_t port_id,
 
 /* retrieve ethdev extended statistics */
 int
-rte_eth_xstats_get_by_id(uint8_t port_id, const uint64_t *ids, uint64_t *values,
-       unsigned int n)
+rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,
+                        uint64_t *values, unsigned int size)
 {
-       /* If need all xstats */
-       if (!ids) {
-               struct rte_eth_stats eth_stats;
-               struct rte_eth_dev *dev;
-               unsigned int count = 0, i, q;
-               signed int xcount = 0;
-               uint64_t val, *stats_ptr;
-               uint16_t nb_rxqs, nb_txqs;
-
-               RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
-               dev = &rte_eth_devices[port_id];
-
-               nb_rxqs = RTE_MIN(dev->data->nb_rx_queues,
-                               RTE_ETHDEV_QUEUE_STAT_CNTRS);
-               nb_txqs = RTE_MIN(dev->data->nb_tx_queues,
-                               RTE_ETHDEV_QUEUE_STAT_CNTRS);
-
-               /* Return generic statistics */
-               count = RTE_NB_STATS + (nb_rxqs * RTE_NB_RXQ_STATS) +
-                       (nb_txqs * RTE_NB_TXQ_STATS);
-
-
-               /* implemented by the driver */
-               if (dev->dev_ops->xstats_get_by_id != NULL) {
-                       /* Retrieve the xstats from the driver at the end of the
-                        * xstats struct. Retrieve all xstats.
-                        */
-                       xcount = (*dev->dev_ops->xstats_get_by_id)(dev,
-                                       NULL,
-                                       values ? values + count : NULL,
-                                       (n > count) ? n - count : 0);
-
-                       if (xcount < 0)
-                               return xcount;
-               /* implemented by the driver */
-               } else if (dev->dev_ops->xstats_get != NULL) {
-                       /* Retrieve the xstats from the driver at the end of the
-                        * xstats struct. Retrieve all xstats.
-                        * Compatibility for PMD without xstats_get_by_ids
-                        */
-                       unsigned int size = (n > count) ? n - count : 1;
-                       struct rte_eth_xstat xstats[size];
-
-                       xcount = (*dev->dev_ops->xstats_get)(dev,
-                                       values ? xstats : NULL, size);
+       unsigned int no_basic_stat_requested = 1;
+       unsigned int num_xstats_filled;
+       uint16_t expected_entries;
+       struct rte_eth_dev *dev;
+       unsigned int i;
+       int ret;
 
-                       if (xcount < 0)
-                               return xcount;
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+       expected_entries = get_xstats_count(port_id);
+       struct rte_eth_xstat xstats[expected_entries];
+       dev = &rte_eth_devices[port_id];
 
-                       if (values != NULL)
-                               for (i = 0 ; i < (unsigned int)xcount; i++)
-                                       values[i + count] = xstats[i].value;
-               }
+       /* Return max number of stats if no ids given */
+       if (!ids) {
+               if (!values)
+                       return expected_entries;
+               else if (values && size < expected_entries)
+                       return expected_entries;
+       }
 
-               if (n < count + xcount || values == NULL)
-                       return count + xcount;
+       if (ids && !values)
+               return -EINVAL;
 
-               /* now fill the xstats structure */
-               count = 0;
-               rte_eth_stats_get(port_id, &eth_stats);
+       if (ids && dev->dev_ops->xstats_get_by_id != NULL && size) {
+               unsigned int basic_count = get_xstats_basic_count(dev);
+               uint64_t ids_copy[size];
 
-               /* global stats */
-               for (i = 0; i < RTE_NB_STATS; i++) {
-                       stats_ptr = RTE_PTR_ADD(&eth_stats,
-                                               rte_stats_strings[i].offset);
-                       val = *stats_ptr;
-                       values[count++] = val;
-               }
-
-               /* per-rxq stats */
-               for (q = 0; q < nb_rxqs; q++) {
-                       for (i = 0; i < RTE_NB_RXQ_STATS; i++) {
-                               stats_ptr = RTE_PTR_ADD(&eth_stats,
-                                           rte_rxq_stats_strings[i].offset +
-                                           q * sizeof(uint64_t));
-                               val = *stats_ptr;
-                               values[count++] = val;
+               for (i = 0; i < size; i++) {
+                       if (ids[i] < basic_count) {
+                               no_basic_stat_requested = 0;
+                               break;
                        }
-               }
 
-               /* per-txq stats */
-               for (q = 0; q < nb_txqs; q++) {
-                       for (i = 0; i < RTE_NB_TXQ_STATS; i++) {
-                               stats_ptr = RTE_PTR_ADD(&eth_stats,
-                                           rte_txq_stats_strings[i].offset +
-                                           q * sizeof(uint64_t));
-                               val = *stats_ptr;
-                               values[count++] = val;
-                       }
+                       /*
+                        * Convert ids to xstats ids that PMD knows.
+                        * ids known by user are basic + extended stats.
+                        */
+                       ids_copy[i] = ids[i] - basic_count;
                }
 
-               return count + xcount;
+               if (no_basic_stat_requested)
+                       return (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy,
+                                       values, size);
        }
-       /* Need only xstats given by IDS array */
-       else {
-               uint16_t i, size;
-               uint64_t *values_copy;
 
-               size = rte_eth_xstats_get_by_id(port_id, NULL, NULL, 0);
-
-               values_copy = malloc(sizeof(*values_copy) * size);
-               if (!values_copy) {
-                       RTE_PMD_DEBUG_TRACE(
-                           "ERROR: can't allocate memory for values_copy\n");
-                       return -1;
-               }
+       /* Fill the xstats structure */
+       ret = rte_eth_xstats_get(port_id, xstats, expected_entries);
+       if (ret < 0)
+               return ret;
+       num_xstats_filled = (unsigned int)ret;
 
-               rte_eth_xstats_get_by_id(port_id, NULL, values_copy, size);
+       /* Return all stats */
+       if (!ids) {
+               for (i = 0; i < num_xstats_filled; i++)
+                       values[i] = xstats[i].value;
+               return expected_entries;
+       }
 
-               for (i = 0; i < n; i++) {
-                       if (ids[i] >= size) {
-                               RTE_PMD_DEBUG_TRACE(
-                                       "ERROR: id value isn't valid\n");
-                               return -1;
-                       }
-                       values[i] = values_copy[ids[i]];
+       /* Filter stats */
+       for (i = 0; i < size; i++) {
+               if (ids[i] >= expected_entries) {
+                       RTE_PMD_DEBUG_TRACE("ERROR: id value isn't valid\n");
+                       return -1;
                }
-               free(values_copy);
-               return n;
+               values[i] = xstats[ids[i]].value;
        }
+       return size;
 }
 
 int
-rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstat *xstats,
+rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats,
        unsigned int n)
 {
        struct rte_eth_stats eth_stats;
@@ -2013,7 +1953,7 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstat *xstats,
 
 /* reset ethdev extended statistics */
 void
-rte_eth_xstats_reset(uint8_t port_id)
+rte_eth_xstats_reset(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -2031,7 +1971,7 @@ rte_eth_xstats_reset(uint8_t port_id)
 }
 
 static int
-set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,
+set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, uint8_t stat_idx,
                uint8_t is_rx)
 {
        struct rte_eth_dev *dev;
@@ -2047,7 +1987,7 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx,
 
 
 int
-rte_eth_dev_set_tx_queue_stats_mapping(uint8_t port_id, uint16_t tx_queue_id,
+rte_eth_dev_set_tx_queue_stats_mapping(uint16_t port_id, uint16_t tx_queue_id,
                uint8_t stat_idx)
 {
        return set_queue_stats_mapping(port_id, tx_queue_id, stat_idx,
@@ -2056,7 +1996,7 @@ rte_eth_dev_set_tx_queue_stats_mapping(uint8_t port_id, uint16_t tx_queue_id,
 
 
 int
-rte_eth_dev_set_rx_queue_stats_mapping(uint8_t port_id, uint16_t rx_queue_id,
+rte_eth_dev_set_rx_queue_stats_mapping(uint16_t port_id, uint16_t rx_queue_id,
                uint8_t stat_idx)
 {
        return set_queue_stats_mapping(port_id, rx_queue_id, stat_idx,
@@ -2064,7 +2004,7 @@ rte_eth_dev_set_rx_queue_stats_mapping(uint8_t port_id, uint16_t rx_queue_id,
 }
 
 int
-rte_eth_dev_fw_version_get(uint8_t port_id, char *fw_version, size_t fw_size)
+rte_eth_dev_fw_version_get(uint16_t port_id, char *fw_version, size_t fw_size)
 {
        struct rte_eth_dev *dev;
 
@@ -2076,7 +2016,7 @@ rte_eth_dev_fw_version_get(uint8_t port_id, char *fw_version, size_t fw_size)
 }
 
 void
-rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)
+rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info)
 {
        struct rte_eth_dev *dev;
        const struct rte_eth_desc_lim lim = {
@@ -2100,7 +2040,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)
 }
 
 int
-rte_eth_dev_get_supported_ptypes(uint8_t port_id, uint32_t ptype_mask,
+rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask,
                                 uint32_t *ptypes, int num)
 {
        int i, j;
@@ -2126,7 +2066,7 @@ rte_eth_dev_get_supported_ptypes(uint8_t port_id, uint32_t ptype_mask,
 }
 
 void
-rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)
+rte_eth_macaddr_get(uint16_t port_id, struct ether_addr *mac_addr)
 {
        struct rte_eth_dev *dev;
 
@@ -2137,7 +2077,7 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr)
 
 
 int
-rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)
+rte_eth_dev_get_mtu(uint16_t port_id, uint16_t *mtu)
 {
        struct rte_eth_dev *dev;
 
@@ -2149,7 +2089,7 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu)
 }
 
 int
-rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)
+rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu)
 {
        int ret;
        struct rte_eth_dev *dev;
@@ -2166,7 +2106,7 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)
 }
 
 int
-rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
+rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on)
 {
        struct rte_eth_dev *dev;
        int ret;
@@ -2206,7 +2146,8 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on)
 }
 
 int
-rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int on)
+rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id,
+                                   int on)
 {
        struct rte_eth_dev *dev;
 
@@ -2224,7 +2165,7 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o
 }
 
 int
-rte_eth_dev_set_vlan_ether_type(uint8_t port_id,
+rte_eth_dev_set_vlan_ether_type(uint16_t port_id,
                                enum rte_vlan_type vlan_type,
                                uint16_t tpid)
 {
@@ -2238,16 +2179,20 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id,
 }
 
 int
-rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
+rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask)
 {
        struct rte_eth_dev *dev;
        int ret = 0;
        int mask = 0;
        int cur, org = 0;
+       uint64_t orig_offloads;
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
        dev = &rte_eth_devices[port_id];
 
+       /* save original values in case of failure */
+       orig_offloads = dev->data->dev_conf.rxmode.offloads;
+
        /*check which option changed by application*/
        cur = !!(offload_mask & ETH_VLAN_STRIP_OFFLOAD);
        org = !!(dev->data->dev_conf.rxmode.offloads &
@@ -2300,13 +2245,19 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask)
         */
        rte_eth_convert_rx_offloads(dev->data->dev_conf.rxmode.offloads,
                                    &dev->data->dev_conf.rxmode);
-       (*dev->dev_ops->vlan_offload_set)(dev, mask);
+       ret = (*dev->dev_ops->vlan_offload_set)(dev, mask);
+       if (ret) {
+               /* hit an error restore  original values */
+               dev->data->dev_conf.rxmode.offloads = orig_offloads;
+               rte_eth_convert_rx_offloads(dev->data->dev_conf.rxmode.offloads,
+                                           &dev->data->dev_conf.rxmode);
+       }
 
        return ret;
 }
 
 int
-rte_eth_dev_get_vlan_offload(uint8_t port_id)
+rte_eth_dev_get_vlan_offload(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
        int ret = 0;
@@ -2330,7 +2281,7 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id)
 }
 
 int
-rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)
+rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on)
 {
        struct rte_eth_dev *dev;
 
@@ -2343,7 +2294,7 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on)
 }
 
 int
-rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
+rte_eth_dev_flow_ctrl_get(uint16_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
@@ -2355,7 +2306,7 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 }
 
 int
-rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
+rte_eth_dev_flow_ctrl_set(uint16_t port_id, struct rte_eth_fc_conf *fc_conf)
 {
        struct rte_eth_dev *dev;
 
@@ -2371,7 +2322,8 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf)
 }
 
 int
-rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc_conf)
+rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id,
+                                  struct rte_eth_pfc_conf *pfc_conf)
 {
        struct rte_eth_dev *dev;
 
@@ -2437,7 +2389,7 @@ rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf,
 }
 
 int
-rte_eth_dev_rss_reta_update(uint8_t port_id,
+rte_eth_dev_rss_reta_update(uint16_t port_id,
                            struct rte_eth_rss_reta_entry64 *reta_conf,
                            uint16_t reta_size)
 {
@@ -2463,7 +2415,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id,
 }
 
 int
-rte_eth_dev_rss_reta_query(uint8_t port_id,
+rte_eth_dev_rss_reta_query(uint16_t port_id,
                           struct rte_eth_rss_reta_entry64 *reta_conf,
                           uint16_t reta_size)
 {
@@ -2483,26 +2435,19 @@ rte_eth_dev_rss_reta_query(uint8_t port_id,
 }
 
 int
-rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)
+rte_eth_dev_rss_hash_update(uint16_t port_id,
+                           struct rte_eth_rss_conf *rss_conf)
 {
        struct rte_eth_dev *dev;
-       uint16_t rss_hash_protos;
 
        RTE_ETH_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)) {
-               RTE_PMD_DEBUG_TRACE("Invalid rss_hash_protos=0x%x\n",
-                               rss_hash_protos);
-               return -EINVAL;
-       }
        dev = &rte_eth_devices[port_id];
        RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP);
        return (*dev->dev_ops->rss_hash_update)(dev, rss_conf);
 }
 
 int
-rte_eth_dev_rss_hash_conf_get(uint8_t port_id,
+rte_eth_dev_rss_hash_conf_get(uint16_t port_id,
                              struct rte_eth_rss_conf *rss_conf)
 {
        struct rte_eth_dev *dev;
@@ -2514,7 +2459,7 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id,
 }
 
 int
-rte_eth_dev_udp_tunnel_port_add(uint8_t port_id,
+rte_eth_dev_udp_tunnel_port_add(uint16_t port_id,
                                struct rte_eth_udp_tunnel *udp_tunnel)
 {
        struct rte_eth_dev *dev;
@@ -2536,7 +2481,7 @@ rte_eth_dev_udp_tunnel_port_add(uint8_t port_id,
 }
 
 int
-rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id,
+rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id,
                                   struct rte_eth_udp_tunnel *udp_tunnel)
 {
        struct rte_eth_dev *dev;
@@ -2559,7 +2504,7 @@ rte_eth_dev_udp_tunnel_port_delete(uint8_t port_id,
 }
 
 int
-rte_eth_led_on(uint8_t port_id)
+rte_eth_led_on(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -2570,7 +2515,7 @@ rte_eth_led_on(uint8_t port_id)
 }
 
 int
-rte_eth_led_off(uint8_t port_id)
+rte_eth_led_off(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -2585,7 +2530,7 @@ rte_eth_led_off(uint8_t port_id)
  * an empty spot.
  */
 static int
-get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
+get_mac_addr_index(uint16_t port_id, const struct ether_addr *addr)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -2604,7 +2549,7 @@ get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
 static const struct ether_addr null_mac_addr;
 
 int
-rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
+rte_eth_dev_mac_addr_add(uint16_t port_id, struct ether_addr *addr,
                        uint32_t pool)
 {
        struct rte_eth_dev *dev;
@@ -2657,7 +2602,7 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr,
 }
 
 int
-rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
+rte_eth_dev_mac_addr_remove(uint16_t port_id, struct ether_addr *addr)
 {
        struct rte_eth_dev *dev;
        int index;
@@ -2686,7 +2631,7 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
 }
 
 int
-rte_eth_dev_default_mac_addr_set(uint8_t port_id, struct ether_addr *addr)
+rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct ether_addr *addr)
 {
        struct rte_eth_dev *dev;
 
@@ -2712,7 +2657,7 @@ rte_eth_dev_default_mac_addr_set(uint8_t port_id, struct ether_addr *addr)
  * an empty spot.
  */
 static int
-get_hash_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
+get_hash_mac_addr_index(uint16_t port_id, const struct ether_addr *addr)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev = &rte_eth_devices[port_id];
@@ -2731,7 +2676,7 @@ get_hash_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
 }
 
 int
-rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
+rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct ether_addr *addr,
                                uint8_t on)
 {
        int index;
@@ -2783,7 +2728,7 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr,
 }
 
 int
-rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
+rte_eth_dev_uc_all_hash_table_set(uint16_t port_id, uint8_t on)
 {
        struct rte_eth_dev *dev;
 
@@ -2795,7 +2740,7 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on)
        return (*dev->dev_ops->uc_all_hash_table_set)(dev, on);
 }
 
-int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,
+int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx,
                                        uint16_t tx_rate)
 {
        struct rte_eth_dev *dev;
@@ -2826,7 +2771,7 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx,
 }
 
 int
-rte_eth_mirror_rule_set(uint8_t port_id,
+rte_eth_mirror_rule_set(uint16_t port_id,
                        struct rte_eth_mirror_conf *mirror_conf,
                        uint8_t rule_id, uint8_t on)
 {
@@ -2864,7 +2809,7 @@ rte_eth_mirror_rule_set(uint8_t port_id,
 }
 
 int
-rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)
+rte_eth_mirror_rule_reset(uint16_t port_id, uint8_t rule_id)
 {
        struct rte_eth_dev *dev;
 
@@ -2877,7 +2822,7 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id)
 }
 
 int
-rte_eth_dev_callback_register(uint8_t port_id,
+rte_eth_dev_callback_register(uint16_t port_id,
                        enum rte_eth_event_type event,
                        rte_eth_dev_cb_fn cb_fn, void *cb_arg)
 {
@@ -2917,7 +2862,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
 }
 
 int
-rte_eth_dev_callback_unregister(uint8_t port_id,
+rte_eth_dev_callback_unregister(uint16_t port_id,
                        enum rte_eth_event_type event,
                        rte_eth_dev_cb_fn cb_fn, void *cb_arg)
 {
@@ -2989,7 +2934,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
 }
 
 int
-rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data)
+rte_eth_dev_rx_intr_ctl(uint16_t port_id, int epfd, int op, void *data)
 {
        uint32_t vec;
        struct rte_eth_dev *dev;
@@ -3041,16 +2986,11 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
        if (mz)
                return mz;
 
-       if (rte_xen_dom0_supported())
-               return rte_memzone_reserve_bounded(z_name, size, socket_id,
-                                                  0, align, RTE_PGSIZE_2M);
-       else
-               return rte_memzone_reserve_aligned(z_name, size, socket_id,
-                                                  0, align);
+       return rte_memzone_reserve_aligned(z_name, size, socket_id, 0, align);
 }
 
 int
-rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,
+rte_eth_dev_rx_intr_ctl_q(uint16_t port_id, uint16_t queue_id,
                          int epfd, int op, void *data)
 {
        uint32_t vec;
@@ -3090,7 +3030,7 @@ rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,
 }
 
 int
-rte_eth_dev_rx_intr_enable(uint8_t port_id,
+rte_eth_dev_rx_intr_enable(uint16_t port_id,
                           uint16_t queue_id)
 {
        struct rte_eth_dev *dev;
@@ -3104,7 +3044,7 @@ rte_eth_dev_rx_intr_enable(uint8_t port_id,
 }
 
 int
-rte_eth_dev_rx_intr_disable(uint8_t port_id,
+rte_eth_dev_rx_intr_disable(uint16_t port_id,
                            uint16_t queue_id)
 {
        struct rte_eth_dev *dev;
@@ -3119,7 +3059,8 @@ rte_eth_dev_rx_intr_disable(uint8_t port_id,
 
 
 int
-rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)
+rte_eth_dev_filter_supported(uint16_t port_id,
+                            enum rte_filter_type filter_type)
 {
        struct rte_eth_dev *dev;
 
@@ -3132,7 +3073,7 @@ rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type)
 }
 
 int
-rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,
+rte_eth_dev_filter_ctrl(uint16_t port_id, enum rte_filter_type filter_type,
                       enum rte_filter_op filter_op, void *arg)
 {
        struct rte_eth_dev *dev;
@@ -3145,7 +3086,7 @@ rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type,
 }
 
 void *
-rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
+rte_eth_add_rx_callback(uint16_t port_id, uint16_t queue_id,
                rte_rx_callback_fn fn, void *user_param)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
@@ -3187,7 +3128,7 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id,
 }
 
 void *
-rte_eth_add_first_rx_callback(uint8_t port_id, uint16_t queue_id,
+rte_eth_add_first_rx_callback(uint16_t port_id, uint16_t queue_id,
                rte_rx_callback_fn fn, void *user_param)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
@@ -3222,7 +3163,7 @@ rte_eth_add_first_rx_callback(uint8_t port_id, uint16_t queue_id,
 }
 
 void *
-rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
+rte_eth_add_tx_callback(uint16_t port_id, uint16_t queue_id,
                rte_tx_callback_fn fn, void *user_param)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
@@ -3265,7 +3206,7 @@ rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id,
 }
 
 int
-rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
+rte_eth_remove_rx_callback(uint16_t port_id, uint16_t queue_id,
                struct rte_eth_rxtx_callback *user_cb)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
@@ -3299,7 +3240,7 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id,
 }
 
 int
-rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
+rte_eth_remove_tx_callback(uint16_t port_id, uint16_t queue_id,
                struct rte_eth_rxtx_callback *user_cb)
 {
 #ifndef RTE_ETHDEV_RXTX_CALLBACKS
@@ -3333,7 +3274,7 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id,
 }
 
 int
-rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id,
+rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id,
        struct rte_eth_rxq_info *qinfo)
 {
        struct rte_eth_dev *dev;
@@ -3357,7 +3298,7 @@ rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id,
 }
 
 int
-rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id,
+rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id,
        struct rte_eth_txq_info *qinfo)
 {
        struct rte_eth_dev *dev;
@@ -3381,7 +3322,7 @@ rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id,
 }
 
 int
-rte_eth_dev_set_mc_addr_list(uint8_t port_id,
+rte_eth_dev_set_mc_addr_list(uint16_t port_id,
                             struct ether_addr *mc_addr_set,
                             uint32_t nb_mc_addr)
 {
@@ -3395,7 +3336,7 @@ rte_eth_dev_set_mc_addr_list(uint8_t port_id,
 }
 
 int
-rte_eth_timesync_enable(uint8_t port_id)
+rte_eth_timesync_enable(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -3407,7 +3348,7 @@ rte_eth_timesync_enable(uint8_t port_id)
 }
 
 int
-rte_eth_timesync_disable(uint8_t port_id)
+rte_eth_timesync_disable(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -3419,7 +3360,7 @@ rte_eth_timesync_disable(uint8_t port_id)
 }
 
 int
-rte_eth_timesync_read_rx_timestamp(uint8_t port_id, struct timespec *timestamp,
+rte_eth_timesync_read_rx_timestamp(uint16_t port_id, struct timespec *timestamp,
                                   uint32_t flags)
 {
        struct rte_eth_dev *dev;
@@ -3432,7 +3373,8 @@ rte_eth_timesync_read_rx_timestamp(uint8_t port_id, struct timespec *timestamp,
 }
 
 int
-rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp)
+rte_eth_timesync_read_tx_timestamp(uint16_t port_id,
+                                  struct timespec *timestamp)
 {
        struct rte_eth_dev *dev;
 
@@ -3444,7 +3386,7 @@ rte_eth_timesync_read_tx_timestamp(uint8_t port_id, struct timespec *timestamp)
 }
 
 int
-rte_eth_timesync_adjust_time(uint8_t port_id, int64_t delta)
+rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta)
 {
        struct rte_eth_dev *dev;
 
@@ -3456,7 +3398,7 @@ rte_eth_timesync_adjust_time(uint8_t port_id, int64_t delta)
 }
 
 int
-rte_eth_timesync_read_time(uint8_t port_id, struct timespec *timestamp)
+rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp)
 {
        struct rte_eth_dev *dev;
 
@@ -3468,7 +3410,7 @@ rte_eth_timesync_read_time(uint8_t port_id, struct timespec *timestamp)
 }
 
 int
-rte_eth_timesync_write_time(uint8_t port_id, const struct timespec *timestamp)
+rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp)
 {
        struct rte_eth_dev *dev;
 
@@ -3480,7 +3422,7 @@ rte_eth_timesync_write_time(uint8_t port_id, const struct timespec *timestamp)
 }
 
 int
-rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info)
+rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info)
 {
        struct rte_eth_dev *dev;
 
@@ -3492,7 +3434,7 @@ rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info)
 }
 
 int
-rte_eth_dev_get_eeprom_length(uint8_t port_id)
+rte_eth_dev_get_eeprom_length(uint16_t port_id)
 {
        struct rte_eth_dev *dev;
 
@@ -3504,7 +3446,7 @@ rte_eth_dev_get_eeprom_length(uint8_t port_id)
 }
 
 int
-rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)
+rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info)
 {
        struct rte_eth_dev *dev;
 
@@ -3516,7 +3458,7 @@ rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)
 }
 
 int
-rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)
+rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info)
 {
        struct rte_eth_dev *dev;
 
@@ -3528,7 +3470,7 @@ rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)
 }
 
 int
-rte_eth_dev_get_dcb_info(uint8_t port_id,
+rte_eth_dev_get_dcb_info(uint16_t port_id,
                             struct rte_eth_dcb_info *dcb_info)
 {
        struct rte_eth_dev *dev;
@@ -3543,7 +3485,7 @@ rte_eth_dev_get_dcb_info(uint8_t port_id,
 }
 
 int
-rte_eth_dev_l2_tunnel_eth_type_conf(uint8_t port_id,
+rte_eth_dev_l2_tunnel_eth_type_conf(uint16_t port_id,
                                    struct rte_eth_l2_tunnel_conf *l2_tunnel)
 {
        struct rte_eth_dev *dev;
@@ -3566,7 +3508,7 @@ rte_eth_dev_l2_tunnel_eth_type_conf(uint8_t port_id,
 }
 
 int
-rte_eth_dev_l2_tunnel_offload_set(uint8_t port_id,
+rte_eth_dev_l2_tunnel_offload_set(uint16_t port_id,
                                  struct rte_eth_l2_tunnel_conf *l2_tunnel,
                                  uint32_t mask,
                                  uint8_t en)
@@ -3610,7 +3552,7 @@ rte_eth_dev_adjust_nb_desc(uint16_t *nb_desc,
 }
 
 int
-rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,
+rte_eth_dev_adjust_nb_rx_tx_desc(uint16_t port_id,
                                 uint16_t *nb_rx_desc,
                                 uint16_t *nb_tx_desc)
 {
@@ -3632,3 +3574,21 @@ rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,
 
        return 0;
 }
+
+int
+rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool)
+{
+       struct rte_eth_dev *dev;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+       if (pool == NULL)
+               return -EINVAL;
+
+       dev = &rte_eth_devices[port_id];
+
+       if (*dev->dev_ops->pool_ops_supported == NULL)
+               return 1; /* all pools are supported */
+
+       return (*dev->dev_ops->pool_ops_supported)(dev, pool);
+}