From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 0C6EC1BBC8 for ; Fri, 11 May 2018 01:58:52 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id AFAB022841; Thu, 10 May 2018 19:58:51 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 10 May 2018 19:58:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=G7XwYzyUhHykde k16hX9Cpx0F/w6KtRhygaALKp7h9s=; b=hBwVXm3U0Z/IpH6sPRo4l1DnLDGOom 4zBFZ7C1xGYgk6A5mbwPIJu26pm/mO6LXpywv2OV2nAcqFe+z0EWMXISdI6tWatZ fhCv7dMnsu6GG6OP/NHbL2eOR21lDAbGNlTQsyLhQA4GSBs7b/e6mfukmyjxjkQS sI0t5zd8ZpF+8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=G7XwYzyUhHykdek16hX9Cpx0F/w6KtRhygaALKp7h9s=; b=f/4wJLCs /eES8d2lOpHtRvxp0q0O842gSjeQLFBSaAr/lW00MFhsaAzJyHBRqqjoa9oHuHAG or2LnalcFyimdf7d4wkg2eZlNOhLbjUGhI+fP9XnULatnsmuyyMF5nthmn1j/lvt 0QZ1XunKkbUcgAxa0uJDpJjVjw5ouRqwGUa4AEyDG6iYThs+ita3KruyXLueHzNS oEbNoUZg0iq174lgWryqF/WIHd7/iuf+zLwg0OEENmths2DC9cSzGYU6TyfJrNRF ywHRlD1IHY837+iV0lpAr+ihYoTxtQYzKVGkIU3jMaQBIaqemZq4aEDugvnqd0E0 yq/cZg0Ue6sQzw== X-ME-Sender: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id C8BE1E4488; Thu, 10 May 2018 19:58:50 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: matan@mellanox.com, arybchenko@solarflare.com, stephen@networkplumber.org, ferruh.yigit@intel.com Date: Fri, 11 May 2018 01:58:33 +0200 Message-Id: <20180510235836.1099-9-thomas@monjalon.net> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180510235836.1099-1-thomas@monjalon.net> References: <20180509094337.26112-1-thomas@monjalon.net> <20180510235836.1099-1-thomas@monjalon.net> Subject: [dpdk-dev] [PATCH v3 08/11] ethdev: fix port visibility before initialization X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 May 2018 23:58:52 -0000 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 fa6d4940e..d12b4db27 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; } @@ -3479,6 +3477,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 3821f0b1d..3640dff68 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.16.2