From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id CC0F97D22 for ; Mon, 29 May 2017 15:42:50 +0200 (CEST) Received: by mail-wm0-f48.google.com with SMTP id b84so56685919wmh.0 for ; Mon, 29 May 2017 06:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=GNx0ouOZAI6FRE7P6Q9Mx842zbJwE6BDlpLBIe0vCYw=; b=oAUUhylN9HFsa9PQtAN4Wn55Dsv5V21YGfxhlHSaPqYZ2KXjUQ0xnaiQbZwFEdFqxx b3RjFESaSyc6500qZrd+7pD+okrMMmFWEVs53ExzEViYBbcKgVwcPCHCy8DMcEjaFYCv 2lVl8kYvKT9uz7sW391mDJnwGCTLZezqfksvKLf3sbEK+r8Vgt3eJ4Buq7qAuR2U52A/ TifssQvyXOusiPFTCnE/37pq+9RFQVyxc0DA2U5vNn7+13rcVp1tI1EQSGtJd5MKc71h GqPrs5yjewL7Kh7lWUM3+7EZL2uyaxV8WLeHe/kJLdy+DJImO3s31zH3vcIBXLuE1NyN 8KFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=GNx0ouOZAI6FRE7P6Q9Mx842zbJwE6BDlpLBIe0vCYw=; b=kSkIKnksSK329/wSs/lTDjm3SbuFAs/IA/XqL/KA9p5NFSPMjRfZ0IzHSybzPnNqQS SvmefDoql7pcl9+Brw/f4uhstKXSrQEK5/zQudPzdbmYIfLfnYm/oDDn1I8Pamk/tEfo HiUqe7ind85QmEpq0Vdg7k24vFdjQbBNacGNhRNxCZxa+rDIiTLJ4Hd+OdQP4+1ocH9c D+lZWC/JFp67j6mertU4I4JoNxDvUYYDbX92zoDF2xj9nAEZktm8FNiQkfL6dY/g2pmu dwxAoSYhxuvNg3ST/XKvaEWRxwln4XbgvVyk0p6oN5IZMGvdoDSbJEHJcNHS6sRwgSOr HggQ== X-Gm-Message-State: AODbwcAaf+uXIvwvUEGtmWE/iwzaWcdE/za27O/U0u1TYYEpzJ9eXiq9 j9ZL3FOf1Cd5Iuj3SGE= X-Received: by 10.28.186.213 with SMTP id k204mr23285448wmf.80.1496065370025; Mon, 29 May 2017 06:42:50 -0700 (PDT) Received: from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id l8sm12906671wmd.8.2017.05.29.06.42.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 May 2017 06:42:49 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Mon, 29 May 2017 15:42:15 +0200 Message-Id: <7792f8dc797ffb94853fc8dcb2f1ca6b5fa713e7.1496065002.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 03/12] ethdev: count devices consistently 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: Mon, 29 May 2017 13:42:51 -0000 Make the rte_eth_dev_count() return the number of available devices even after some are detached by the hotplug API or put in a deferred state. Signed-off-by: Gaetan Rivet --- lib/librte_ether/rte_ethdev.c | 16 +++++++++------- lib/librte_ether/rte_ethdev.h | 13 ++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index f592643..172c8ec 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -72,7 +72,6 @@ static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data"; struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS]; static struct rte_eth_dev_data *rte_eth_dev_data; static uint8_t eth_dev_last_created_port; -static uint8_t nb_ports; /* spinlock for eth device callbacks */ static rte_spinlock_t rte_eth_dev_cb_lock = RTE_SPINLOCK_INITIALIZER; @@ -207,7 +206,6 @@ eth_dev_get(uint8_t port_id) TAILQ_INIT(&(eth_dev->link_intr_cbs)); eth_dev_last_created_port = port_id; - nb_ports++; return eth_dev; } @@ -280,7 +278,6 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev) return -EINVAL; eth_dev->state = RTE_ETH_DEV_UNUSED; - nb_ports--; return 0; } @@ -305,7 +302,15 @@ rte_eth_dev_socket_id(uint8_t port_id) uint8_t rte_eth_dev_count(void) { - return nb_ports; + uint8_t p; + uint8_t count; + + count = 0; + + RTE_ETH_FOREACH_DEV(p) + count++; + + return count; } int @@ -337,9 +342,6 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id) return -EINVAL; } - if (!nb_ports) - return -ENODEV; - *port_id = RTE_MAX_ETHPORTS; RTE_ETH_FOREACH_DEV(i) { if (!strncmp(name, diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 161b0ff..44f7e83 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1788,13 +1788,12 @@ uint8_t rte_eth_find_next(uint8_t port_id); /** * Get the total number of Ethernet devices that have been successfully - * 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 using the ``RTE_ETH_FOREACH_DEV()`` macro. + * initialized by the matching Ethernet driver during the PCI probing phase + * and that are available for applications to use. These devices must be + * accessed by using the ``RTE_ETH_FOREACH_DEV()`` macro to deal with + * non-contiguous ranges of devices. + * These non-contiguous ranges can be created by calls to hotplug functions or + * by some PMDs. * * @return * - The total number of usable Ethernet devices. -- 2.1.4