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 616A4237 for ; Tue, 21 Nov 2017 14:23:57 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 03E4320CBA; Tue, 21 Nov 2017 08:23:57 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:23:57 -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=//ggfQCJEhLplQXZ+ 3QDQLt7jDCHV26Sri9z9LuMOt4=; b=UNb5+HSWI11JyuvzQabl+y3suLsYSvzlJ AE7ZzPYefYlsrqK52F18DPqujzEEW8GrV55xpDmI/0gIjBXy4aK1Q1vS+bhwt7un DNG+8iqJXzLLehtzSTTfp8e6jjaq8pAtdGrX0pOifxJUXoVIsK3KTz5jaWSZJDZs Thbb3O/pF7w4ZvNpAkjHpHySj+t7TY4epsx7CA6qpLjqJjPxp+pbIijllIYE7Tw+ WUavaj90qUIb4eSxlswE5n9JklBedDJP7MTf5gsf0CvtlXPBJhlMkf+Y+ZZO5orU +9z/LSj5mw+dVQHcqUtMepQusFPFNn5+L4EnISZqiFnlPyCvFKvww== 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=//ggfQCJEhLplQXZ+3QDQLt7jDCHV26Sri9z9LuMOt4=; b=H+C/OwJe vtvbKxxoJp5NbOnJe1ubbsOKHq5fMv3O0ydvbU4Kl5BI5DcZUsfribMU/SSSQtWx EqR5cDnFUnt4qxKZpSYLDd+CS+Bt7PK8FYv97ZrRwd7ZSHIPVNYCqZ4Zhd98WhAL jkoPxwMeL71aKK/NuzRW97Ul9M7n1aggnpJ0oqmakH+/stmLfTy7g4H7FFmihFt3 uNvDcV77PE8t7rdNxzFa4B1SL7xYpW6FQsDfmdqvxmTMiUrgY7mmKZSVIj/Xp6dQ lwBjye5YxJaRfGhWb6AiFAeHHnj/RLSnp2UnSwFUA7bQjw0d453280cu6NftMdJa PDjpzURwyTKpeQ== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 1BE0324631; Tue, 21 Nov 2017 08:23:53 -0500 (EST) From: Yuanhan Liu To: Gowrishankar Muthukrishnan Cc: Declan Doherty , Gaetan Rivet , dpdk stable Date: Tue, 21 Nov 2017 21:16:52 +0800 Message-Id: <1511270333-31002-70-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 'net/bonding: support bifurcated driver in eal' 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:23:57 -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 368f56095acd2d5a64af05e1fc58ff0b1a4b39b4 Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Wed, 20 Sep 2017 23:34:58 +0530 Subject: [PATCH] net/bonding: support bifurcated driver in eal [ upstream commit c848b518bbc7c1c22205fb0260cdfff1fa1f0595 ] At present, creating bonding devices using --vdev is broken for PMD like mlx5 as it is neither UIO nor VFIO based and hence PMD driver is unknown to find_port_id_by_pci_addr(), as below. testpmd --vdev 'net_bonding0,mode=1,slave=,socket_id=0' PMD: bond_ethdev_parse_slave_port_kvarg(150) - Invalid slave port value () specified EAL: Failed to parse slave ports for bonded device net_bonding0 This patch fixes parsing PCI ID from bonding device params by verifying it in RTE PCI bus, rather than checking dev->kdrv. Fixes: eac901ce29be ("ethdev: decouple from PCI device") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Declan Doherty Reviewed-by: Gaetan Rivet --- drivers/net/bonding/rte_eth_bond_args.c | 35 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c index bb634c6..7c65dda 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -61,16 +61,6 @@ find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr) unsigned i; for (i = 0; i < rte_eth_dev_count(); i++) { - - /* Currently populated by rte_eth_copy_pci_info(). - * - * TODO: Once the PCI bus has arrived we should have a better - * way to test for being a PCI device or not. - */ - if (rte_eth_devices[i].data->kdrv == RTE_KDRV_UNKNOWN || - rte_eth_devices[i].data->kdrv == RTE_KDRV_NONE) - continue; - pci_dev = RTE_ETH_DEV_TO_PCI(&rte_eth_devices[i]); eth_pci_addr = &pci_dev->addr; @@ -98,6 +88,16 @@ find_port_id_by_dev_name(const char *name) return -1; } +static inline int +pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr) +{ + struct rte_pci_device *pdev; + const struct rte_pci_addr *paddr = _pci_addr; + + pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev); + return rte_eal_compare_pci_addr(&pdev->addr, paddr); +} + /** * Parses a port identifier string to a port id by pci address, then by name, * and finally port id. @@ -106,10 +106,23 @@ static inline int parse_port_id(const char *port_str) { struct rte_pci_addr dev_addr; + struct rte_bus *pci_bus; + struct rte_device *dev; int port_id; + pci_bus = rte_bus_find_by_name("pci"); + if (pci_bus == NULL) { + RTE_LOG(ERR, PMD, "unable to find PCI bus\n"); + return -1; + } + /* try parsing as pci address, physical devices */ - if (eal_parse_pci_DomBDF(port_str, &dev_addr) == 0) { + if (pci_bus->parse(port_str, &dev_addr) == 0) { + dev = pci_bus->find_device(NULL, pci_addr_cmp, &dev_addr); + if (dev == NULL) { + RTE_LOG(ERR, PMD, "unable to find PCI device\n"); + return -1; + } port_id = find_port_id_by_pci_addr(&dev_addr); if (port_id < 0) return -1; -- 2.7.4