From patchwork Tue Jul 11 23:26:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 26840 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 77D587D08; Wed, 12 Jul 2017 01:26:53 +0200 (CEST) Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by dpdk.org (Postfix) with ESMTP id 5EDC456A1 for ; Wed, 12 Jul 2017 01:26:48 +0200 (CEST) Received: by mail-wr0-f182.google.com with SMTP id r103so9943169wrb.0 for ; Tue, 11 Jul 2017 16:26:48 -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=vRhMLKVJFCQ+ljagOXSItDuYDVVfb7MCriCxsZr9q84=; b=u2ivO09rHwBWXIbLKd1NEN64sjGqt4x0ukOSjUH0VirSPKuf6bquLZpTnu/CCe35sO E+tU9YEPcfV948weNwHofBFZG8t3+FeI+hjX37hk71JsZQZvcmXKoK0sQ7ladTcgPy9e QVo5MvqIpnud0/7RaJYLLh031eSBdpw+7xKj3PiGtPXSv9K20tSeAbuj5MObix+tlu2o tFW15n1+4Z+y4U5G7QBkLsWp0BF5svkjIKBdTEHyyGqHW0YCuLIIkBtFur98BMDCJCiX fHCSCfkNA91ouWzboDLRt1CLqwyDQhL1/KD3Unhf/ScycmOF10T3Lc+ya+dVWAUPc875 jVwQ== 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=vRhMLKVJFCQ+ljagOXSItDuYDVVfb7MCriCxsZr9q84=; b=J1H2xylJlM3BoyVWP72wOykTE7dBU1tEBKYd/j/s8mq+f0Jb0n+Z1aG/1cMPC4VYlV JMWup2VCoWcukEyABoauoNd09XfUx3cTvEc//XOsEjYYByj51iH7H2zXv4ckams2OIfX 7Krvu6H8vA3GeVaYOp5g6EU7N0Q6SO5u5n5Fx+/x3bLyJTvig2fVZIj/z0Lu+QyZYMrV qF22S3d+NvpYB6pSCuruiddak5fH8jpwzxq0iUPj0pLvOnQRB+hjnI1qdGG28tvYE/gB jznZ3JkFOUGb8BKobVVJVcT3/Y+0m/10wyKAKs+dQ9iKks8FGro1UQhR85G1PABd4NxI QSzQ== X-Gm-Message-State: AIVw110a/6rWmNI6txszP6T/PRwgXjqbclbqQUA//24HlsWp7WmB4tf5 iKnzvE5NAtdCv7zIlSA= X-Received: by 10.28.182.212 with SMTP id g203mr400800wmf.83.1499815607673; Tue, 11 Jul 2017 16:26:47 -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 w30sm740855wrb.49.2017.07.11.16.26.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Jul 2017 16:26:46 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 12 Jul 2017 01:26:22 +0200 Message-Id: <69c658c8d59989f4efcb4dd9c72b5d4666142a70.1499815140.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 v9 02/11] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 69896e9..8f41a68 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; @@ -210,7 +209,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; } @@ -283,7 +281,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; } @@ -308,7 +305,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 @@ -341,9 +346,6 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id) return -EINVAL; } - if (!nb_ports) - return -ENODEV; - RTE_ETH_FOREACH_DEV(i) { if (!rte_eth_devices[i].device) continue; diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 2adef76..a744ba7 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1742,13 +1742,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.