X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_ether%2Frte_ethdev.c;h=024fe8b2ccf6db940aa5ea01a1033122859801cd;hb=5c9222058df7cc10fa98c13d097f85a7fa0341a3;hp=3e2b5d81bc8e7e042e4628d753d594ca70079e3a;hpb=66c594904accccb98d4a69c410649e767ed06a93;p=dpdk.git diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 3e2b5d81bc..024fe8b2cc 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -120,34 +119,34 @@ 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_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)}, }; #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)}, @@ -175,7 +174,12 @@ enum { STAT_QMAP_RX }; -static inline void +enum { + DEV_DETACHED = 0, + DEV_ATTACHED +}; + +static void rte_eth_dev_data_alloc(void) { const unsigned flags = 0; @@ -196,24 +200,39 @@ rte_eth_dev_data_alloc(void) RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); } -static struct rte_eth_dev * +struct rte_eth_dev * rte_eth_dev_allocated(const char *name) { unsigned i; - for (i = 0; i < nb_ports; i++) { - if (strcmp(rte_eth_devices[i].data->name, name) == 0) + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { + if ((rte_eth_devices[i].attached == DEV_ATTACHED) && + strcmp(rte_eth_devices[i].data->name, name) == 0) return &rte_eth_devices[i]; } return NULL; } +static uint8_t +rte_eth_dev_find_free_port(void) +{ + unsigned i; + + for (i = 0; i < RTE_MAX_ETHPORTS; i++) { + if (rte_eth_devices[i].attached == DEV_DETACHED) + return i; + } + return RTE_MAX_ETHPORTS; +} + struct rte_eth_dev * -rte_eth_dev_allocate(const char *name) +rte_eth_dev_allocate(const char *name, enum rte_eth_dev_type type) { + uint8_t port_id; struct rte_eth_dev *eth_dev; - if (nb_ports == RTE_MAX_ETHPORTS) { + port_id = rte_eth_dev_find_free_port(); + if (port_id == RTE_MAX_ETHPORTS) { PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n"); return NULL; } @@ -226,13 +245,44 @@ rte_eth_dev_allocate(const char *name) return NULL; } - eth_dev = &rte_eth_devices[nb_ports]; - eth_dev->data = &rte_eth_dev_data[nb_ports]; + eth_dev = &rte_eth_devices[port_id]; + eth_dev->data = &rte_eth_dev_data[port_id]; snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name); - eth_dev->data->port_id = nb_ports++; + eth_dev->data->port_id = port_id; + eth_dev->attached = DEV_ATTACHED; + eth_dev->dev_type = type; + nb_ports++; return eth_dev; } +static int +rte_eth_dev_create_unique_device_name(char *name, size_t size, + struct rte_pci_device *pci_dev) +{ + int ret; + + if ((name == NULL) || (pci_dev == NULL)) + return -EINVAL; + + ret = snprintf(name, size, "%d:%d.%d", + pci_dev->addr.bus, pci_dev->addr.devid, + pci_dev->addr.function); + if (ret < 0) + return ret; + return 0; +} + +int +rte_eth_dev_release_port(struct rte_eth_dev *eth_dev) +{ + if (eth_dev == NULL) + return -EINVAL; + + eth_dev->attached = 0; + nb_ports--; + return 0; +} + static int rte_eth_dev_init(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) @@ -246,17 +296,17 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, eth_drv = (struct eth_driver *)pci_drv; /* Create unique Ethernet device name using PCI address */ - snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "%d:%d.%d", - pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); + rte_eth_dev_create_unique_device_name(ethdev_name, + sizeof(ethdev_name), pci_dev); - eth_dev = rte_eth_dev_allocate(ethdev_name); + eth_dev = rte_eth_dev_allocate(ethdev_name, RTE_ETH_DEV_PCI); if (eth_dev == NULL) return -ENOMEM; if (rte_eal_process_type() == RTE_PROC_PRIMARY){ eth_dev->data->dev_private = rte_zmalloc("ethdev private structure", eth_drv->dev_private_size, - CACHE_LINE_SIZE); + RTE_CACHE_LINE_SIZE); if (eth_dev->data->dev_private == NULL) rte_panic("Cannot allocate memzone for private port data\n"); } @@ -265,7 +315,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, eth_dev->data->rx_mbuf_alloc_failed = 0; /* init user callbacks */ - TAILQ_INIT(&(eth_dev->callbacks)); + TAILQ_INIT(&(eth_dev->link_intr_cbs)); /* * Set the default MTU. @@ -273,9 +323,9 @@ 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, @@ -283,10 +333,52 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, (unsigned) pci_dev->id.device_id); if (rte_eal_process_type() == RTE_PROC_PRIMARY) rte_free(eth_dev->data->dev_private); + eth_dev->attached = DEV_DETACHED; nb_ports--; return diag; } +static int +rte_eth_dev_uninit(struct rte_pci_device *pci_dev) +{ + const struct eth_driver *eth_drv; + struct rte_eth_dev *eth_dev; + char ethdev_name[RTE_ETH_NAME_MAX_LEN]; + int ret; + + if (pci_dev == NULL) + return -EINVAL; + + /* Create unique Ethernet device name using PCI address */ + rte_eth_dev_create_unique_device_name(ethdev_name, + sizeof(ethdev_name), pci_dev); + + eth_dev = rte_eth_dev_allocated(ethdev_name); + if (eth_dev == NULL) + return -ENODEV; + + eth_drv = (const struct eth_driver *)pci_dev->driver; + + /* Invoke PMD device uninit function */ + if (*eth_drv->eth_dev_uninit) { + ret = (*eth_drv->eth_dev_uninit)(eth_dev); + if (ret) + return ret; + } + + /* free ether device */ + rte_eth_dev_release_port(eth_dev); + + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + rte_free(eth_dev->data->dev_private); + + eth_dev->pci_dev = NULL; + eth_dev->driver = NULL; + eth_dev->data = NULL; + + return 0; +} + /** * Register an Ethernet [Poll Mode] driver. * @@ -305,13 +397,24 @@ void rte_eth_driver_register(struct eth_driver *eth_drv) { eth_drv->pci_drv.devinit = rte_eth_dev_init; + eth_drv->pci_drv.devuninit = rte_eth_dev_uninit; rte_eal_pci_register(ð_drv->pci_drv); } +static int +rte_eth_dev_is_valid_port(uint8_t port_id) +{ + if (port_id >= RTE_MAX_ETHPORTS || + rte_eth_devices[port_id].attached != DEV_ATTACHED) + return 0; + else + return 1; +} + int rte_eth_dev_socket_id(uint8_t port_id) { - if (port_id >= nb_ports) + if (!rte_eth_dev_is_valid_port(port_id)) return -1; return rte_eth_devices[port_id].pci_dev->numa_node; } @@ -319,8 +422,309 @@ 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) +{ + if (!rte_eth_dev_is_valid_port(port_id)) + return RTE_ETH_DEV_UNKNOWN; + return rte_eth_devices[port_id].dev_type; +} + +static int +rte_eth_dev_save(struct rte_eth_dev *devs, size_t size) +{ + if ((devs == NULL) || + (size != sizeof(struct rte_eth_dev) * RTE_MAX_ETHPORTS)) + return -EINVAL; + + /* save current rte_eth_devices */ + memcpy(devs, rte_eth_devices, size); + return 0; +} + +static int +rte_eth_dev_get_changed_port(struct rte_eth_dev *devs, uint8_t *port_id) +{ + if ((devs == NULL) || (port_id == NULL)) + return -EINVAL; + + /* check which port was attached or detached */ + for (*port_id = 0; *port_id < RTE_MAX_ETHPORTS; (*port_id)++, devs++) { + if (rte_eth_devices[*port_id].attached ^ devs->attached) + return 0; + } + return -ENODEV; +} + +static int +rte_eth_dev_get_addr_by_port(uint8_t port_id, struct rte_pci_addr *addr) +{ + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + if (addr == NULL) { + PMD_DEBUG_TRACE("Null pointer is specified\n"); + return -EINVAL; + } + + *addr = rte_eth_devices[port_id].pci_dev->addr; + return 0; +} + +static int +rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) +{ + char *tmp; + + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + if (name == NULL) { + PMD_DEBUG_TRACE("Null pointer is specified\n"); + return -EINVAL; + } + + /* shouldn't check 'rte_eth_devices[i].data', + * because it might be overwritten by VDEV PMD */ + tmp = rte_eth_dev_data[port_id].name; + strcpy(name, tmp); + return 0; +} + +static int +rte_eth_dev_is_detachable(uint8_t port_id) +{ + uint32_t drv_flags; + + if (port_id >= RTE_MAX_ETHPORTS) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; + } + + if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) { + switch (rte_eth_devices[port_id].pci_dev->kdrv) { + case RTE_KDRV_IGB_UIO: + case RTE_KDRV_UIO_GENERIC: + break; + case RTE_KDRV_VFIO: + default: + return -ENOTSUP; + } + } + + drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags; + return !(drv_flags & RTE_PCI_DRV_DETACHABLE); +} + +/* attach the new physical device, then store port_id of the device */ +static int +rte_eth_dev_attach_pdev(struct rte_pci_addr *addr, uint8_t *port_id) +{ + uint8_t new_port_id; + struct rte_eth_dev devs[RTE_MAX_ETHPORTS]; + + if ((addr == NULL) || (port_id == NULL)) + goto err; + + /* save current port status */ + if (rte_eth_dev_save(devs, sizeof(devs))) + goto err; + /* re-construct pci_device_list */ + if (rte_eal_pci_scan()) + goto err; + /* invoke probe func of the driver can handle the new device. + * TODO: + * rte_eal_pci_probe_one() should return port_id. + * And rte_eth_dev_save() and rte_eth_dev_get_changed_port() + * should be removed. */ + if (rte_eal_pci_probe_one(addr)) + goto err; + /* get port_id enabled by above procedures */ + if (rte_eth_dev_get_changed_port(devs, &new_port_id)) + goto err; + + *port_id = new_port_id; + return 0; +err: + RTE_LOG(ERR, EAL, "Driver, cannot attach the device\n"); + return -1; +} + +/* detach the new physical device, then store pci_addr of the device */ +static int +rte_eth_dev_detach_pdev(uint8_t port_id, struct rte_pci_addr *addr) +{ + struct rte_pci_addr freed_addr; + struct rte_pci_addr vp; + + if (addr == NULL) + goto err; + + /* check whether the driver supports detach feature, or not */ + if (rte_eth_dev_is_detachable(port_id)) + goto err; + + /* get pci address by port id */ + if (rte_eth_dev_get_addr_by_port(port_id, &freed_addr)) + goto err; + + /* Zerod pci addr means the port comes from virtual device */ + vp.domain = vp.bus = vp.devid = vp.function = 0; + if (rte_eal_compare_pci_addr(&vp, &freed_addr) == 0) + goto err; + + /* invoke close func of the driver, + * also remove the device from pci_device_list */ + if (rte_eal_pci_close_one(&freed_addr)) + goto err; + + *addr = freed_addr; + return 0; +err: + RTE_LOG(ERR, EAL, "Driver, cannot detach the device\n"); + return -1; +} + +/* attach the new virtual device, then store port_id of the device */ +static int +rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id) +{ + char *name = NULL, *args = NULL; + uint8_t new_port_id; + struct rte_eth_dev devs[RTE_MAX_ETHPORTS]; + int ret = -1; + + if ((vdevargs == NULL) || (port_id == NULL)) + goto end; + + /* parse vdevargs, then retrieve device name and args */ + if (rte_eal_parse_devargs_str(vdevargs, &name, &args)) + goto end; + + /* save current port status */ + if (rte_eth_dev_save(devs, sizeof(devs))) + goto end; + /* walk around dev_driver_list to find the driver of the device, + * then invoke probe function o the driver. + * TODO: + * rte_eal_vdev_init() should return port_id, + * And rte_eth_dev_save() and rte_eth_dev_get_changed_port() + * should be removed. */ + if (rte_eal_vdev_init(name, args)) + goto end; + /* get port_id enabled by above procedures */ + if (rte_eth_dev_get_changed_port(devs, &new_port_id)) + goto end; + ret = 0; + *port_id = new_port_id; +end: + if (name) + free(name); + if (args) + free(args); + + if (ret < 0) + RTE_LOG(ERR, EAL, "Driver, cannot attach the device\n"); + return ret; +} + +/* detach the new virtual device, then store the name of the device */ +static int +rte_eth_dev_detach_vdev(uint8_t port_id, char *vdevname) +{ + char name[RTE_ETH_NAME_MAX_LEN]; + + if (vdevname == NULL) + goto err; + + /* check whether the driver supports detach feature, or not */ + if (rte_eth_dev_is_detachable(port_id)) + goto err; + + /* get device name by port id */ + if (rte_eth_dev_get_name_by_port(port_id, name)) + goto err; + /* walk around dev_driver_list to find the driver of the device, + * then invoke close function o the driver */ + if (rte_eal_vdev_uninit(name)) + goto err; + + strncpy(vdevname, name, sizeof(name)); + return 0; +err: + RTE_LOG(ERR, EAL, "Driver, cannot detach the device\n"); + return -1; +} + +/* attach the new device, then store port_id of the device */ +int +rte_eth_dev_attach(const char *devargs, uint8_t *port_id) +{ + struct rte_pci_addr addr; + + if ((devargs == NULL) || (port_id == NULL)) + return -EINVAL; + + if (eal_parse_pci_DomBDF(devargs, &addr) == 0) + return rte_eth_dev_attach_pdev(&addr, port_id); + else + return rte_eth_dev_attach_vdev(devargs, port_id); +} + +/* detach the device, then store the name of the device */ +int +rte_eth_dev_detach(uint8_t port_id, char *name) +{ + struct rte_pci_addr addr; + int ret; + + if (name == NULL) + return -EINVAL; + + if (rte_eth_dev_get_device_type(port_id) == RTE_ETH_DEV_PCI) { + ret = rte_eth_dev_get_addr_by_port(port_id, &addr); + if (ret < 0) + return ret; + + ret = rte_eth_dev_detach_pdev(port_id, &addr); + if (ret == 0) + snprintf(name, RTE_ETH_NAME_MAX_LEN, + "%04x:%02x:%02x.%d", + addr.domain, addr.bus, + addr.devid, addr.function); + + return ret; + } else + return rte_eth_dev_detach_vdev(port_id, name); +} +#else /* RTE_LIBRTE_EAL_HOTPLUG */ +int +rte_eth_dev_attach(const char *devargs __rte_unused, + uint8_t *port_id __rte_unused) +{ + RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n"); + return -1; +} + +/* detach the device, then store the name of the device */ +int +rte_eth_dev_detach(uint8_t port_id __rte_unused, + char *name __rte_unused) +{ + RTE_LOG(ERR, EAL, "Hotplug support isn't enabled\n"); + return -1; } +#endif /* RTE_LIBRTE_EAL_HOTPLUG */ static int rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) @@ -332,7 +736,7 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) if (dev->data->rx_queues == NULL) { /* first time configuration */ dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues", sizeof(dev->data->rx_queues[0]) * nb_queues, - CACHE_LINE_SIZE); + RTE_CACHE_LINE_SIZE); if (dev->data->rx_queues == NULL) { dev->data->nb_rx_queues = 0; return -(ENOMEM); @@ -345,19 +749,20 @@ rte_eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) for (i = nb_queues; i < old_nb_queues; i++) (*dev->dev_ops->rx_queue_release)(rxq[i]); rxq = rte_realloc(rxq, sizeof(rxq[0]) * nb_queues, - CACHE_LINE_SIZE); + RTE_CACHE_LINE_SIZE); if (rxq == NULL) return -(ENOMEM); - - if (nb_queues > old_nb_queues) + if (nb_queues > old_nb_queues) { + uint16_t new_qs = nb_queues - old_nb_queues; memset(rxq + old_nb_queues, 0, - sizeof(rxq[0]) * (nb_queues - old_nb_queues)); + sizeof(rxq[0]) * new_qs); + } dev->data->rx_queues = rxq; } dev->data->nb_rx_queues = nb_queues; - return (0); + return 0; } int @@ -369,7 +774,7 @@ rte_eth_dev_rx_queue_start(uint8_t port_id, uint16_t rx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -395,7 +800,7 @@ rte_eth_dev_rx_queue_stop(uint8_t port_id, uint16_t rx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -421,7 +826,7 @@ rte_eth_dev_tx_queue_start(uint8_t port_id, uint16_t tx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -447,7 +852,7 @@ rte_eth_dev_tx_queue_stop(uint8_t port_id, uint16_t tx_queue_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } @@ -474,7 +879,7 @@ 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, - CACHE_LINE_SIZE); + RTE_CACHE_LINE_SIZE); if (dev->data->tx_queues == NULL) { dev->data->nb_tx_queues = 0; return -(ENOMEM); @@ -487,19 +892,45 @@ 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, - CACHE_LINE_SIZE); + RTE_CACHE_LINE_SIZE); if (txq == NULL) - return -(ENOMEM); - - if (nb_queues > old_nb_queues) + return -ENOMEM; + if (nb_queues > old_nb_queues) { + uint16_t new_qs = nb_queues - old_nb_queues; memset(txq + old_nb_queues, 0, - sizeof(txq[0]) * (nb_queues - old_nb_queues)); + sizeof(txq[0]) * new_qs); + } dev->data->tx_queues = txq; } dev->data->nb_tx_queues = nb_queues; - return (0); + 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 @@ -510,8 +941,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, if (RTE_ETH_DEV_SRIOV(dev).active != 0) { /* check multi-queue mode */ - if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) || - (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) || + 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 */ @@ -521,11 +951,10 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, port_id, dev_conf->rxmode.mq_mode, dev_conf->txmode.mq_mode); - return (-EINVAL); + return -EINVAL; } switch (dev_conf->rxmode.mq_mode) { - case ETH_MQ_RX_VMDQ_RSS: case ETH_MQ_RX_VMDQ_DCB: case ETH_MQ_RX_VMDQ_DCB_RSS: /* DCB/RSS VMDQ in SRIOV mode, not implement yet */ @@ -533,7 +962,27 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, " SRIOV active, " "unsupported VMDQ mq_mode rx %u\n", port_id, dev_conf->rxmode.mq_mode); - return (-EINVAL); + 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; @@ -549,12 +998,10 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, " SRIOV active, " "unsupported VMDQ mq_mode tx %u\n", port_id, dev_conf->txmode.mq_mode); - return (-EINVAL); + 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; - if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1) - RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = 1; break; } @@ -564,7 +1011,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, 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); + return -EINVAL; } } else { /* For vmdb+dcb mode check our configuration before we go further */ @@ -575,7 +1022,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_rx_q " "!= %d\n", port_id, ETH_VMDQ_DCB_NUM_QUEUES); - return (-EINVAL); + return -EINVAL; } conf = &(dev_conf->rx_adv_conf.vmdq_dcb_conf); if (! (conf->nb_queue_pools == ETH_16_POOLS || @@ -583,7 +1030,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, 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); + return -EINVAL; } } if (dev_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) { @@ -593,7 +1040,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, PMD_DEBUG_TRACE("ethdev port_id=%d VMDQ+DCB, nb_tx_q " "!= %d\n", port_id, ETH_VMDQ_DCB_NUM_QUEUES); - return (-EINVAL); + return -EINVAL; } conf = &(dev_conf->tx_adv_conf.vmdq_dcb_tx_conf); if (! (conf->nb_queue_pools == ETH_16_POOLS || @@ -602,7 +1049,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, "nb_queue_pools != %d or nb_queue_pools " "!= %d\n", port_id, ETH_16_POOLS, ETH_32_POOLS); - return (-EINVAL); + return -EINVAL; } } @@ -614,7 +1061,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_rx_q " "!= %d\n", port_id, ETH_DCB_NUM_QUEUES); - return (-EINVAL); + return -EINVAL; } conf = &(dev_conf->rx_adv_conf.dcb_rx_conf); if (! (conf->nb_tcs == ETH_4_TCS || @@ -623,7 +1070,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, "nb_tcs != %d or nb_tcs " "!= %d\n", port_id, ETH_4_TCS, ETH_8_TCS); - return (-EINVAL); + return -EINVAL; } } @@ -634,7 +1081,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, PMD_DEBUG_TRACE("ethdev port_id=%d DCB, nb_tx_q " "!= %d\n", port_id, ETH_DCB_NUM_QUEUES); - return (-EINVAL); + return -EINVAL; } conf = &(dev_conf->tx_adv_conf.dcb_tx_conf); if (! (conf->nb_tcs == ETH_4_TCS || @@ -643,7 +1090,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, "nb_tcs != %d or nb_tcs " "!= %d\n", port_id, ETH_4_TCS, ETH_8_TCS); - return (-EINVAL); + return -EINVAL; } } } @@ -662,10 +1109,25 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports || port_id >= RTE_MAX_ETHPORTS) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-EINVAL); + return -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]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); @@ -674,7 +1136,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; } /* @@ -686,21 +1148,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 */ @@ -716,7 +1178,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; } } @@ -732,7 +1194,7 @@ 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); + 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" @@ -740,7 +1202,7 @@ 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)ETHER_MIN_LEN); - return (-EINVAL); + return -EINVAL; } } else { if (dev_conf->rxmode.max_rx_pkt_len < ETHER_MIN_LEN || @@ -814,7 +1276,7 @@ rte_eth_dev_config_restore(uint8_t port_id) /* add address to the hardware */ if (*dev->dev_ops->mac_addr_add && - dev->data->mac_pool_sel[i] & (1ULL << pool)) + (dev->data->mac_pool_sel[i] & (1ULL << pool))) (*dev->dev_ops->mac_addr_add)(dev, &addr, i, pool); else { PMD_DEBUG_TRACE("port %d: MAC address array not supported\n", @@ -847,10 +1309,11 @@ rte_eth_dev_start(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%" PRIu8 "\n", port_id); - return (-EINVAL); + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -EINVAL; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP); @@ -859,7 +1322,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); @@ -870,6 +1333,10 @@ rte_eth_dev_start(uint8_t port_id) rte_eth_dev_config_restore(port_id); + if (dev->data->dev_conf.intr_conf.lsc != 0) { + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->link_update, -ENOTSUP); + (*dev->dev_ops->link_update)(dev, 0); + } return 0; } @@ -882,10 +1349,11 @@ rte_eth_dev_stop(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_RET(); - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%" PRIu8 "\n", port_id); + if (!rte_eth_dev_is_valid_port(port_id)) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop); @@ -910,10 +1378,11 @@ rte_eth_dev_set_link_up(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_up, -ENOTSUP); @@ -929,10 +1398,11 @@ rte_eth_dev_set_link_down(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -EINVAL; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_down, -ENOTSUP); @@ -948,7 +1418,7 @@ rte_eth_dev_close(uint8_t port_id) * in a multi-process setup*/ PROC_PRIMARY_OR_RET(); - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } @@ -969,21 +1439,21 @@ 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 (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-EINVAL); + return -EINVAL; } + dev = &rte_eth_devices[port_id]; if (rx_queue_id >= dev->data->nb_rx_queues) { PMD_DEBUG_TRACE("Invalid RX queue_id=%d\n", rx_queue_id); - return (-EINVAL); + return -EINVAL; } if (dev->data->dev_started) { @@ -1005,10 +1475,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 " @@ -1020,7 +1489,7 @@ 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 (rx_conf == NULL) @@ -1049,14 +1518,15 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id, * in a multi-process setup*/ PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY); - if (port_id >= RTE_MAX_ETHPORTS || port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-EINVAL); + return -EINVAL; } + dev = &rte_eth_devices[port_id]; if (tx_queue_id >= dev->data->nb_tx_queues) { PMD_DEBUG_TRACE("Invalid TX queue_id=%d\n", tx_queue_id); - return (-EINVAL); + return -EINVAL; } if (dev->data->dev_started) { @@ -1082,10 +1552,11 @@ rte_eth_promiscuous_enable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_enable); @@ -1098,10 +1569,11 @@ rte_eth_promiscuous_disable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_disable); @@ -1114,7 +1586,7 @@ rte_eth_promiscuous_get(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1128,10 +1600,11 @@ rte_eth_allmulticast_enable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_enable); @@ -1144,10 +1617,11 @@ rte_eth_allmulticast_disable(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_disable); @@ -1160,7 +1634,7 @@ rte_eth_allmulticast_get(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } @@ -1188,10 +1662,11 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link *eth_link) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.intr_conf.lsc != 0) @@ -1208,10 +1683,11 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; if (dev->data->dev_conf.intr_conf.lsc != 0) @@ -1223,21 +1699,23 @@ rte_eth_link_get_nowait(uint8_t port_id, struct rte_eth_link *eth_link) } } -void +int rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return; + return -ENODEV; } + dev = &rte_eth_devices[port_id]; memset(stats, 0, sizeof(*stats)); - FUNC_PTR_OR_RET(*dev->dev_ops->stats_get); + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP); (*dev->dev_ops->stats_get)(dev, stats); stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; + return 0; } void @@ -1245,10 +1723,11 @@ rte_eth_stats_reset(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset); @@ -1266,10 +1745,11 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats, uint64_t val; char *stats_ptr; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -1; } + dev = &rte_eth_devices[port_id]; /* implemented by the driver */ @@ -1335,10 +1815,11 @@ rte_eth_xstats_reset(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; /* implemented by the driver */ @@ -1357,10 +1838,11 @@ set_queue_stats_mapping(uint8_t port_id, uint16_t queue_id, uint8_t stat_idx, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_stats_mapping_set, -ENOTSUP); @@ -1392,10 +1874,11 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); @@ -1412,10 +1895,11 @@ rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return; } + dev = &rte_eth_devices[port_id]; ether_addr_copy(&dev->data->mac_addrs[0], mac_addr); } @@ -1426,9 +1910,9 @@ rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1442,9 +1926,9 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu) int ret; struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1462,24 +1946,25 @@ rte_eth_dev_vlan_filter(uint8_t port_id, uint16_t vlan_id, int on) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } + dev = &rte_eth_devices[port_id]; if (! (dev->data->dev_conf.rxmode.hw_vlan_filter)) { PMD_DEBUG_TRACE("port %d: vlan-filtering disabled\n", port_id); - 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 @@ -1487,21 +1972,21 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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 @@ -1509,16 +1994,16 @@ rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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 @@ -1529,9 +2014,9 @@ rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask) int mask = 0; int cur, org = 0; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1574,9 +2059,9 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id) struct rte_eth_dev *dev; int ret = 0; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1598,10 +2083,11 @@ rte_eth_dev_set_vlan_pvid(uint8_t port_id, uint16_t pvid, int on) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_pvid_set, -ENOTSUP); (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on); @@ -1616,9 +2102,9 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1626,7 +2112,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t 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); + return -ENOSYS; } if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP @@ -1635,7 +2121,7 @@ rte_eth_dev_fdir_add_signature_filter(uint8_t port_id, PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); - return (-EINVAL); + return -EINVAL; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_add_signature_filter, -ENOTSUP); @@ -1650,9 +2136,9 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1660,7 +2146,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t 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); + return -ENOSYS; } if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP @@ -1669,7 +2155,7 @@ rte_eth_dev_fdir_update_signature_filter(uint8_t port_id, PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); - return (-EINVAL); + return -EINVAL; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_update_signature_filter, -ENOTSUP); @@ -1684,9 +2170,9 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1694,7 +2180,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t 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); + return -ENOSYS; } if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP @@ -1703,7 +2189,7 @@ rte_eth_dev_fdir_remove_signature_filter(uint8_t port_id, PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type source & destinations ports " \ "should be null!\n"); - return (-EINVAL); + return -EINVAL; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_remove_signature_filter, -ENOTSUP); @@ -1715,21 +2201,21 @@ rte_eth_dev_fdir_get_infos(uint8_t port_id, struct rte_eth_fdir *fdir) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + 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); + return -ENOSYS; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_infos_get, -ENOTSUP); (*dev->dev_ops->fdir_infos_get)(dev, fdir); - return (0); + return 0; } int @@ -1740,9 +2226,9 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1750,7 +2236,7 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t 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); + return -ENOSYS; } if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP @@ -1759,12 +2245,12 @@ rte_eth_dev_fdir_add_perfect_filter(uint8_t port_id, PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); - return (-EINVAL); + return -EINVAL; } /* For now IPv6 is not supported with perfect filter */ if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) - return (-ENOTSUP); + 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, @@ -1780,9 +2266,9 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1790,7 +2276,7 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t 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); + return -ENOSYS; } if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP @@ -1799,12 +2285,12 @@ rte_eth_dev_fdir_update_perfect_filter(uint8_t port_id, PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); - return (-EINVAL); + return -EINVAL; } /* For now IPv6 is not supported with perfect filter */ if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) - return (-ENOTSUP); + 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, @@ -1818,9 +2304,9 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1828,7 +2314,7 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t 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); + return -ENOSYS; } if ((fdir_filter->l4type == RTE_FDIR_L4TYPE_SCTP @@ -1837,12 +2323,12 @@ rte_eth_dev_fdir_remove_perfect_filter(uint8_t port_id, PMD_DEBUG_TRACE(" Port are meaningless for SCTP and " \ "None l4type, source & destinations ports " \ "should be null!\n"); - return (-EINVAL); + return -EINVAL; } /* For now IPv6 is not supported with perfect filter */ if (fdir_filter->iptype == RTE_FDIR_IPTYPE_IPV6) - return (-ENOTSUP); + 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, @@ -1854,15 +2340,15 @@ rte_eth_dev_fdir_set_masks(uint8_t port_id, struct rte_fdir_masks *fdir_mask) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + 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); + return -ENOSYS; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fdir_set_masks, -ENOTSUP); @@ -1874,9 +2360,9 @@ rte_eth_dev_flow_ctrl_get(uint8_t port_id, struct rte_eth_fc_conf *fc_conf) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -1890,14 +2376,14 @@ rte_eth_dev_flow_ctrl_set(uint8_t port_id, struct rte_eth_fc_conf *fc_conf) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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]; @@ -1910,24 +2396,24 @@ rte_eth_dev_priority_flow_ctrl_set(uint8_t port_id, struct rte_eth_pfc_conf *pfc { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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) { @@ -1951,7 +2437,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) @@ -1989,7 +2475,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, struct rte_eth_dev *dev; int ret; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2040,16 +2526,17 @@ rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf) struct rte_eth_dev *dev; uint16_t rss_hash_protos; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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); @@ -2062,10 +2549,11 @@ rte_eth_dev_rss_hash_conf_get(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_conf_get, -ENOTSUP); return (*dev->dev_ops->rss_hash_conf_get)(dev, rss_conf); @@ -2077,7 +2565,7 @@ rte_eth_dev_udp_tunnel_add(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } @@ -2103,10 +2591,11 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } + dev = &rte_eth_devices[port_id]; if (udp_tunnel == NULL) { @@ -2128,14 +2617,14 @@ rte_eth_led_on(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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 @@ -2143,22 +2632,22 @@ rte_eth_led_off(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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]; @@ -2173,7 +2662,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, @@ -2183,21 +2672,22 @@ rte_eth_dev_mac_addr_add(uint8_t port_id, struct ether_addr *addr, int index; uint64_t pool_mask; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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); + return -EINVAL; } index = get_mac_addr_index(port_id, addr); @@ -2206,7 +2696,7 @@ 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]; @@ -2234,17 +2724,18 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr) struct rte_eth_dev *dev; int index; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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 */ @@ -2268,10 +2759,10 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -2281,12 +2772,12 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf, 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) { 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); @@ -2296,8 +2787,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]; @@ -2323,17 +2814,17 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr, int ret; struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -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); @@ -2345,14 +2836,14 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct ether_addr *addr, if (!on) { 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; } } @@ -2376,10 +2867,10 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id, uint8_t on) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -2395,9 +2886,9 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on) struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -2407,7 +2898,7 @@ rte_eth_dev_set_vf_rx(uint8_t port_id,uint16_t vf, uint8_t on) 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); @@ -2421,9 +2912,9 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on) struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -2433,7 +2924,7 @@ rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on) 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); @@ -2446,10 +2937,10 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } dev = &rte_eth_devices[port_id]; @@ -2457,12 +2948,12 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id, uint16_t vlan_id, { PMD_DEBUG_TRACE("VF VLAN filter:invalid VLAN id=%d\n", vlan_id); - return (-EINVAL); + return -EINVAL; } 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); @@ -2477,7 +2968,7 @@ int rte_eth_set_queue_rate_limit(uint8_t port_id, uint16_t queue_idx, struct rte_eth_dev_info dev_info; struct rte_eth_link link; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("set queue rate limit:invalid port id=%d\n", port_id); return -ENODEV; @@ -2514,7 +3005,7 @@ int rte_eth_set_vf_rate_limit(uint8_t port_id, uint16_t vf, uint16_t tx_rate, if (q_msk == 0) return 0; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("set VF rate limit:invalid port id=%d\n", port_id); return -ENODEV; @@ -2548,34 +3039,34 @@ rte_eth_mirror_rule_set(uint8_t port_id, { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if (mirror_conf->rule_type_mask == 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); + 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); + 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); + return -EINVAL; } dev = &rte_eth_devices[port_id]; @@ -2589,16 +3080,16 @@ rte_eth_mirror_rule_reset(uint8_t port_id, uint8_t rule_id) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + 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); + return -EINVAL; } dev = &rte_eth_devices[port_id]; @@ -2614,10 +3105,11 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0); if (queue_id >= dev->data->nb_rx_queues) { @@ -2634,10 +3126,11 @@ rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0); @@ -2654,10 +3147,11 @@ rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return 0; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_count, 0); return (*dev->dev_ops->rx_queue_count)(dev, queue_id); @@ -2668,10 +3162,11 @@ rte_eth_rx_descriptor_done(uint8_t port_id, uint16_t queue_id, uint16_t offset) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } + dev = &rte_eth_devices[port_id]; FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_descriptor_done, -ENOTSUP); return (*dev->dev_ops->rx_descriptor_done)( \ @@ -2688,16 +3183,17 @@ rte_eth_dev_callback_register(uint8_t port_id, struct rte_eth_dev_callback *user_cb; if (!cb_fn) - return (-EINVAL); - if (port_id >= nb_ports) { + return -EINVAL; + + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-EINVAL); + return -EINVAL; } dev = &rte_eth_devices[port_id]; rte_spinlock_lock(&rte_eth_dev_cb_lock); - TAILQ_FOREACH(user_cb, &(dev->callbacks), next) { + TAILQ_FOREACH(user_cb, &(dev->link_intr_cbs), next) { if (user_cb->cb_fn == cb_fn && user_cb->cb_arg == cb_arg && user_cb->event == event) { @@ -2711,11 +3207,11 @@ rte_eth_dev_callback_register(uint8_t port_id, user_cb->cb_fn = cb_fn; user_cb->cb_arg = cb_arg; user_cb->event = event; - TAILQ_INSERT_TAIL(&(dev->callbacks), user_cb, next); + TAILQ_INSERT_TAIL(&(dev->link_intr_cbs), user_cb, next); } rte_spinlock_unlock(&rte_eth_dev_cb_lock); - return ((user_cb == NULL) ? -ENOMEM : 0); + return (user_cb == NULL) ? -ENOMEM : 0; } int @@ -2728,17 +3224,18 @@ rte_eth_dev_callback_unregister(uint8_t port_id, struct rte_eth_dev_callback *cb, *next; if (!cb_fn) - return (-EINVAL); - if (port_id >= nb_ports) { + return -EINVAL; + + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-EINVAL); + return -EINVAL; } dev = &rte_eth_devices[port_id]; rte_spinlock_lock(&rte_eth_dev_cb_lock); ret = 0; - for (cb = TAILQ_FIRST(&dev->callbacks); cb != NULL; cb = next) { + for (cb = TAILQ_FIRST(&dev->link_intr_cbs); cb != NULL; cb = next) { next = TAILQ_NEXT(cb, next); @@ -2752,7 +3249,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id, * then remove it. */ if (cb->active == 0) { - TAILQ_REMOVE(&(dev->callbacks), cb, next); + TAILQ_REMOVE(&(dev->link_intr_cbs), cb, next); rte_free(cb); } else { ret = -EAGAIN; @@ -2760,7 +3257,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id, } rte_spinlock_unlock(&rte_eth_dev_cb_lock); - return (ret); + return ret; } void @@ -2771,7 +3268,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev, struct rte_eth_dev_callback dev_cb; rte_spinlock_lock(&rte_eth_dev_cb_lock); - TAILQ_FOREACH(cb_lst, &(dev->callbacks), next) { + TAILQ_FOREACH(cb_lst, &(dev->link_intr_cbs), next) { if (cb_lst->cb_fn == NULL || cb_lst->event != event) continue; dev_cb = *cb_lst; @@ -2789,14 +3286,14 @@ int rte_eth_dev_bypass_init(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_init, -ENOTSUP); @@ -2809,14 +3306,14 @@ rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP); (*dev->dev_ops->bypass_state_show)(dev, state); @@ -2828,14 +3325,14 @@ rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_set, -ENOTSUP); @@ -2848,14 +3345,14 @@ rte_eth_dev_bypass_event_show(uint8_t port_id, uint32_t event, uint32_t *state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_state_show, -ENOTSUP); @@ -2868,14 +3365,14 @@ rte_eth_dev_bypass_event_store(uint8_t port_id, uint32_t event, uint32_t state) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_event_set, -ENOTSUP); @@ -2888,14 +3385,14 @@ rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_set, -ENOTSUP); @@ -2908,14 +3405,14 @@ rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_ver_show, -ENOTSUP); @@ -2928,14 +3425,14 @@ rte_eth_dev_bypass_wd_timeout_show(uint8_t port_id, uint32_t *wd_timeout) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_timeout_show, -ENOTSUP); @@ -2948,14 +3445,14 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return (-ENODEV); + return -ENODEV; } if ((dev= &rte_eth_devices[port_id]) == NULL) { PMD_DEBUG_TRACE("Invalid port device\n"); - return (-ENODEV); + return -ENODEV; } FUNC_PTR_OR_ERR_RET(*dev->dev_ops->bypass_wd_reset, -ENOTSUP); @@ -2965,307 +3462,169 @@ rte_eth_dev_bypass_wd_reset(uint8_t port_id) #endif int -rte_eth_dev_add_syn_filter(uint8_t port_id, - struct rte_syn_filter *filter, uint16_t rx_queue) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_syn_filter, -ENOTSUP); - return (*dev->dev_ops->add_syn_filter)(dev, filter, rx_queue); -} - -int -rte_eth_dev_remove_syn_filter(uint8_t port_id) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_syn_filter, -ENOTSUP); - return (*dev->dev_ops->remove_syn_filter)(dev); -} - -int -rte_eth_dev_get_syn_filter(uint8_t port_id, - struct rte_syn_filter *filter, uint16_t *rx_queue) -{ - struct rte_eth_dev *dev; - - if (filter == NULL || rx_queue == NULL) - return -EINVAL; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_syn_filter, -ENOTSUP); - return (*dev->dev_ops->get_syn_filter)(dev, filter, rx_queue); -} - -int -rte_eth_dev_add_ethertype_filter(uint8_t port_id, uint16_t index, - struct rte_ethertype_filter *filter, uint16_t rx_queue) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - if (filter->ethertype == ETHER_TYPE_IPv4 || - filter->ethertype == ETHER_TYPE_IPv6){ - PMD_DEBUG_TRACE("IP and IPv6 are not supported" - " in ethertype filter\n"); - return -EINVAL; - } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_ethertype_filter, -ENOTSUP); - return (*dev->dev_ops->add_ethertype_filter)(dev, index, - filter, rx_queue); -} - -int -rte_eth_dev_remove_ethertype_filter(uint8_t port_id, uint16_t index) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_ethertype_filter, -ENOTSUP); - return (*dev->dev_ops->remove_ethertype_filter)(dev, index); -} - -int -rte_eth_dev_get_ethertype_filter(uint8_t port_id, uint16_t index, - struct rte_ethertype_filter *filter, uint16_t *rx_queue) +rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type) { struct rte_eth_dev *dev; - if (filter == NULL || rx_queue == NULL) - return -EINVAL; - - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_ethertype_filter, -ENOTSUP); - return (*dev->dev_ops->get_ethertype_filter)(dev, index, - filter, rx_queue); + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); + return (*dev->dev_ops->filter_ctrl)(dev, filter_type, + RTE_ETH_FILTER_NOP, NULL); } int -rte_eth_dev_add_2tuple_filter(uint8_t port_id, uint16_t index, - struct rte_2tuple_filter *filter, uint16_t rx_queue) +rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type, + enum rte_filter_op filter_op, void *arg) { struct rte_eth_dev *dev; - if (port_id >= nb_ports) { + if (!rte_eth_dev_is_valid_port(port_id)) { PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); return -ENODEV; } - if (filter->protocol != IPPROTO_TCP && - filter->tcp_flags != 0){ - PMD_DEBUG_TRACE("tcp flags is 0x%x, but the protocol value" - " is not TCP\n", - filter->tcp_flags); - return -EINVAL; - } dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_2tuple_filter, -ENOTSUP); - return (*dev->dev_ops->add_2tuple_filter)(dev, index, filter, rx_queue); + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); + return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op, arg); } -int -rte_eth_dev_remove_2tuple_filter(uint8_t port_id, uint16_t index) +void * +rte_eth_add_rx_callback(uint8_t port_id, uint16_t queue_id, + rte_rx_callback_fn fn, void *user_param) { - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; +#ifndef RTE_ETHDEV_RXTX_CALLBACKS + rte_errno = ENOTSUP; + return NULL; +#endif + /* check input parameters */ + if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL || + queue_id >= rte_eth_devices[port_id].data->nb_rx_queues) { + rte_errno = EINVAL; + return NULL; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_2tuple_filter, -ENOTSUP); - return (*dev->dev_ops->remove_2tuple_filter)(dev, index); -} - -int -rte_eth_dev_get_2tuple_filter(uint8_t port_id, uint16_t index, - struct rte_2tuple_filter *filter, uint16_t *rx_queue) -{ - struct rte_eth_dev *dev; + struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0); - if (filter == NULL || rx_queue == NULL) - return -EINVAL; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; + if (cb == NULL) { + rte_errno = ENOMEM; + return NULL; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_2tuple_filter, -ENOTSUP); - return (*dev->dev_ops->get_2tuple_filter)(dev, index, filter, rx_queue); + cb->fn.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; + return cb; } -int -rte_eth_dev_add_5tuple_filter(uint8_t port_id, uint16_t index, - struct rte_5tuple_filter *filter, uint16_t rx_queue) +void * +rte_eth_add_tx_callback(uint8_t port_id, uint16_t queue_id, + rte_tx_callback_fn fn, void *user_param) { - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - if (filter->protocol != IPPROTO_TCP && - filter->tcp_flags != 0){ - PMD_DEBUG_TRACE("tcp flags is 0x%x, but the protocol value" - " is not TCP\n", - filter->tcp_flags); - return -EINVAL; +#ifndef RTE_ETHDEV_RXTX_CALLBACKS + rte_errno = ENOTSUP; + return NULL; +#endif + /* check input parameters */ + if (!rte_eth_dev_is_valid_port(port_id) || fn == NULL || + queue_id >= rte_eth_devices[port_id].data->nb_tx_queues) { + rte_errno = EINVAL; + return NULL; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_5tuple_filter, -ENOTSUP); - return (*dev->dev_ops->add_5tuple_filter)(dev, index, filter, rx_queue); -} - -int -rte_eth_dev_remove_5tuple_filter(uint8_t port_id, uint16_t index) -{ - struct rte_eth_dev *dev; + struct rte_eth_rxtx_callback *cb = rte_zmalloc(NULL, sizeof(*cb), 0); - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; + if (cb == NULL) { + rte_errno = ENOMEM; + return NULL; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_5tuple_filter, -ENOTSUP); - return (*dev->dev_ops->remove_5tuple_filter)(dev, index); + cb->fn.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; + return cb; } int -rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index, - struct rte_5tuple_filter *filter, uint16_t *rx_queue) +rte_eth_remove_rx_callback(uint8_t port_id, uint16_t queue_id, + struct rte_eth_rxtx_callback *user_cb) { - struct rte_eth_dev *dev; - - if (filter == NULL || rx_queue == NULL) +#ifndef RTE_ETHDEV_RXTX_CALLBACKS + 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; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_5tuple_filter, -ENOTSUP); - return (*dev->dev_ops->get_5tuple_filter)(dev, index, filter, - rx_queue); -} - -int -rte_eth_dev_add_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t rx_queue) -{ - struct rte_eth_dev *dev; + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + struct rte_eth_rxtx_callback *cb = dev->post_rx_burst_cbs[queue_id]; + struct rte_eth_rxtx_callback *prev_cb; - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; + /* Reset head pointer and remove user cb if first in the list. */ + if (cb == user_cb) { + dev->post_rx_burst_cbs[queue_id] = user_cb->next; + return 0; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_flex_filter, -ENOTSUP); - return (*dev->dev_ops->add_flex_filter)(dev, index, filter, rx_queue); -} + /* Remove the user cb from the callback list. */ + do { + prev_cb = cb; + cb = cb->next; -int -rte_eth_dev_remove_flex_filter(uint8_t port_id, uint16_t index) -{ - struct rte_eth_dev *dev; + if (cb == user_cb) { + prev_cb->next = user_cb->next; + return 0; + } - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } + } while (cb != NULL); - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_flex_filter, -ENOTSUP); - return (*dev->dev_ops->remove_flex_filter)(dev, index); + /* Callback wasn't found. */ + return -EINVAL; } int -rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t *rx_queue) +rte_eth_remove_tx_callback(uint8_t port_id, uint16_t queue_id, + struct rte_eth_rxtx_callback *user_cb) { - struct rte_eth_dev *dev; - - if (filter == NULL || rx_queue == NULL) +#ifndef RTE_ETHDEV_RXTX_CALLBACKS + 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; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_flex_filter, -ENOTSUP); - return (*dev->dev_ops->get_flex_filter)(dev, index, filter, - rx_queue); -} - -int -rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type) -{ - struct rte_eth_dev *dev; + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + struct rte_eth_rxtx_callback *cb = dev->pre_tx_burst_cbs[queue_id]; + struct rte_eth_rxtx_callback *prev_cb; - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; + /* Reset head pointer and remove user cb if first in the list. */ + if (cb == user_cb) { + dev->pre_tx_burst_cbs[queue_id] = user_cb->next; + return 0; } - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); - return (*dev->dev_ops->filter_ctrl)(dev, filter_type, - RTE_ETH_FILTER_NOP, NULL); -} + /* Remove the user cb from the callback list. */ + do { + prev_cb = cb; + cb = cb->next; -int -rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type, - enum rte_filter_op filter_op, void *arg) -{ - struct rte_eth_dev *dev; + if (cb == user_cb) { + prev_cb->next = user_cb->next; + return 0; + } - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } + } while (cb != NULL); - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); - return (*dev->dev_ops->filter_ctrl)(dev, filter_type, filter_op, arg); + /* Callback wasn't found. */ + return -EINVAL; }