> -----Original Message-----
> From: Tetsuya Mukawa [mailto:mukawa at igel.co.jp]
> Sent: Monday, February 9, 2015 8:30 AM
> To: dev at dpdk.org
> Cc: Iremonger, Bernard; Qiu, Michael; Tetsuya Mukawa
> Subject: [PATCH v7 03/14] eal/pci,ethdev: Remove assumption that port will
> not be detached
>
> To remove assumption, do like followings.
>
> This patch adds "RTE_PCI_DRV_DETACHABLE" to drv_flags of rte_pci_driver
> structure. The flags
> indicate the driver can detach devices at runtime.
> Also, remove assumption that port will not be detached.
>
> To remove the assumption.
> - Add 'attached' member to rte_eth_dev structure.
> This member is used for indicating the port is attached, or not.
> - Add rte_eth_dev_allocate_new_port().
> This function is used for allocating new port.
>
> v5:
> - Change parameters of rte_eth_dev_validate_port() to cleanup code.
> v4:
> - Use braces with 'for' loop.
> - Fix indent of 'if' statement.
>
> Signed-off-by: Tetsuya Mukawa <mukawa at igel.co.jp>
> ---
> lib/librte_eal/common/include/rte_pci.h | 2 +
> lib/librte_ether/rte_ethdev.c | 454
> +++++++++++++-------------------
> lib/librte_ether/rte_ethdev.h | 5 +
> 3 files changed, 186 insertions(+), 275 deletions(-)
>
> diff --git a/lib/librte_eal/common/include/rte_pci.h
> b/lib/librte_eal/common/include/rte_pci.h
> index 7b48b55..7f2d699 100644
> --- a/lib/librte_eal/common/include/rte_pci.h
> +++ b/lib/librte_eal/common/include/rte_pci.h
> @@ -207,6 +207,8 @@ struct rte_pci_driver { #define RTE_PCI_DRV_FORCE_UNBIND
> 0x0004
> /** Device driver supports link state interrupt */
> #define RTE_PCI_DRV_INTR_LSC 0x0008
> +/** Device driver supports detaching capability */
> +#define RTE_PCI_DRV_DETACHABLE 0x0010
>
> /**< Internal use only - Macro used by pci addr parsing functions **/
> #define GET_PCIADDR_FIELD(in, fd, lim, dlm) \
> diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
> index ea3a1fb..d70854f
> 100644
> --- a/lib/librte_ether/rte_ethdev.c
> +++ b/lib/librte_ether/rte_ethdev.c
> @@ -175,6 +175,16 @@ enum {
> STAT_QMAP_RX
> };
>
> +enum {
> + DEV_INVALID = 0,
> + DEV_VALID,
> +};
> +
> +enum {
> + DEV_DISCONNECTED = 0,
> + DEV_CONNECTED
> +};
> +
> static inline void
> rte_eth_dev_data_alloc(void)
> {
> @@ -201,19 +211,34 @@ 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_CONNECTED) &&
> + strcmp(rte_eth_devices[i].data->name, name) == 0)
> return &rte_eth_devices[i];
> }
> return NULL;
> }
>
> +static uint8_t
> +rte_eth_dev_allocate_new_port(void)
> +{
> + unsigned i;
> +
> + for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
> + if (rte_eth_devices[i].attached == DEV_DISCONNECTED)
> + return i;
> + }
> + return RTE_MAX_ETHPORTS;
> +}
> +
> struct rte_eth_dev *
> rte_eth_dev_allocate(const char *name)
> {
> + uint8_t port_id;
> struct rte_eth_dev *eth_dev;
>
> - if (nb_ports == RTE_MAX_ETHPORTS) {
> + port_id = rte_eth_dev_allocate_new_port();
> + if (port_id == RTE_MAX_ETHPORTS) {
> PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n");
> return NULL;
> }
> @@ -226,10 +251,12 @@ 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_CONNECTED;
> + nb_ports++;
> return eth_dev;
> }
>
> @@ -283,6 +310,7 @@ 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_DISCONNECTED;
> nb_ports--;
> return diag;
> }
> @@ -308,10 +336,28 @@ rte_eth_driver_register(struct eth_driver *eth_drv)
> rte_eal_pci_register(ð_drv->pci_drv);
> }
>
> +enum {
> + NONE_TRACE = 0,
Hi Tetsuya,
NO_TRACE would be clearer that NONE_TRACE
Regards,
Bernard.
> + TRACE
> +};
> +
> +static int
> +rte_eth_dev_validate_port(uint8_t port_id, int trace) {
> + if (port_id >= RTE_MAX_ETHPORTS ||
> + rte_eth_devices[port_id].attached != DEV_CONNECTED) {
> + if (trace) {
> + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + }
> + return DEV_INVALID;
> + } else
> + return DEV_VALID;
> +}
> +
> int
> rte_eth_dev_socket_id(uint8_t port_id)
> {
> - if (port_id >= nb_ports)
> + if (rte_eth_dev_validate_port(port_id, NONE_TRACE) == DEV_INVALID)
> return -1;
> return rte_eth_devices[port_id].pci_dev->numa_node;
> }
> @@ -369,10 +415,8 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -EINVAL;
> - }
>
> dev = &rte_eth_devices[port_id];
> if (rx_queue_id >= dev->data->nb_rx_queues) { @@ -395,10 +439,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -EINVAL;
> - }
>
> dev = &rte_eth_devices[port_id];
> if (rx_queue_id >= dev->data->nb_rx_queues) { @@ -421,10 +463,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -EINVAL;
> - }
>
> dev = &rte_eth_devices[port_id];
> if (tx_queue_id >= dev->data->nb_tx_queues) { @@ -447,10 +487,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -EINVAL;
> - }
>
> dev = &rte_eth_devices[port_id];
> if (tx_queue_id >= dev->data->nb_tx_queues) { @@ -703,10 +741,9 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-EINVAL);
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); @@ -888,10
> +925,9
> @@ rte_eth_dev_start(uint8_t port_id)
> * in a multi-process setup*/
> PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%" PRIu8 "\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-EINVAL);
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_start, -ENOTSUP); @@ -923,10
> +959,9 @@
> 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_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
> @@ -951,10 +986,9 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -EINVAL;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_up, -ENOTSUP); @@
> -970,10
> +1004,9 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -EINVAL;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_set_link_down, -ENOTSUP); @@
> -989,10
> +1022,8 @@ rte_eth_dev_close(uint8_t port_id)
> * in a multi-process setup*/
> PROC_PRIMARY_OR_RET();
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1017,10 +1048,9 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t
> rx_queue_id,
> * in a multi-process setup*/
> PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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); @@
> -1090,10
> +1120,9 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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); @@
> -1123,10
> +1152,9 @@ rte_eth_promiscuous_enable(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_enable);
> @@ -1139,10 +1167,9 @@ rte_eth_promiscuous_disable(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_RET(*dev->dev_ops->promiscuous_disable);
> @@ -1155,10 +1182,8 @@ rte_eth_promiscuous_get(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -1;
> - }
>
> dev = &rte_eth_devices[port_id];
> return dev->data->promiscuous;
> @@ -1169,10 +1194,9 @@ rte_eth_allmulticast_enable(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_enable);
> @@ -1185,10 +1209,9 @@ rte_eth_allmulticast_disable(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_RET(*dev->dev_ops->allmulticast_disable);
> @@ -1201,10 +1224,8 @@ rte_eth_allmulticast_get(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -1;
> - }
>
> dev = &rte_eth_devices[port_id];
> return dev->data->all_multicast;
> @@ -1229,10 +1250,9 @@ rte_eth_link_get(uint8_t port_id, struct rte_eth_link
> *eth_link) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> if (dev->data->dev_conf.intr_conf.lsc != 0) @@ -1249,10 +1269,9 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> if (dev->data->dev_conf.intr_conf.lsc != 0) @@ -1269,10 +1288,9 @@
> rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
> memset(stats, 0, sizeof(*stats));
>
> @@ -1286,10 +1304,9 @@ rte_eth_stats_reset(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset);
> @@ -1307,10 +1324,9 @@ rte_eth_xstats_get(uint8_t port_id, struct
> rte_eth_xstats *xstats,
> uint64_t val;
> char *stats_ptr;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -1;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> /* implemented by the driver */
> @@ -1376,10 +1392,9 @@ rte_eth_xstats_reset(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> /* implemented by the driver */
> @@ -1398,10 +1413,9 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_stats_mapping_set, -ENOTSUP);
> @@ -
> 1433,10 +1447,9 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); @@ -1453,10
> +1466,9 @@
> rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return;
> - }
> +
> dev = &rte_eth_devices[port_id];
> ether_addr_copy(&dev->data->mac_addrs[0], mac_addr); } @@ -1467,10
> +1479,8 @@
> rte_eth_dev_get_mtu(uint8_t port_id, uint16_t *mtu) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> *mtu = dev->data->mtu;
> @@ -1483,10 +1493,8 @@ rte_eth_dev_set_mtu(uint8_t port_id, uint16_t mtu)
> int ret;
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mtu_set, -ENOTSUP); @@ -1503,10
> +1511,9 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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);
> @@ -1528,10
> +1535,8 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> if (rx_queue_id >= dev->data->nb_rx_queues) { @@ -1550,10 +1555,8 @@
> rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); @@
> -1570,10 +1573,8
> @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1615,10 +1616,8 @@ rte_eth_dev_get_vlan_offload(uint8_t port_id)
> struct rte_eth_dev *dev;
> int ret = 0;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1639,10 +1638,9 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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); @@ -1657,10 +1655,8 @@
> rte_eth_dev_fdir_add_signature_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1691,10 +1687,8 @@ rte_eth_dev_fdir_update_signature_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1725,10 +1719,8 @@ rte_eth_dev_fdir_remove_signature_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1756,10 +1748,8 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> if (! (dev->data->dev_conf.fdir_conf.mode)) { @@ -1781,10 +1771,8 @@
> rte_eth_dev_fdir_add_perfect_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1821,10 +1809,8 @@ rte_eth_dev_fdir_update_perfect_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1859,10 +1845,8 @@ rte_eth_dev_fdir_remove_perfect_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
>
> @@ -1895,10 +1879,8 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> if (! (dev->data->dev_conf.fdir_conf.mode)) { @@ -1915,10 +1897,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->flow_ctrl_get, -ENOTSUP); @@
> -1931,10 +1911,8
> @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((fc_conf->send_xon != 0) && (fc_conf->send_xon != 1)) {
> PMD_DEBUG_TRACE("Invalid send_xon, only 0/1 allowed\n"); @@
> -1951,10 +1929,8
> @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if (pfc_conf->priority > (ETH_DCB_NUM_USER_PRIORITIES - 1)) {
> PMD_DEBUG_TRACE("Invalid priority, only 0-7 allowed\n"); @@
> -2030,10 +2006,8 @@
> rte_eth_dev_rss_reta_update(uint8_t port_id,
> struct rte_eth_dev *dev;
> int ret;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> /* Check mask bits */
> ret = rte_eth_check_reta_mask(reta_conf, reta_size); @@ -2081,10
> +2055,9 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
> +
> rss_hash_protos = rss_conf->rss_hf;
> if ((rss_hash_protos != 0) &&
> ((rss_hash_protos & ETH_RSS_PROTO_MASK) == 0)) { @@ -2103,10
> +2076,9 @@
> rte_eth_dev_rss_hash_conf_get(uint8_t port_id, {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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); @@ -2118,10
> +2090,8 @@
> rte_eth_dev_udp_tunnel_add(uint8_t port_id, {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> if (udp_tunnel == NULL) {
> PMD_DEBUG_TRACE("Invalid udp_tunnel parameter\n"); @@ -2144,10
> +2114,9 @@
> rte_eth_dev_udp_tunnel_delete(uint8_t port_id, {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> if (udp_tunnel == NULL) {
> @@ -2169,10 +2138,8 @@ rte_eth_led_on(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_on, -ENOTSUP); @@ -2184,10
> +2151,8
> @@ rte_eth_led_off(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_led_off, -ENOTSUP); @@ -2224,10
> +2189,9
> @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
> +
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_add, -ENOTSUP);
>
> @@ -2275,10 +2239,9 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
> +
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_remove, -ENOTSUP);
>
> @@ -2309,7 +2272,7 @@ rte_eth_dev_set_vf_rxmode(uint8_t port_id, uint16_t vf,
> struct rte_eth_dev *dev;
> struct rte_eth_dev_info dev_info;
>
> - if (port_id >= nb_ports) {
> + if (rte_eth_dev_validate_port(port_id, NONE_TRACE) == DEV_INVALID) {
> PMD_DEBUG_TRACE("set VF RX mode:Invalid port_id=%d\n",
> port_id);
> return (-ENODEV);
> @@ -2364,7 +2327,7 @@ rte_eth_dev_uc_hash_table_set(uint8_t port_id, struct
> ether_addr *addr,
> int ret;
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> + if (rte_eth_dev_validate_port(port_id, NONE_TRACE) == DEV_INVALID) {
> PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
> port_id);
> return (-ENODEV);
> @@ -2417,7 +2380,7 @@ rte_eth_dev_uc_all_hash_table_set(uint8_t port_id,
> uint8_t on) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> + if (rte_eth_dev_validate_port(port_id, NONE_TRACE) == DEV_INVALID) {
> PMD_DEBUG_TRACE("unicast hash setting:Invalid port_id=%d\n",
> port_id);
> return (-ENODEV);
> @@ -2436,10 +2399,8 @@ 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> dev = &rte_eth_devices[port_id];
> rte_eth_dev_info_get(port_id, &dev_info); @@ -2462,7 +2423,7 @@
> rte_eth_dev_set_vf_tx(uint8_t port_id,uint16_t vf, uint8_t on)
> struct rte_eth_dev *dev;
> struct rte_eth_dev_info dev_info;
>
> - if (port_id >= nb_ports) {
> + if (rte_eth_dev_validate_port(port_id, NONE_TRACE) == DEV_INVALID) {
> PMD_DEBUG_TRACE("set pool tx:Invalid port_id=%d\n", port_id);
> return (-ENODEV);
> }
> @@ -2487,7 +2448,7 @@ rte_eth_dev_set_vf_vlan_filter(uint8_t port_id,
> uint16_t vlan_id, {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> + if (rte_eth_dev_validate_port(port_id, NONE_TRACE) == DEV_INVALID) {
> PMD_DEBUG_TRACE("VF VLAN filter:invalid port id=%d\n",
> port_id);
> return (-ENODEV);
> @@ -2518,7 +2479,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_validate_port(port_id, NONE_TRACE) == DEV_INVALID) {
> PMD_DEBUG_TRACE("set queue rate limit:invalid port id=%d\n",
> port_id);
> return -ENODEV;
> @@ -2555,7 +2516,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_validate_port(port_id, NONE_TRACE) == DEV_INVALID) {
> PMD_DEBUG_TRACE("set VF rate limit:invalid port id=%d\n",
> port_id);
> return -ENODEV;
> @@ -2589,10 +2550,8 @@ rte_eth_mirror_rule_set(uint8_t port_id, {
> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if (mirror_conf->rule_type_mask == 0) {
> PMD_DEBUG_TRACE("mirror rule type can not be 0.\n"); @@
> -2630,10 +2589,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if(rule_id >= ETH_VMDQ_NUM_MIRROR_RULE)
> {
> @@ -2655,10 +2612,9 @@ rte_eth_rx_burst(uint8_t port_id, uint16_t queue_id, {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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) { @@ -2675,10 +2631,9 @@
> rte_eth_tx_burst(uint8_t port_id, uint16_t queue_id, {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return 0;
> - }
> +
> dev = &rte_eth_devices[port_id];
>
> FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0); @@ -2695,10 +2650,9 @@
> rte_eth_rx_queue_count(uint8_t port_id, uint16_t queue_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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); @@ -2709,10
> +2663,9 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> 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)( \ @@ -2730,10 +2683,8 @@
> rte_eth_dev_callback_register(uint8_t port_id,
>
> if (!cb_fn)
> return (-EINVAL);
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-EINVAL);
> - }
>
> dev = &rte_eth_devices[port_id];
> rte_spinlock_lock(&rte_eth_dev_cb_lock);
> @@ -2770,10 +2721,8 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
>
> if (!cb_fn)
> return (-EINVAL);
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-EINVAL);
> - }
>
> dev = &rte_eth_devices[port_id];
> rte_spinlock_lock(&rte_eth_dev_cb_lock);
> @@ -2830,10 +2779,8 @@ int rte_eth_dev_bypass_init(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2850,10 +2797,8 @@
> rte_eth_dev_bypass_state_show(uint8_t port_id, uint32_t *state) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2869,10 +2814,8 @@
> rte_eth_dev_bypass_state_set(uint8_t port_id, uint32_t *new_state) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2889,10 +2832,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2909,10 +2850,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2929,10 +2868,8 @@
> rte_eth_dev_wd_timeout_store(uint8_t port_id, uint32_t timeout) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2949,10 +2886,8 @@
> rte_eth_dev_bypass_ver_show(uint8_t port_id, uint32_t *ver) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2969,10 +2904,8 @@
> 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) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -2989,10 +2922,8 @@
> rte_eth_dev_bypass_wd_reset(uint8_t port_id) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return (-ENODEV);
> - }
>
> if ((dev= &rte_eth_devices[port_id]) == NULL) {
> PMD_DEBUG_TRACE("Invalid port device\n"); @@ -3011,10 +2942,8 @@
> rte_eth_dev_add_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_syn_filter, -ENOTSUP); @@
> -3026,10 +2955,8
> @@ 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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_syn_filter, -ENOTSUP); @@
> -3045,10
> +2972,8 @@ rte_eth_dev_get_syn_filter(uint8_t port_id,
> if (filter == NULL || rx_queue == NULL)
> return -EINVAL;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_syn_filter, -ENOTSUP); @@
> -3061,10 +2986,9
> @@ rte_eth_dev_add_2tuple_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
> +
> if (filter->protocol != IPPROTO_TCP &&
> filter->tcp_flags != 0){
> PMD_DEBUG_TRACE("tcp flags is 0x%x, but the protocol value"
> @@ -3083,10 +3007,8 @@ rte_eth_dev_remove_2tuple_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_2tuple_filter, -ENOTSUP); @@
> -3102,10
> +3024,8 @@ rte_eth_dev_get_2tuple_filter(uint8_t port_id, uint16_t index,
> if (filter == NULL || rx_queue == NULL)
> return -EINVAL;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_2tuple_filter, -ENOTSUP); @@
> -3118,10
> +3038,8 @@ rte_eth_dev_add_5tuple_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> if (filter->protocol != IPPROTO_TCP &&
> filter->tcp_flags != 0){
> @@ -3141,10 +3059,8 @@ rte_eth_dev_remove_5tuple_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_5tuple_filter, -ENOTSUP); @@
> -3160,10
> +3076,8 @@ rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index,
> if (filter == NULL || rx_queue == NULL)
> return -EINVAL;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_5tuple_filter, -ENOTSUP); @@
> -3177,10
> +3091,8 @@ rte_eth_dev_add_flex_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_flex_filter, -ENOTSUP); @@
> -3192,10 +3104,8
> @@ rte_eth_dev_remove_flex_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);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_flex_filter, -ENOTSUP); @@
> -3211,10
> +3121,8 @@ rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index,
> if (filter == NULL || rx_queue == NULL)
> return -EINVAL;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_flex_filter, -ENOTSUP); @@
> -3227,10 +3135,8
> @@ rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type
> filter_type) {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); @@ -3244,10
> +3150,8 @@
> rte_eth_dev_filter_ctrl(uint8_t port_id, enum rte_filter_type filter_type, {
> struct rte_eth_dev *dev;
>
> - if (port_id >= nb_ports) {
> - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
> + if (rte_eth_dev_validate_port(port_id, TRACE) == DEV_INVALID)
> return -ENODEV;
> - }
>
> dev = &rte_eth_devices[port_id];
> FUNC_PTR_OR_ERR_RET(*dev->dev_ops->filter_ctrl, -ENOTSUP); diff --git
> a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index
> 1200c1c..ca101f5 100644
> --- a/lib/librte_ether/rte_ethdev.h
> +++ b/lib/librte_ether/rte_ethdev.h
> @@ -1539,6 +1539,7 @@ struct rte_eth_dev {
> struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */
> struct rte_pci_device *pci_dev; /**< PCI info. supplied by probing */
> struct rte_eth_dev_cb_list callbacks; /**< User application callbacks */
> + uint8_t attached; /**< Flag indicating the port is attached */
> };
>
> struct rte_eth_dev_sriov {
> @@ -1604,6 +1605,10 @@ extern struct rte_eth_dev rte_eth_devices[];
> * initialized by the [matching] Ethernet driver during the PCI probing
> phase.
> * All devices whose port identifier is in the range
> * [0, rte_eth_dev_count() - 1] can be operated on by network applications.
> + * immediately after invoking rte_eal_init().
> + * If the application unplugs a port using hotplug function, The
> + enabled port
> + * numbers may be noncontiguous. In the case, the applications need to
> + manage
> + * enabled port by themselves.
> *
> * @return
> * - The total number of usable Ethernet devices.
> --
> 1.9.1
