From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id D54D7235 for ; Tue, 21 Nov 2017 14:26:07 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 8A0D120B96; Tue, 21 Nov 2017 08:26:07 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:26:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=X2ufucpEgsWTsv3pK W/aoLEe0TjkGv8Q+Fn/i5mO4YU=; b=LQ8UxsI5GJMlrI9ERqtqE8aWmZq2ysyVF 4alRNs2FaXajlibpaso2mluHBfpDepwQ+ekhfdDGP6FgD0n3DdU47vXK/rw+IQ1R jLYBdrCj6TmeKhO05ILdDvMr/DMpMC8ZVSPi+tYV7L2kjXkSExSgYh3NgJuUV8rS lnOyaU46ISVpOvqxIOEPmIfKbhXa7wQK0DZGYQiR+F5TLHoRhSUISiue0s/daToZ bg0EP2NTbgwCQ9nr3/V2T0EAKV+5MXTNTzizNL7U/Uax+9YA1bqHfd0KFk0Oolec n7lbGvd4neNrJXi47V+OY/0Cq61hmhOqUSGySPSKBTmxyRJrm2NJQ== 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= fm1; bh=X2ufucpEgsWTsv3pKW/aoLEe0TjkGv8Q+Fn/i5mO4YU=; b=HgjFfpa9 /3gTmYLpEXxXBJKM/7XJwkCNQxWvGCIbeAcg+v1T6JtCXLkcNnnwAWe3L8gO0H80 XgHt047Cvocsgo7n2SIcXfkTr3artY3n+kUrliG0Ig3NrXtHOj1igLpRN1K0y1WX JFjVJ77NFnH8/WHLBpxz+shVqZUGyVLf3ot99aA+R6EfbHFkWuvM2JZv7KBRrOzv Wb38coI66dW5XWdd3Y+LcFGhBiDW9rcwOl9M00GQYT7u9mV665SxaYsEBBFgKhvq xODG8RF/QvrVjmHxbE6Qh2lPlaRqR/dfaYXfA+PwT3Cg1aPz50tbjWja2kR+VpPC p17NmlX6wZ6kqw== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id B0174247A9; Tue, 21 Nov 2017 08:26:04 -0500 (EST) From: Yuanhan Liu To: Ferruh Yigit Cc: Adrien Mazarguil , Thomas Monjalon , dpdk stable Date: Tue, 21 Nov 2017 21:17:29 +0800 Message-Id: <1511270333-31002-107-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'ethdev: revert use port name from device structure' has been queued to stable release 17.08.1 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: Tue, 21 Nov 2017 13:26:08 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 0e131afbde6c0cb7f8b04aadcc4a36585063fb7d Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 22 Sep 2017 12:30:07 +0100 Subject: [PATCH] ethdev: revert use port name from device structure [ upstream commit 72e3efb149ccb72626e77f8926d4dc812fad4e4f ] This reverts commit a1e7c17555e8f77d520ba5f06ed26c00e77a2bd1. Original commit assumes there is 1:1 mapping between physical device and ethdev port, so that device name can be used per port instead of ethdev name field. But one physical device may have multiple ethdev ports and each port needs its own unique name. One issue reported here: http://dpdk.org/ml/archives/users/2017-September/002484.html So reverting back the commit to continue using ethdev name field per port. Fixes: a1e7c17555e8 ("ethdev: use device name from device structure") Reported-by: Adrien Mazarguil Signed-off-by: Ferruh Yigit Acked-by: Adrien Mazarguil Acked-by: Thomas Monjalon --- lib/librte_ether/rte_ethdev.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 0597641..ec7d0e7 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -178,11 +178,9 @@ 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 && - rte_eth_devices[i].device) { - if (!strcmp(rte_eth_devices[i].device->name, name)) - return &rte_eth_devices[i]; - } + if ((rte_eth_devices[i].state == RTE_ETH_DEV_ATTACHED) && + strcmp(rte_eth_devices[i].data->name, name) == 0) + return &rte_eth_devices[i]; } return NULL; } @@ -319,7 +317,7 @@ rte_eth_dev_count(void) int rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) { - const char *tmp; + char *tmp; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); @@ -330,7 +328,7 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) /* shouldn't check 'rte_eth_devices[i].data', * because it might be overwritten by VDEV PMD */ - tmp = rte_eth_devices[port_id].device->name; + tmp = rte_eth_dev_data[port_id].name; strcpy(name, tmp); return 0; } @@ -338,7 +336,6 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) int rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id) { - int ret; int i; if (name == NULL) { @@ -347,13 +344,11 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id) } RTE_ETH_FOREACH_DEV(i) { - if (!rte_eth_devices[i].device) - continue; + if (!strncmp(name, + rte_eth_dev_data[i].name, strlen(name))) { - ret = strncmp(name, rte_eth_devices[i].device->name, - strlen(name)); - if (ret == 0) { *port_id = i; + return 0; } } @@ -436,8 +431,8 @@ rte_eth_dev_detach(uint8_t port_id, char *name) if (rte_eth_dev_is_detachable(port_id)) goto err; - snprintf(name, RTE_DEV_NAME_MAX_LEN, "%s", - rte_eth_devices[port_id].device->name); + snprintf(name, sizeof(rte_eth_devices[port_id].data->name), + "%s", rte_eth_devices[port_id].data->name); ret = rte_eal_dev_detach(rte_eth_devices[port_id].device); if (ret < 0) -- 2.7.4