From e06227e2fa234f056227fb74beedc51f503ebac9 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 11 May 2018 01:58:33 +0200 Subject: [PATCH] ethdev: fix port visibility before initialization The port was set to the state ATTACHED during allocation. The consequence was to iterate over ports which are not initialized. The state ATTACHED is now set as the last step of probing. The uniqueness of port name is now checked before the availability of a port id for allocation (order reversed). As the state is not set on allocation anymore, it is also not checked in the function telling whether a port is allocated or not. The name of the port is set on allocation, so it is enough as a check. Fixes: 5588909af21b ("ethdev: add device iterator") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Signed-off-by: Matan Azrad Reviewed-by: Andrew Rybchenko Reviewed-by: Stephen Hemminger --- lib/librte_ethdev/rte_ethdev.c | 18 +++++++++--------- lib/librte_ethdev/rte_ethdev_driver.h | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index c33d51e86b..0c650300c6 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -240,7 +240,7 @@ _rte_eth_dev_allocated(const char *name) unsigned i; for (i = 0; i < RTE_MAX_ETHPORTS; i++) { - if ((rte_eth_devices[i].state == RTE_ETH_DEV_ATTACHED) && + if (rte_eth_devices[i].data != NULL && strcmp(rte_eth_devices[i].data->name, name) == 0) return &rte_eth_devices[i]; } @@ -285,7 +285,6 @@ eth_dev_get(uint16_t port_id) struct rte_eth_dev *eth_dev = &rte_eth_devices[port_id]; eth_dev->data = &rte_eth_dev_shared_data->data[port_id]; - eth_dev->state = RTE_ETH_DEV_ATTACHED; eth_dev_last_created_port = port_id; @@ -303,16 +302,15 @@ rte_eth_dev_allocate(const char *name) /* Synchronize port creation between primary and secondary threads. */ rte_spinlock_lock(&rte_eth_dev_shared_data->ownership_lock); - port_id = rte_eth_dev_find_free_port(); - if (port_id == RTE_MAX_ETHPORTS) { - ethdev_log(ERR, "Reached maximum number of Ethernet ports"); + if (_rte_eth_dev_allocated(name) != NULL) { + ethdev_log(ERR, "Ethernet device with name %s already allocated", + name); goto unlock; } - if (_rte_eth_dev_allocated(name) != NULL) { - ethdev_log(ERR, - "Ethernet Device with name %s already allocated!", - name); + port_id = rte_eth_dev_find_free_port(); + if (port_id == RTE_MAX_ETHPORTS) { + ethdev_log(ERR, "Reached maximum number of Ethernet ports"); goto unlock; } @@ -3481,6 +3479,8 @@ rte_eth_dev_probing_finish(struct rte_eth_dev *dev) { if (dev == NULL) return; + + dev->state = RTE_ETH_DEV_ATTACHED; } int diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h index 3821f0b1db..3640dff68e 100644 --- a/lib/librte_ethdev/rte_ethdev_driver.h +++ b/lib/librte_ethdev/rte_ethdev_driver.h @@ -106,6 +106,8 @@ int _rte_eth_dev_callback_process(struct rte_eth_dev *dev, * This is the last step of device probing. * It must be called after a port is allocated and initialized successfully. * + * The state is set as RTE_ETH_DEV_ATTACHED. + * * @param dev * New ethdev port. */ -- 2.20.1