X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_ether%2Frte_ethdev.c;h=39f65bfadb55c23ff6ce4d7f8a6c5d2b86bf64f2;hb=80a1deb4c77aca0ddc402c888f3c67216373f5e0;hp=f70fc7525f9eeb65732965c0bdd13688c78c1322;hpb=d8b8517893910a1136abbe761b44583b00596d5d;p=dpdk.git diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index f70fc7525f..39f65bfadb 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -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 @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -84,32 +83,49 @@ 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 retval; \ + } \ +} 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; @@ -120,34 +136,25 @@ struct rte_eth_xstats_name_off { unsigned offset; }; -static struct rte_eth_xstats_name_off rte_stats_strings[] = { - {"rx_packets", offsetof(struct rte_eth_stats, ipackets)}, - {"tx_packets", offsetof(struct rte_eth_stats, opackets)}, - {"rx_bytes", offsetof(struct rte_eth_stats, ibytes)}, - {"tx_bytes", offsetof(struct rte_eth_stats, obytes)}, - {"tx_errors", offsetof(struct rte_eth_stats, oerrors)}, - {"rx_missed_errors", offsetof(struct rte_eth_stats, imissed)}, - {"rx_crc_errors", offsetof(struct rte_eth_stats, ibadcrc)}, - {"rx_bad_length_errors", offsetof(struct rte_eth_stats, ibadlen)}, - {"rx_errors", offsetof(struct rte_eth_stats, ierrors)}, - {"alloc_rx_buff_failed", offsetof(struct rte_eth_stats, rx_nombuf)}, - {"fdir_match", offsetof(struct rte_eth_stats, fdirmatch)}, - {"fdir_miss", offsetof(struct rte_eth_stats, fdirmiss)}, - {"tx_flow_control_xon", offsetof(struct rte_eth_stats, tx_pause_xon)}, - {"rx_flow_control_xon", offsetof(struct rte_eth_stats, rx_pause_xon)}, - {"tx_flow_control_xoff", offsetof(struct rte_eth_stats, tx_pause_xoff)}, - {"rx_flow_control_xoff", offsetof(struct rte_eth_stats, rx_pause_xoff)}, +static const struct rte_eth_xstats_name_off rte_stats_strings[] = { + {"rx_packets", offsetof(struct rte_eth_stats, ipackets)}, + {"tx_packets", offsetof(struct rte_eth_stats, opackets)}, + {"rx_bytes", offsetof(struct rte_eth_stats, ibytes)}, + {"tx_bytes", offsetof(struct rte_eth_stats, obytes)}, + {"tx_errors", offsetof(struct rte_eth_stats, oerrors)}, + {"rx_errors", offsetof(struct rte_eth_stats, ierrors)}, + {"alloc_rx_buff_failed", offsetof(struct rte_eth_stats, rx_nombuf)}, }; #define RTE_NB_STATS (sizeof(rte_stats_strings) / sizeof(rte_stats_strings[0])) -static struct rte_eth_xstats_name_off rte_rxq_stats_strings[] = { +static const struct rte_eth_xstats_name_off rte_rxq_stats_strings[] = { {"rx_packets", offsetof(struct rte_eth_stats, q_ipackets)}, {"rx_bytes", offsetof(struct rte_eth_stats, q_ibytes)}, }; #define RTE_NB_RXQ_STATS (sizeof(rte_rxq_stats_strings) / \ sizeof(rte_rxq_stats_strings[0])) -static struct rte_eth_xstats_name_off rte_txq_stats_strings[] = { +static const struct rte_eth_xstats_name_off rte_txq_stats_strings[] = { {"tx_packets", offsetof(struct rte_eth_stats, q_opackets)}, {"tx_bytes", offsetof(struct rte_eth_stats, q_obytes)}, {"tx_errors", offsetof(struct rte_eth_stats, q_errors)}, @@ -180,13 +187,13 @@ enum { DEV_ATTACHED }; -static inline void +static void 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); @@ -242,7 +249,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; } @@ -256,7 +264,7 @@ rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type) return eth_dev; } -static inline int +static int rte_eth_dev_create_unique_device_name(char *name, size_t size, struct rte_pci_device *pci_dev) { @@ -279,7 +287,7 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev) if (eth_dev == NULL) return -EINVAL; - eth_dev->attached = 0; + eth_dev->attached = DEV_DETACHED; nb_ports--; return 0; } @@ -304,7 +312,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); @@ -324,18 +332,17 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, eth_dev->data->mtu = ETHER_MTU; /* Invoke PMD device initialization function */ - diag = (*eth_drv->eth_dev_init)(eth_drv, eth_dev); + diag = (*eth_drv->eth_dev_init)(eth_dev); if (diag == 0) - return (0); + 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) rte_free(eth_dev->data->dev_private); - eth_dev->attached = DEV_DETACHED; - nb_ports--; + rte_eth_dev_release_port(eth_dev); return diag; } @@ -362,7 +369,7 @@ rte_eth_dev_uninit(struct rte_pci_device *pci_dev) /* Invoke PMD device uninit function */ if (*eth_drv->eth_dev_uninit) { - ret = (*eth_drv->eth_dev_uninit)(eth_drv, eth_dev); + ret = (*eth_drv->eth_dev_uninit)(eth_dev); if (ret) return ret; } @@ -402,7 +409,7 @@ rte_eth_driver_register(struct eth_driver *eth_drv) rte_eal_pci_register(ð_drv->pci_drv); } -static int +int rte_eth_dev_is_valid_port(uint8_t port_id) { if (port_id >= RTE_MAX_ETHPORTS || @@ -423,12 +430,9 @@ rte_eth_dev_socket_id(uint8_t port_id) uint8_t rte_eth_dev_count(void) { - return (nb_ports); + 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) { @@ -466,10 +470,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"); @@ -485,10 +486,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"); @@ -507,17 +505,18 @@ rte_eth_dev_is_detachable(uint8_t port_id) { uint32_t drv_flags; - if (port_id >= RTE_MAX_ETHPORTS) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) { - switch (rte_eth_devices[port_id].pci_dev->pt_driver) { - case RTE_PT_IGB_UIO: - case RTE_PT_UIO_GENERIC: + 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_PT_VFIO: + case RTE_KDRV_VFIO: default: return -ENOTSUP; } @@ -579,14 +578,14 @@ 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; - /* invoke close func of the driver, + /* invoke devuninit func of the pci driver, * also remove the device from pci_device_list */ - if (rte_eal_pci_close_one(&freed_addr)) + if (rte_eal_pci_detach(&freed_addr)) goto err; *addr = freed_addr; @@ -656,7 +655,7 @@ rte_eth_dev_detach_vdev(uint8_t port_id, char *vdevname) if (rte_eth_dev_get_name_by_port(port_id, name)) goto err; /* walk around dev_driver_list to find the driver of the device, - * then invoke close function o the driver */ + * then invoke uninit function of the driver */ if (rte_eal_vdev_uninit(name)) goto err; @@ -708,24 +707,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) @@ -742,19 +723,6 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) dev->data->nb_rx_queues = 0; return -(ENOMEM); } -#ifdef RTE_ETHDEV_RXTX_CALLBACKS - dev->post_rx_burst_cbs = rte_zmalloc( - "ethdev->post_rx_burst_cbs", - sizeof(*dev->post_rx_burst_cbs) * nb_queues, - RTE_CACHE_LINE_SIZE); - if (dev->post_rx_burst_cbs == NULL) { - rte_free(dev->data->rx_queues); - dev->data->rx_queues = NULL; - dev->data->nb_rx_queues = 0; - return -ENOMEM; - } -#endif - } else { /* re-configure */ FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP); @@ -766,29 +734,18 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) RTE_CACHE_LINE_SIZE); if (rxq == NULL) return -(ENOMEM); -#ifdef RTE_ETHDEV_RXTX_CALLBACKS - dev->post_rx_burst_cbs = rte_realloc( - dev->post_rx_burst_cbs, - sizeof(*dev->post_rx_burst_cbs) * - nb_queues, RTE_CACHE_LINE_SIZE); - if (dev->post_rx_burst_cbs == NULL) - return -ENOMEM; -#endif if (nb_queues > old_nb_queues) { uint16_t new_qs = nb_queues - old_nb_queues; + memset(rxq + old_nb_queues, 0, sizeof(rxq[0]) * new_qs); -#ifdef RTE_ETHDEV_RXTX_CALLBACKS - memset(dev->post_rx_burst_cbs + old_nb_queues, 0, - sizeof(dev->post_rx_burst_cbs[0]) * new_qs); -#endif } dev->data->rx_queues = rxq; } dev->data->nb_rx_queues = nb_queues; - return (0); + return 0; } int @@ -800,10 +757,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) { @@ -826,10 +780,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) { @@ -852,10 +803,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) { @@ -878,10 +826,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) { @@ -904,25 +849,12 @@ 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); } -#ifdef RTE_ETHDEV_RXTX_CALLBACKS - dev->pre_tx_burst_cbs = rte_zmalloc( - "ethdev->pre_tx_burst_cbs", - sizeof(*dev->pre_tx_burst_cbs) * nb_queues, - RTE_CACHE_LINE_SIZE); - if (dev->pre_tx_burst_cbs == NULL) { - rte_free(dev->data->tx_queues); - dev->data->tx_queues = NULL; - dev->data->nb_tx_queues = 0; - return -ENOMEM; - } -#endif - } else { /* re-configure */ FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP); @@ -931,220 +863,20 @@ 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; -#ifdef RTE_ETHDEV_RXTX_CALLBACKS - dev->pre_tx_burst_cbs = rte_realloc( - dev->pre_tx_burst_cbs, - sizeof(*dev->pre_tx_burst_cbs) * - nb_queues, RTE_CACHE_LINE_SIZE); - if (dev->pre_tx_burst_cbs == NULL) - return -ENOMEM; -#endif if (nb_queues > old_nb_queues) { uint16_t new_qs = nb_queues - old_nb_queues; + memset(txq + old_nb_queues, 0, - sizeof(txq[0]) * new_qs); -#ifdef RTE_ETHDEV_RXTX_CALLBACKS - memset(dev->pre_tx_burst_cbs + old_nb_queues, 0, - sizeof(dev->pre_tx_burst_cbs[0]) * new_qs); -#endif + sizeof(txq[0]) * new_qs); } dev->data->tx_queues = txq; } dev->data->nb_tx_queues = nb_queues; - return (0); -} - -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: - RTE_ETH_DEV_SRIOV(dev).active = - ETH_64_POOLS; - break; - case 4: - RTE_ETH_DEV_SRIOV(dev).active = - ETH_32_POOLS; - break; - default: - return -EINVAL; - } - - RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = nb_rx_q; - RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx = - dev->pci_dev->max_vfs * nb_rx_q; - - return 0; -} - -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) -{ - struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - - if (RTE_ETH_DEV_SRIOV(dev).active != 0) { - /* check multi-queue mode */ - if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) || - (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB_RSS) || - (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB)) { - /* SRIOV only works in VMDq enable mode */ - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 - " SRIOV active, " - "wrong VMDQ mq_mode rx %u tx %u\n", - port_id, - dev_conf->rxmode.mq_mode, - dev_conf->txmode.mq_mode); - return (-EINVAL); - } - - switch (dev_conf->rxmode.mq_mode) { - case ETH_MQ_RX_VMDQ_DCB: - case ETH_MQ_RX_VMDQ_DCB_RSS: - /* DCB/RSS VMDQ in SRIOV mode, not implement yet */ - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 - " SRIOV active, " - "unsupported VMDQ mq_mode rx %u\n", - port_id, dev_conf->rxmode.mq_mode); - return (-EINVAL); - case ETH_MQ_RX_RSS: - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 - " SRIOV active, " - "Rx mq mode is changed from:" - "mq_mode %u into VMDQ mq_mode %u\n", - port_id, - dev_conf->rxmode.mq_mode, - dev->data->dev_conf.rxmode.mq_mode); - case ETH_MQ_RX_VMDQ_RSS: - dev->data->dev_conf.rxmode.mq_mode = ETH_MQ_RX_VMDQ_RSS; - 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); - return -EINVAL; - } - break; - default: /* ETH_MQ_RX_VMDQ_ONLY or ETH_MQ_RX_NONE */ - /* if nothing mq mode configure, use default scheme */ - dev->data->dev_conf.rxmode.mq_mode = ETH_MQ_RX_VMDQ_ONLY; - if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1) - RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = 1; - break; - } - - switch (dev_conf->txmode.mq_mode) { - case ETH_MQ_TX_VMDQ_DCB: - /* DCB VMDQ in SRIOV mode, not implement yet */ - PMD_DEBUG_TRACE("ethdev port_id=%" PRIu8 - " SRIOV active, " - "unsupported VMDQ mq_mode tx %u\n", - port_id, dev_conf->txmode.mq_mode); - return (-EINVAL); - default: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */ - /* if nothing mq mode configure, use default scheme */ - dev->data->dev_conf.txmode.mq_mode = ETH_MQ_TX_VMDQ_ONLY; - break; - } - - /* check valid queue number */ - 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); - return (-EINVAL); - } - } else { - /* For vmdb+dcb mode check our configuration before we go further */ - if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_VMDQ_DCB) { - const struct rte_eth_vmdq_dcb_conf *conf; - - if (nb_rx_q != ETH_VMDQ_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q " - "!= %d\n", - port_id, ETH_VMDQ_DCB_NUM_QUEUES); - 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)) { - 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); - return (-EINVAL); - } - } - if (dev_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) { - const struct rte_eth_vmdq_dcb_tx_conf *conf; - - if (nb_tx_q != ETH_VMDQ_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q " - "!= %d\n", - port_id, ETH_VMDQ_DCB_NUM_QUEUES); - 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)) { - PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB selected, " - "nb_queue_pools != %d or nb_queue_pools " - "!= %d\n", - port_id, ETH_16_POOLS, ETH_32_POOLS); - return (-EINVAL); - } - } - - /* For DCB mode check our configuration before we go further */ - if (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) { - const struct rte_eth_dcb_rx_conf *conf; - - if (nb_rx_q != ETH_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q " - "!= %d\n", - port_id, ETH_DCB_NUM_QUEUES); - return (-EINVAL); - } - conf = &(dev_conf->rx_adv_conf.dcb_rx_conf); - 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", - port_id, ETH_4_TCS, ETH_8_TCS); - return (-EINVAL); - } - } - - if (dev_conf->txmode.mq_mode == ETH_MQ_TX_DCB) { - const struct rte_eth_dcb_tx_conf *conf; - - if (nb_tx_q != ETH_DCB_NUM_QUEUES) { - PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q " - "!= %d\n", - port_id, ETH_DCB_NUM_QUEUES); - return (-EINVAL); - } - conf = &(dev_conf->tx_adv_conf.dcb_tx_conf); - 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", - port_id, ETH_4_TCS, ETH_8_TCS); - return (-EINVAL); - } - } - } return 0; } @@ -1160,9 +892,20 @@ 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( + "Number of RX queues requested (%u) is greater than max supported(%d)\n", + nb_rx_q, RTE_MAX_QUEUES_PER_PORT); + return -EINVAL; + } + + if (nb_tx_q > RTE_MAX_QUEUES_PER_PORT) { + PMD_DEBUG_TRACE( + "Number of TX queues requested (%u) is greater than max supported(%d)\n", + nb_tx_q, RTE_MAX_QUEUES_PER_PORT); + return -EINVAL; } dev = &rte_eth_devices[port_id]; @@ -1173,7 +916,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if (dev->data->dev_started) { PMD_DEBUG_TRACE( "port %d must be stopped to allow configuration\n", port_id); - return (-EBUSY); + return -EBUSY; } /* @@ -1185,21 +928,21 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if (nb_rx_q > dev_info.max_rx_queues) { PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n", port_id, nb_rx_q, dev_info.max_rx_queues); - return (-EINVAL); + return -EINVAL; } if (nb_rx_q == 0) { PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_q == 0\n", port_id); - return (-EINVAL); + return -EINVAL; } if (nb_tx_q > dev_info.max_tx_queues) { PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n", port_id, nb_tx_q, dev_info.max_tx_queues); - return (-EINVAL); + return -EINVAL; } if (nb_tx_q == 0) { PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_q == 0\n", port_id); - return (-EINVAL); + return -EINVAL; } /* Copy the dev_conf parameter into the dev structure */ @@ -1215,7 +958,7 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) { PMD_DEBUG_TRACE("driver %s does not support lsc\n", pci_drv->name); - return (-EINVAL); + return -EINVAL; } } @@ -1231,15 +974,14 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, port_id, (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) { + return -EINVAL; + } 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, (unsigned)dev_conf->rxmode.max_rx_pkt_len, (unsigned)ETHER_MIN_LEN); - return (-EINVAL); + return -EINVAL; } } else { if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN || @@ -1249,14 +991,6 @@ 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 */ - 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", - port_id, diag); - return diag; - } - /* * Setup new number of RX/TX queues and reconfigure device. */ @@ -1329,7 +1063,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) @@ -1346,10 +1080,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]; @@ -1359,7 +1090,7 @@ rte_eth_dev_start(uint8_t port_id) PMD_DEBUG_TRACE("Device with port_id=%" PRIu8 " already started\n", port_id); - return (0); + return 0; } diag = (*dev->dev_ops->dev_start)(dev); @@ -1386,11 +1117,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); @@ -1415,10 +1142,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]; @@ -1435,10 +1159,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]; @@ -1455,16 +1176,17 @@ 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); dev->data->dev_started = 0; (*dev->dev_ops->dev_close)(dev); + + rte_free(dev->data->rx_queues); + dev->data->rx_queues = NULL; + rte_free(dev->data->tx_queues); + dev->data->tx_queues = NULL; } int @@ -1476,22 +1198,18 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, int ret; uint32_t mbp_buf_size; struct rte_eth_dev *dev; - struct rte_pktmbuf_pool_private *mbp_priv; struct rte_eth_dev_info dev_info; /* This function is only safe when called from the primary process * 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) { PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); - return (-EINVAL); + return -EINVAL; } if (dev->data->dev_started) { @@ -1513,10 +1231,9 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, PMD_DEBUG_TRACE("%s private_data_size %d < %d\n", mp->name, (int) mp->private_data_size, (int) sizeof(struct rte_pktmbuf_pool_private)); - return (-ENOSPC); + return -ENOSPC; } - mbp_priv = rte_mempool_get_priv(mp); - mbp_buf_size = mbp_priv->mbuf_data_room_size; + mbp_buf_size = rte_pktmbuf_data_room_size(mp); if ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) { PMD_DEBUG_TRACE("%s mbuf_data_room_size %d < %d " @@ -1528,7 +1245,20 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id, dev_info.min_rx_bufsize), (int)RTE_PKTMBUF_HEADROOM, (int)dev_info.min_rx_bufsize); - return (-EINVAL); + return -EINVAL; + } + + if (nb_rx_desc > dev_info.rx_desc_lim.nb_max || + nb_rx_desc < dev_info.rx_desc_lim.nb_min || + nb_rx_desc % dev_info.rx_desc_lim.nb_align != 0) { + + PMD_DEBUG_TRACE("Invalid value for nb_rx_desc(=%hu), " + "should be: <= %hu, = %hu, and a product of %hu\n", + nb_rx_desc, + dev_info.rx_desc_lim.nb_max, + dev_info.rx_desc_lim.nb_min, + dev_info.rx_desc_lim.nb_align); + return -EINVAL; } if (rx_conf == NULL) @@ -1557,15 +1287,12 @@ 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) { PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); - return (-EINVAL); + return -EINVAL; } if (dev->data->dev_started) { @@ -1591,11 +1318,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); @@ -1608,11 +1331,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); @@ -1625,10 +1344,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; @@ -1639,11 +1355,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); @@ -1656,11 +1368,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); @@ -1673,10 +1381,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; @@ -1701,11 +1406,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) @@ -1722,11 +1423,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) @@ -1743,10 +1440,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)); @@ -1762,11 +1456,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); @@ -1780,38 +1470,43 @@ 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; + unsigned count = 0, i, q; + signed xcount = 0; + 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]; - /* implemented by the driver */ - if (dev->dev_ops->xstats_get != NULL) - return (*dev->dev_ops->xstats_get)(dev, xstats, n); - - /* else, return generic statistics */ + /* Return generic statistics */ count = RTE_NB_STATS; count += dev->data->nb_rx_queues * RTE_NB_RXQ_STATS; count += dev->data->nb_tx_queues * RTE_NB_TXQ_STATS; - if (n < count) - return count; - /* now fill the xstats structure */ + /* implemented by the driver */ + if (dev->dev_ops->xstats_get != NULL) { + /* Retrieve the xstats from the driver at the end of the + * xstats struct. + */ + xcount = (*dev->dev_ops->xstats_get)(dev, &xstats[count], + (n > count) ? n - count : 0); + + if (xcount < 0) + return xcount; + } + + if (n < count + xcount) + return count + xcount; + /* now fill the xstats structure */ count = 0; - memset(ð_stats, 0, sizeof(eth_stats)); rte_eth_stats_get(port_id, ð_stats); /* global stats */ for (i = 0; i < RTE_NB_STATS; i++) { - stats_ptr = (char *)ð_stats + rte_stats_strings[i].offset; - val = *(uint64_t *)stats_ptr; + stats_ptr = RTE_PTR_ADD(ð_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; @@ -1820,10 +1515,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 *)ð_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(ð_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); @@ -1834,10 +1529,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 *)ð_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(ð_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); @@ -1845,7 +1540,7 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats, } } - return count; + return count + xcount; } /* reset ethdev extended statistics */ @@ -1854,11 +1549,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 */ @@ -1877,10 +1568,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]; @@ -1912,15 +1600,18 @@ void rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info) { struct rte_eth_dev *dev; + const struct rte_eth_desc_lim lim = { + .nb_max = UINT16_MAX, + .nb_min = 0, + .nb_align = 1, + }; - 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)); + dev_info->rx_desc_lim = lim; + dev_info->tx_desc_lim = lim; FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get); (*dev->dev_ops->dev_infos_get)(dev, dev_info); @@ -1934,11 +1625,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); } @@ -1949,10 +1636,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; @@ -1965,11 +1649,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); @@ -1985,25 +1665,21 @@ 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); + return -ENOSYS; } if (vlan_id > 4095) { PMD_DEBUG_TRACE("(port_id=%d) invalid vlan_id=%u > 4095\n", port_id, (unsigned) vlan_id); - return (-EINVAL); + return -EINVAL; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_filter_set, -ENOTSUP); - (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on); - return (0); + + return (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on); } int @@ -2011,21 +1687,17 @@ 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); - return (-EINVAL); + return -EINVAL; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_strip_queue_set, -ENOTSUP); (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on); - return (0); + return 0; } int @@ -2033,16 +1705,12 @@ 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); - return (0); + return 0; } int @@ -2053,37 +1721,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); @@ -2098,21 +1762,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; } @@ -2122,11 +1782,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); @@ -2134,276 +1790,12 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on) return 0; } -int -rte_eth_dev_fdir_add_signature_filter(uint8_t port_id, - struct rte_fdir_filter *fdir_filter, - uint8_t queue) -{ - 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); - } - - dev = &rte_eth_devices[port_id]; - - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", - port_id, dev->data->dev_conf.fdir_conf.mode); - return (-ENOSYS); - } - - 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 " \ - "should be null!\n"); - return (-EINVAL); - } - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_signature_filter, -ENOTSUP); - return (*dev->dev_ops->fdir_add_signature_filter)(dev, fdir_filter, - queue); -} - -int -rte_eth_dev_fdir_update_signature_filter(uint8_t port_id, - struct rte_fdir_filter *fdir_filter, - uint8_t queue) -{ - 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); - } - - dev = &rte_eth_devices[port_id]; - - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", - port_id, dev->data->dev_conf.fdir_conf.mode); - return (-ENOSYS); - } - - 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 " \ - "should be null!\n"); - return (-EINVAL); - } - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_signature_filter, -ENOTSUP); - return (*dev->dev_ops->fdir_update_signature_filter)(dev, fdir_filter, - queue); - -} - -int -rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id, - struct rte_fdir_filter *fdir_filter) -{ - 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); - } - - dev = &rte_eth_devices[port_id]; - - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_SIGNATURE) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", - port_id, dev->data->dev_conf.fdir_conf.mode); - return (-ENOSYS); - } - - 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 " \ - "should be null!\n"); - return (-EINVAL); - } - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_signature_filter, -ENOTSUP); - return (*dev->dev_ops->fdir_remove_signature_filter)(dev, fdir_filter); -} - -int -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); - } - - dev = &rte_eth_devices[port_id]; - if (! (dev->data->dev_conf.fdir_conf.mode)) { - PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id); - return (-ENOSYS); - } - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_infos_get, -ENOTSUP); - - (*dev->dev_ops->fdir_infos_get)(dev, fdir); - return (0); -} - -int -rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id, - struct rte_fdir_filter *fdir_filter, - uint16_t soft_id, uint8_t queue, - uint8_t drop) -{ - 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); - } - - dev = &rte_eth_devices[port_id]; - - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", - port_id, dev->data->dev_conf.fdir_conf.mode); - return (-ENOSYS); - } - - 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 " \ - "should be null!\n"); - return (-EINVAL); - } - - /* For now IPv6 is not supported with perfect filter */ - if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) - return (-ENOTSUP); - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_perfect_filter, -ENOTSUP); - return (*dev->dev_ops->fdir_add_perfect_filter)(dev, fdir_filter, - soft_id, queue, - drop); -} - -int -rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id, - struct rte_fdir_filter *fdir_filter, - uint16_t soft_id, uint8_t queue, - uint8_t drop) -{ - 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); - } - - dev = &rte_eth_devices[port_id]; - - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", - port_id, dev->data->dev_conf.fdir_conf.mode); - return (-ENOSYS); - } - - 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 " \ - "should be null!\n"); - return (-EINVAL); - } - - /* For now IPv6 is not supported with perfect filter */ - if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) - return (-ENOTSUP); - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_perfect_filter, -ENOTSUP); - return (*dev->dev_ops->fdir_update_perfect_filter)(dev, fdir_filter, - soft_id, queue, drop); -} - -int -rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id, - struct rte_fdir_filter *fdir_filter, - uint16_t soft_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); - } - - dev = &rte_eth_devices[port_id]; - - if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { - PMD_DEBUG_TRACE("port %d: invalid FDIR mode=%u\n", - port_id, dev->data->dev_conf.fdir_conf.mode); - return (-ENOSYS); - } - - 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 " \ - "should be null!\n"); - return (-EINVAL); - } - - /* For now IPv6 is not supported with perfect filter */ - if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) - return (-ENOTSUP); - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_perfect_filter, -ENOTSUP); - return (*dev->dev_ops->fdir_remove_perfect_filter)(dev, fdir_filter, - soft_id); -} - -int -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); - } - - dev = &rte_eth_devices[port_id]; - if (! (dev->data->dev_conf.fdir_conf.mode)) { - PMD_DEBUG_TRACE("port %d: pkt-filter disabled\n", port_id); - return (-ENOSYS); - } - - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_set_masks, -ENOTSUP); - return (*dev->dev_ops->fdir_set_masks)(dev, fdir_mask); -} - int 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)); @@ -2415,14 +1807,10 @@ 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); + return -EINVAL; } dev = &rte_eth_devices[port_id]; @@ -2435,24 +1823,20 @@ 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); + return -EINVAL; } dev = &rte_eth_devices[port_id]; /* High water, low water validation are device specific */ if (*dev->dev_ops->priority_flow_ctrl_set) return (*dev->dev_ops->priority_flow_ctrl_set)(dev, pfc_conf); - return (-ENOTSUP); + return -ENOTSUP; } -static inline int +static int rte_eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size) { @@ -2476,7 +1860,7 @@ rte_eth_check_reta_mask(struct rte_eth_rss_reta_entry64 *reta_conf, return -EINVAL; } -static inline int +static int rte_eth_check_reta_entry(struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size, uint8_t max_rxq) @@ -2514,11 +1898,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) @@ -2565,17 +1945,13 @@ 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)) { PMD_DEBUG_TRACE("Invalid rss_hash_protos=0x%x\n", rss_hash_protos); - return (-EINVAL); + return -EINVAL; } dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP); @@ -2588,11 +1964,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); @@ -2604,11 +1976,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; @@ -2630,15 +1998,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; } @@ -2656,14 +2020,10 @@ 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)); + return (*dev->dev_ops->dev_led_on)(dev); } int @@ -2671,22 +2031,18 @@ 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)); + return (*dev->dev_ops->dev_led_off)(dev); } /* * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find * an empty spot. */ -static inline int -get_mac_addr_index(uint8_t port_id, struct ether_addr *addr) +static int +get_mac_addr_index(uint8_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]; @@ -2701,7 +2057,7 @@ get_mac_addr_index(uint8_t port_id, struct ether_addr *addr) return -1; } -static struct ether_addr null_mac_addr = {{0, 0, 0, 0, 0, 0}}; +static const struct ether_addr null_mac_addr; int rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr, @@ -2711,22 +2067,18 @@ 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); if (is_zero_ether_addr(addr)) { PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", port_id); - return (-EINVAL); + return -EINVAL; } if (pool >= ETH_64_POOLS) { - PMD_DEBUG_TRACE("pool id must be 0-%d\n",ETH_64_POOLS - 1); - return (-EINVAL); + PMD_DEBUG_TRACE("pool id must be 0-%d\n", ETH_64_POOLS - 1); + return -EINVAL; } index = get_mac_addr_index(port_id, addr); @@ -2735,12 +2087,12 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr, if (index < 0) { PMD_DEBUG_TRACE("port %d: MAC address array full\n", port_id); - return (-ENOSPC); + return -ENOSPC; } } 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; } @@ -2763,18 +2115,14 @@ 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); index = get_mac_addr_index(port_id, addr); if (index == 0) { PMD_DEBUG_TRACE("port %d: Cannot remove default MAC address\n", port_id); - return (-EADDRINUSE); + return -EADDRINUSE; } else if (index < 0) return 0; /* Do nothing if address wasn't found */ @@ -2790,6 +2138,27 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr) return 0; } +int +rte_eth_dev_default_mac_addr_set(uint8_t port_id, struct ether_addr *addr) +{ + struct rte_eth_dev *dev; + + VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + if (!is_valid_assigned_ether_addr(addr)) + return -EINVAL; + + dev = &rte_eth_devices[port_id]; + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_set, -ENOTSUP); + + /* Update default address in NIC data structure */ + ether_addr_copy(addr, &dev->data->mac_addrs[0]); + + (*dev->dev_ops->mac_addr_set)(dev, addr); + + return 0; +} + int rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, uint16_t rx_mode, uint8_t on) @@ -2798,25 +2167,20 @@ 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); + 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); + return -EINVAL; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_vf_rx_mode, -ENOTSUP); return (*dev->dev_ops->set_vf_rx_mode)(dev, vf, rx_mode, on); @@ -2826,8 +2190,8 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find * an empty spot. */ -static inline int -get_hash_mac_addr_index(uint8_t port_id, struct ether_addr *addr) +static int +get_hash_mac_addr_index(uint8_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]; @@ -2853,17 +2217,13 @@ 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)) { PMD_DEBUG_TRACE("port %d: Cannot add NULL MAC address\n", port_id); - return (-EINVAL); + return -EINVAL; } index = get_hash_mac_addr_index(port_id, addr); @@ -2873,16 +2233,16 @@ 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); + return -EINVAL; } index = get_hash_mac_addr_index(port_id, &null_mac_addr); if (index < 0) { PMD_DEBUG_TRACE("port %d: MAC address array full\n", port_id); - return (-ENOSPC); + return -ENOSPC; } } @@ -2906,11 +2266,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]; @@ -2919,85 +2275,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); + 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); + 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); + 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); + 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, @@ -3007,11 +2351,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); @@ -3044,11 +2384,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); @@ -3073,39 +2409,34 @@ 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); + 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); - return (-EINVAL); + 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"); - return (-EINVAL); + 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); - return (-EINVAL); + 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; } dev = &rte_eth_devices[port_id]; @@ -3119,17 +2450,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); @@ -3144,10 +2465,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); @@ -3165,10 +2483,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]; @@ -3186,10 +2501,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); @@ -3201,15 +2513,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 @@ -3222,12 +2531,9 @@ rte_eth_dev_callback_register(uint8_t port_id, struct rte_eth_dev_callback *user_cb; if (!cb_fn) - return (-EINVAL); + 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); @@ -3241,8 +2547,10 @@ 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); + if (user_cb != NULL) { user_cb->cb_fn = cb_fn; user_cb->cb_arg = cb_arg; user_cb->event = event; @@ -3250,7 +2558,7 @@ rte_eth_dev_callback_register(uint8_t port_id, } rte_spinlock_unlock(&rte_eth_dev_cb_lock); - return ((user_cb == NULL) ? -ENOMEM : 0); + return (user_cb == NULL) ? -ENOMEM : 0; } int @@ -3263,12 +2571,9 @@ rte_eth_dev_callback_unregister(uint8_t port_id, struct rte_eth_dev_callback *cb, *next; if (!cb_fn) - return (-EINVAL); + 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); @@ -3296,7 +2601,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id, } rte_spinlock_unlock(&rte_eth_dev_cb_lock); - return (ret); + return ret; } void @@ -3320,60 +2625,147 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev, } rte_spinlock_unlock(&rte_eth_dev_cb_lock); } -#ifdef RTE_NIC_BYPASS -int rte_eth_dev_bypass_init(uint8_t port_id) + +int +rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data) { + uint32_t vec; struct rte_eth_dev *dev; + struct rte_intr_handle *intr_handle; + uint16_t qid; + int rc; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + PMD_DEBUG_TRACE("Invalid port_id=%u\n", port_id); + return -ENODEV; } - if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + dev = &rte_eth_devices[port_id]; + intr_handle = &dev->pci_dev->intr_handle; + if (!intr_handle->intr_vec) { + PMD_DEBUG_TRACE("RX Intr vector unset\n"); + return -EPERM; + } + + for (qid = 0; qid < dev->data->nb_rx_queues; qid++) { + vec = intr_handle->intr_vec[qid]; + rc = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data); + if (rc && rc != -EEXIST) { + PMD_DEBUG_TRACE("p %u q %u rx ctl error" + " op %d epfd %d vec %u\n", + port_id, qid, op, epfd, vec); + } } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_init, -ENOTSUP); - (*dev->dev_ops->bypass_init)(dev); return 0; } int -rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state) +rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id, + int epfd, int op, void *data) { + uint32_t vec; struct rte_eth_dev *dev; + struct rte_intr_handle *intr_handle; + int rc; if (!rte_eth_dev_is_valid_port(port_id)) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + PMD_DEBUG_TRACE("Invalid port_id=%u\n", port_id); + return -ENODEV; } - if ((dev= &rte_eth_devices[port_id]) == NULL) { - PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + dev = &rte_eth_devices[port_id]; + if (queue_id >= dev->data->nb_rx_queues) { + PMD_DEBUG_TRACE("Invalid RX queue_id=%u\n", queue_id); + return -EINVAL; } - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP); - (*dev->dev_ops->bypass_state_show)(dev, state); + + intr_handle = &dev->pci_dev->intr_handle; + if (!intr_handle->intr_vec) { + PMD_DEBUG_TRACE("RX Intr vector unset\n"); + return -EPERM; + } + + vec = intr_handle->intr_vec[queue_id]; + rc = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data); + if (rc && rc != -EEXIST) { + PMD_DEBUG_TRACE("p %u q %u rx ctl error" + " op %d epfd %d vec %u\n", + port_id, queue_id, op, epfd, vec); + return rc; + } + return 0; } int -rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state) +rte_eth_dev_rx_intr_enable(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 (-ENODEV); + return -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->rx_queue_intr_enable, -ENOTSUP); + return (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id); +} + +int +rte_eth_dev_rx_intr_disable(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 -ENODEV; } + dev = &rte_eth_devices[port_id]; + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_intr_disable, -ENOTSUP); + return (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id); +} + +#ifdef RTE_NIC_BYPASS +int rte_eth_dev_bypass_init(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->bypass_init, -ENOTSUP); + (*dev->dev_ops->bypass_init)(dev); + return 0; +} + +int +rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state) +{ + 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->bypass_state_show, -ENOTSUP); + (*dev->dev_ops->bypass_state_show)(dev, state); + return 0; +} + +int +rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state) +{ + 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->bypass_state_set, -ENOTSUP); (*dev->dev_ops->bypass_state_set)(dev, new_state); return 0; @@ -3384,16 +2776,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; @@ -3404,15 +2789,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); @@ -3424,15 +2803,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); @@ -3444,15 +2817,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); @@ -3464,15 +2831,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); @@ -3484,15 +2845,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); @@ -3505,10 +2860,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); @@ -3522,10 +2874,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); @@ -3534,7 +2883,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_rxtx_callback_fn fn, void *user_param) + rte_rx_callback_fn fn, void *user_param) { #ifndef RTE_ETHDEV_RXTX_CALLBACKS rte_errno = ENOTSUP; @@ -3554,16 +2903,28 @@ rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id, return NULL; } - cb->fn = fn; + 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; } void * rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id, - rte_rxtx_callback_fn fn, void *user_param) + rte_tx_callback_fn fn, void *user_param) { #ifndef RTE_ETHDEV_RXTX_CALLBACKS rte_errno = ENOTSUP; @@ -3583,10 +2944,22 @@ rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id, return NULL; } - cb->fn = fn; + 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; } @@ -3595,12 +2968,12 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id, struct rte_eth_rxtx_callback *user_cb) { #ifndef RTE_ETHDEV_RXTX_CALLBACKS - return (-ENOTSUP); + return -ENOTSUP; #endif /* Check input parameters. */ if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL || queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) { - return (-EINVAL); + return -EINVAL; } struct rte_eth_dev *dev = &rte_eth_devices[port_id]; @@ -3626,7 +2999,7 @@ rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id, } while (cb != NULL); /* Callback wasn't found. */ - return (-EINVAL); + return -EINVAL; } int @@ -3634,12 +3007,12 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id, struct rte_eth_rxtx_callback *user_cb) { #ifndef RTE_ETHDEV_RXTX_CALLBACKS - return (-ENOTSUP); + return -ENOTSUP; #endif /* Check input parameters. */ if (!rte_eth_dev_is_valid_port(port_id) || user_cb == NULL || queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) { - return (-EINVAL); + return -EINVAL; } struct rte_eth_dev *dev = &rte_eth_devices[port_id]; @@ -3665,5 +3038,194 @@ rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id, } while (cb != NULL); /* Callback wasn't found. */ - return (-EINVAL); + return -EINVAL; +} + +int +rte_eth_rx_queue_info_get(uint8_t port_id, uint16_t queue_id, + struct rte_eth_rxq_info *qinfo) +{ + struct rte_eth_dev *dev; + + VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + if (qinfo == NULL) + return -EINVAL; + + dev = &rte_eth_devices[port_id]; + if (queue_id >= dev->data->nb_rx_queues) { + PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", queue_id); + return -EINVAL; + } + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rxq_info_get, -ENOTSUP); + + memset(qinfo, 0, sizeof(*qinfo)); + dev->dev_ops->rxq_info_get(dev, queue_id, qinfo); + return 0; +} + +int +rte_eth_tx_queue_info_get(uint8_t port_id, uint16_t queue_id, + struct rte_eth_txq_info *qinfo) +{ + struct rte_eth_dev *dev; + + VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + + if (qinfo == NULL) + return -EINVAL; + + dev = &rte_eth_devices[port_id]; + if (queue_id >= dev->data->nb_tx_queues) { + PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", queue_id); + return -EINVAL; + } + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->txq_info_get, -ENOTSUP); + + memset(qinfo, 0, sizeof(*qinfo)); + dev->dev_ops->txq_info_get(dev, queue_id, qinfo); + return 0; +} + +int +rte_eth_dev_set_mc_addr_list(uint8_t port_id, + struct ether_addr *mc_addr_set, + uint32_t nb_mc_addr) +{ + 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->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); +} + +int +rte_eth_dev_get_reg_length(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->get_reg_length, -ENOTSUP); + return (*dev->dev_ops->get_reg_length)(dev); +} + +int +rte_eth_dev_get_reg_info(uint8_t port_id, struct rte_dev_reg_info *info) +{ + 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->get_reg, -ENOTSUP); + return (*dev->dev_ops->get_reg)(dev, info); +} + +int +rte_eth_dev_get_eeprom_length(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->get_eeprom_length, -ENOTSUP); + return (*dev->dev_ops->get_eeprom_length)(dev); +} + +int +rte_eth_dev_get_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info) +{ + 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->get_eeprom, -ENOTSUP); + return (*dev->dev_ops->get_eeprom)(dev, info); +} + +int +rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info) +{ + 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->set_eeprom, -ENOTSUP); + return (*dev->dev_ops->set_eeprom)(dev, info); +} + +int +rte_eth_dev_get_dcb_info(uint8_t port_id, + struct rte_eth_dcb_info *dcb_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 -ENODEV; + } + + dev = &rte_eth_devices[port_id]; + memset(dcb_info, 0, sizeof(struct rte_eth_dcb_info)); + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_dcb_info, -ENOTSUP); + return (*dev->dev_ops->get_dcb_info)(dev, dcb_info); }