From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 1C9A8CF80 for ; Wed, 9 May 2018 11:31:19 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id C0FB8229DE; Wed, 9 May 2018 05:31:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 09 May 2018 05:31:18 -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=dbuqB664dAItXI k7naFHUnB9gd0GCehqE5tWBkwHrgY=; b=WsAifAsvkdB7YXxrHnhQK7csUCGSPO drmOsbWTOvd7Rb10mtsx598Ag5PU8Z6ccaBHwMrgq+StfMGBViSpNZdAIV8F8u15 84WTUd5AZWzNvceYkAT1CVeSR5lSZvR7lzYrioUCBokl1FCHnK5jZMWZwmSNfZJg ey1uCRF7Eb5xQ= 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=dbuqB664dAItXIk7naFHUnB9gd0GCehqE5tWBkwHrgY=; b=DcA3q+on qmuIaWjyMfdMaqwfojVZtA65NYV26peC3DoOxE4D0rD6OWRRmOlKMmCtDcwOKD/2 lquOihqcTZff9D9zkWGesmVxJbDS+2fSWWoLJsNejkRj5liqYnXbSL55CwCxcWKQ 5/l/wBasvSQeRLvtar83FDFIKWabgS88Oj6oEhuiAp5aSv2pkR4bl10I1X3G6OZE FofNS29iL+lraSXDrIO82L0Ial3h3+doGyvb6G3Gl+AoPl3g4fiaGdmW11GqJAxt CoRn07PgPyYFn6iu00whXl7QFCuQU7/yV1UK9ZM8GVxFYhZ7W2WWyXkVi/yx7MGF WBeH1Lh1z+fREg== 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 2970FE5082; Wed, 9 May 2018 05:31:18 -0400 (EDT) From: Thomas Monjalon To: matan@mellanox.com Cc: stable@dpdk.org Date: Wed, 9 May 2018 11:31:02 +0200 Message-Id: <20180509093105.25984-9-thomas@monjalon.net> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180509093105.25984-1-thomas@monjalon.net> References: <20180509093105.25984-1-thomas@monjalon.net> Subject: [dpdk-stable] [PATCH 08/11] ethdev: fix port visibility before initialization X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 09:31:19 -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 --- 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 357be2dca..91cd0db11 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -233,7 +233,7 @@ rte_eth_dev_allocated_lock_free(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]; } @@ -278,7 +278,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; @@ -296,16 +295,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_lock_free(name) != NULL) { + ethdev_log(ERR, "Ethernet device with name %s already allocated", + name); goto unlock; } - if (rte_eth_dev_allocated_lock_free(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; } @@ -3387,6 +3385,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