From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f176.google.com (mail-we0-f176.google.com [74.125.82.176]) by dpdk.org (Postfix) with ESMTP id 4C556B0B5 for ; Fri, 27 Jun 2014 01:57:52 +0200 (CEST) Received: by mail-we0-f176.google.com with SMTP id u56so4540948wes.35 for ; Thu, 26 Jun 2014 16:58:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=ikdWPSQrJntP9NqY9ScaKRj4JEhjs7IDrxTYr26gfpc=; b=fk5FkbAnjcCVtrjCAjb0wXzRidpGKnUI6kyPtgphcMHl9XlbrKcNa3Po9ev2Vnlc5J x9lkmDL89Al917qbjMBj6zrLegiBz70zxXDKGWU7pZQYOGLct1S+SGsqEVb+KTzVIA0d D20i075UXr559j7xrMDsM40sek7/o0Sv3RA6rpiHfmJB2oRjV7krswx0MRP3EGG7pNlN 7SxYgBiybyQl9uPGbfGhZiuBGcsvqeB65I7vMaRUv8rBQuvhOhKRYk16EzH+EZDHN2AH K4l69Qnbl6i0FREuDuwnHBDZcGa8MZ3U5g8DSuWSbWmbd/+hLPS24vxQK7JV3WUgzvx1 TaUw== X-Gm-Message-State: ALoCoQnRKsvL5W4pRGvqaVDfd8+KRSBKmEL7HbdXtUf+lXVee5UNg0iuRp4ni0u0epBJRiyBZpZu X-Received: by 10.194.85.78 with SMTP id f14mr21873606wjz.36.1403827091456; Thu, 26 Jun 2014 16:58:11 -0700 (PDT) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id gh16sm9820655wic.3.2014.06.26.16.58.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jun 2014 16:58:10 -0700 (PDT) From: Thomas Monjalon To: Declan Doherty Date: Fri, 27 Jun 2014 01:57:52 +0200 Message-Id: <1403827075-9192-3-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403827075-9192-1-git-send-email-thomas.monjalon@6wind.com> References: <1403726868-8161-1-git-send-email-declan.doherty@intel.com> <1403827075-9192-1-git-send-email-thomas.monjalon@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH v9 2/5] ethdev: add unique name to devices X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 23:57:52 -0000 From: Declan Doherty Adding support to rte_eth_dev_data structure to support unique name identifier for ethdevs to support adding slave ethdevs (specifically virtual devices which have no public unique identifier) to a link bonding device. This changes the API rte_eth_dev_allocate() to require a const char *name when allocating a ethdev, which also verifies that the name is unique and hasn’t been already used by an existed allocated rte_eth_dev. Also contains updates to virtual pmd’s to now call the API with a name parameter. Signed-off-by: Declan Doherty Acked-by: Pablo de Lara --- lib/librte_ether/rte_ethdev.c | 31 ++++++++++++++++++++++++++++--- lib/librte_ether/rte_ethdev.h | 7 ++++++- lib/librte_pmd_pcap/rte_eth_pcap.c | 22 +++++++++++----------- lib/librte_pmd_ring/rte_eth_ring.c | 32 +++++++++++++++++--------------- lib/librte_pmd_ring/rte_eth_ring.h | 3 ++- lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 2 +- 6 files changed, 65 insertions(+), 32 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 8687499..a21cdb9 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -65,6 +65,7 @@ #include #include #include +#include #include "rte_ether.h" #include "rte_ethdev.h" @@ -153,21 +154,39 @@ rte_eth_dev_data_alloc(void) RTE_MAX_ETHPORTS * sizeof(*rte_eth_dev_data)); } +static struct rte_eth_dev * +rte_eth_dev_allocated(const char *name) +{ + unsigned i; + + for (i = 0; i < nb_ports; i++) { + if (strcmp(rte_eth_devices[i].data->name, name) == 0) + return &rte_eth_devices[i]; + } + return NULL; +} + struct rte_eth_dev * -rte_eth_dev_allocate(void) +rte_eth_dev_allocate(const char *name) { struct rte_eth_dev *eth_dev; if (nb_ports == RTE_MAX_ETHPORTS) { - PMD_DEBUG_TRACE("Reached maximum number of ethernet ports\n"); + PMD_DEBUG_TRACE("Reached maximum number of Ethernet ports\n"); return NULL; } if (rte_eth_dev_data == NULL) rte_eth_dev_data_alloc(); + if (rte_eth_dev_allocated(name) != NULL) { + PMD_DEBUG_TRACE("Ethernet Device with name %s already allocated!\n"); + return NULL; + } + eth_dev = &rte_eth_devices[nb_ports]; eth_dev->data = &rte_eth_dev_data[nb_ports]; + snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name); eth_dev->data->port_id = nb_ports++; return eth_dev; } @@ -178,11 +197,17 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, { struct eth_driver *eth_drv; struct rte_eth_dev *eth_dev; + char ethdev_name[RTE_ETH_NAME_MAX_LEN]; + int diag; eth_drv = (struct eth_driver *)pci_drv; - eth_dev = rte_eth_dev_allocate(); + /* Create unique Ethernet device name using PCI address */ + snprintf(ethdev_name, RTE_ETH_NAME_MAX_LEN, "%d:%d.%d", + pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); + + eth_dev = rte_eth_dev_allocate(ethdev_name); if (eth_dev == NULL) return -ENOMEM; diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 526331a..25f2df7 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1497,6 +1497,8 @@ struct rte_eth_dev_sriov { }; #define RTE_ETH_DEV_SRIOV(dev) ((dev)->data->sriov) +#define RTE_ETH_NAME_MAX_LEN (32) + /** * @internal * The data part, with no function pointers, associated with each ethernet device. @@ -1505,6 +1507,8 @@ struct rte_eth_dev_sriov { * processes in a multi-process configuration. */ struct rte_eth_dev_data { + char name[RTE_ETH_NAME_MAX_LEN]; /**< Unique identifier name */ + void **rx_queues; /**< Array of pointers to RX queues. */ void **tx_queues; /**< Array of pointers to TX queues. */ uint16_t nb_rx_queues; /**< Number of RX queues. */ @@ -1560,10 +1564,11 @@ extern uint8_t rte_eth_dev_count(void); * Allocates a new ethdev slot for an ethernet device and returns the pointer * to that slot for the driver to use. * + * @param name Unique identifier name for each Ethernet device * @return * - Slot in the rte_dev_devices array for a new device; */ -struct rte_eth_dev *rte_eth_dev_allocate(void); +struct rte_eth_dev *rte_eth_dev_allocate(const char *name); struct eth_driver; /** diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c index b3dbbda..12b7e0c 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.c +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c @@ -534,7 +534,7 @@ open_tx_iface(const char *key __rte_unused, const char *value, void *extra_args) static int -rte_pmd_init_internals(const unsigned nb_rx_queues, +rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues, const unsigned nb_tx_queues, const unsigned numa_node, struct pmd_internals **internals, @@ -558,20 +558,20 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, /* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data = rte_zmalloc_socket(NULL, sizeof(*data), 0, numa_node); + data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node); if (data == NULL) goto error; - pci_dev = rte_zmalloc_socket(NULL, sizeof(*pci_dev), 0, numa_node); + pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node); if (pci_dev == NULL) goto error; - *internals = rte_zmalloc_socket(NULL, sizeof(**internals), 0, numa_node); + *internals = rte_zmalloc_socket(name, sizeof(**internals), 0, numa_node); if (*internals == NULL) goto error; /* reserve an ethdev entry */ - *eth_dev = rte_eth_dev_allocate(); + *eth_dev = rte_eth_dev_allocate(name); if (*eth_dev == NULL) goto error; @@ -617,7 +617,7 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, } static int -rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], +rte_eth_from_pcaps_n_dumpers(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues, @@ -634,7 +634,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], if (tx_queues == NULL && nb_tx_queues > 0) return -1; - if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, + if (rte_pmd_init_internals(name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) < 0) return -1; @@ -652,7 +652,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], } static int -rte_eth_from_pcaps(pcap_t * const rx_queues[], +rte_eth_from_pcaps(const char *name, pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues, @@ -669,7 +669,7 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[], if (tx_queues == NULL && nb_tx_queues > 0) return -1; - if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, + if (rte_pmd_init_internals(name, nb_rx_queues, nb_tx_queues, numa_node, &internals, ð_dev, kvlist) < 0) return -1; @@ -760,10 +760,10 @@ rte_pmd_pcap_devinit(const char *name, const char *params) return -1; if (using_dumpers) - return rte_eth_from_pcaps_n_dumpers(pcaps.pcaps, pcaps.num_of_rx, + return rte_eth_from_pcaps_n_dumpers(name, pcaps.pcaps, pcaps.num_of_rx, dumpers.dumpers, dumpers.num_of_tx, numa_node, kvlist); - return rte_eth_from_pcaps(pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, + return rte_eth_from_pcaps(name, pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, dumpers.num_of_tx, numa_node, kvlist); } diff --git a/lib/librte_pmd_ring/rte_eth_ring.c b/lib/librte_pmd_ring/rte_eth_ring.c index ce7ad71..73c649e 100644 --- a/lib/librte_pmd_ring/rte_eth_ring.c +++ b/lib/librte_pmd_ring/rte_eth_ring.c @@ -219,7 +219,7 @@ static struct eth_dev_ops ops = { }; int -rte_eth_from_rings(struct rte_ring *const rx_queues[], +rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues, @@ -243,20 +243,20 @@ rte_eth_from_rings(struct rte_ring *const rx_queues[], /* now do all data allocation - for eth_dev structure, dummy pci driver * and internal (private) data */ - data = rte_zmalloc_socket(NULL, sizeof(*data), 0, numa_node); + data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node); if (data == NULL) goto error; - pci_dev = rte_zmalloc_socket(NULL, sizeof(*pci_dev), 0, numa_node); + pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node); if (pci_dev == NULL) goto error; - internals = rte_zmalloc_socket(NULL, sizeof(*internals), 0, numa_node); + internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node); if (internals == NULL) goto error; /* reserve an ethdev entry */ - eth_dev = rte_eth_dev_allocate(); + eth_dev = rte_eth_dev_allocate(name); if (eth_dev == NULL) goto error; @@ -335,7 +335,7 @@ eth_dev_ring_create(const char *name, const unsigned numa_node, return -1; } - if (rte_eth_from_rings(rxtx, num_rings, rxtx, num_rings, numa_node)) + if (rte_eth_from_rings(name, rxtx, num_rings, rxtx, num_rings, numa_node)) return -1; return 0; @@ -352,29 +352,31 @@ eth_dev_ring_pair_create(const char *name, const unsigned numa_node, struct rte_ring *rx[RTE_PMD_RING_MAX_RX_RINGS]; struct rte_ring *tx[RTE_PMD_RING_MAX_TX_RINGS]; unsigned i; - char rng_name[RTE_RING_NAMESIZE]; + char rx_rng_name[RTE_RING_NAMESIZE]; + char tx_rng_name[RTE_RING_NAMESIZE]; unsigned num_rings = RTE_MIN(RTE_PMD_RING_MAX_RX_RINGS, RTE_PMD_RING_MAX_TX_RINGS); for (i = 0; i < num_rings; i++) { - snprintf(rng_name, sizeof(rng_name), "ETH_RX%u_%s", i, name); + snprintf(rx_rng_name, sizeof(rx_rng_name), "ETH_RX%u_%s", i, name); rx[i] = (action == DEV_CREATE) ? - rte_ring_create(rng_name, 1024, numa_node, + rte_ring_create(rx_rng_name, 1024, numa_node, RING_F_SP_ENQ|RING_F_SC_DEQ) : - rte_ring_lookup(rng_name); + rte_ring_lookup(rx_rng_name); if (rx[i] == NULL) return -1; - snprintf(rng_name, sizeof(rng_name), "ETH_TX%u_%s", i, name); + snprintf(tx_rng_name, sizeof(tx_rng_name), "ETH_TX%u_%s", i, name); tx[i] = (action == DEV_CREATE) ? - rte_ring_create(rng_name, 1024, numa_node, + rte_ring_create(tx_rng_name, 1024, numa_node, RING_F_SP_ENQ|RING_F_SC_DEQ): - rte_ring_lookup(rng_name); + rte_ring_lookup(tx_rng_name); if (tx[i] == NULL) return -1; } - if (rte_eth_from_rings(rx, num_rings, tx, num_rings, numa_node) || - rte_eth_from_rings(tx, num_rings, rx, num_rings, numa_node) ) + if (rte_eth_from_rings(rx_rng_name, rx, num_rings, tx, num_rings, + numa_node) || rte_eth_from_rings(tx_rng_name, tx, num_rings, rx, + num_rings, numa_node)) return -1; return 0; diff --git a/lib/librte_pmd_ring/rte_eth_ring.h b/lib/librte_pmd_ring/rte_eth_ring.h index ef29344..e6ae19e 100644 --- a/lib/librte_pmd_ring/rte_eth_ring.h +++ b/lib/librte_pmd_ring/rte_eth_ring.h @@ -40,7 +40,8 @@ extern "C" { #include -int rte_eth_from_rings(struct rte_ring * const rx_queues[], +int rte_eth_from_rings(const char *name, + struct rte_ring * const rx_queues[], const unsigned nb_rx_queues, struct rte_ring *const tx_queues[], const unsigned nb_tx_queues, diff --git a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c index 18c44f5..450332a 100644 --- a/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c +++ b/lib/librte_pmd_xenvirt/rte_eth_xenvirt.c @@ -647,7 +647,7 @@ eth_dev_xenvirt_create(const char *name, const char *params, goto err; /* reserve an ethdev entry */ - eth_dev = rte_eth_dev_allocate(); + eth_dev = rte_eth_dev_allocate(name); if (eth_dev == NULL) goto err; -- 2.0.0