From patchwork Thu Jan 19 04:45:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 19764 X-Patchwork-Delegate: thomas@monjalon.net 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 BD5C6FB53; Thu, 19 Jan 2017 05:45:51 +0100 (CET) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by dpdk.org (Postfix) with ESMTP id BE854FB30 for ; Thu, 19 Jan 2017 05:45:30 +0100 (CET) Received: by mail-wm0-f44.google.com with SMTP id r144so58581776wme.1 for ; Wed, 18 Jan 2017 20:45:30 -0800 (PST) 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; bh=kw0XqL8UvR/iFB6GNchlAReoxYhIHWZ1gZ+DHslfUTg=; b=C61Nl+RbdC8+nbczHbLklwayzp9EHdXOOd3t7v+p8iL8YwyUt5De7srXJ89hGoFITC Fu+FD+Sbs5GzIcPbwIggYCerA7/Nqts9eUi/ExxzAJBIvkt3Dfcz6DRisIzi0C+Vkb1M gZV+Je/p4vgF3Xgk/ZgROOAqr3BA2BOvT9wmuFVmOA9db2Wb+VzHV48+Xg7JyLZ/x5Rc fvf80sUJwoqToDFaU2L4qNPMrEBkbMkUh05HmLvWCFsv0lweOmQZwtFR5COW7FXdLWlz HYz7enqEC/ZcygQ6seeG5zPg/muRfqNI3ikGFTW8eqfB5LnmN/38xl1Uq4O0NTKi1T3o ux9Q== 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; bh=kw0XqL8UvR/iFB6GNchlAReoxYhIHWZ1gZ+DHslfUTg=; b=QfTZNBT4J2PF8AY7wvi+8JRzVrDgR5m1EVSgQt5In9WVf0oriF06zDlUmlX8yAwM5T KKXG1+2qLbWiDEsAIVYESXz+0H2h6ztAmwFNYewEX1KjpAiR/kaCl4JUGd4falZwpSBU 0H9Rqg5LCnViEIHJ0iYibALU/EraxLKJguAZPu3zAK+38iJOvksbWkR0LosNOM7mqzBl lfhUqc/vwYZIdqLT3PYzTVyrxg0lC+fx4qlv/XiZ6FUZHHkByzaaRmAcCpsCxv9AkaEo sYQB3Mk21dIJZAzC4gINx7OKkHjMhvYbaD+elQ2AY890BQVqNZ0hsjlY24IdIlEMWF+u TqaQ== X-Gm-Message-State: AIkVDXJ0KIBGJ1VEiEtCdG1qs8eUL66R1uX8Lsny8Ok3ZK3s0TsmIVmXoauSE3XtfDU/Wnx+ X-Received: by 10.223.162.205 with SMTP id t13mr4179447wra.155.1484801130408; Wed, 18 Jan 2017 20:45:30 -0800 (PST) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id t194sm2568586wmd.1.2017.01.18.20.45.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jan 2017 20:45:29 -0800 (PST) From: Thomas Monjalon To: Shreyansh Jain Cc: dev@dpdk.org Date: Thu, 19 Jan 2017 05:45:12 +0100 Message-Id: <1484801117-779-9-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1484801117-779-1-git-send-email-thomas.monjalon@6wind.com> References: <1484748329-5418-1-git-send-email-shreyansh.jain@nxp.com> <1484801117-779-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v11 08/13] pci: remove loop over drivers in device detach 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" From: Shreyansh Jain rte_eal_pci_detach calls pci_detach_all_drivers which loops over all PCI drivers for detaching the device. This is unnecessary as the device already has the PCI driver reference which can be used directly. Removing pci_detach_all_drivers and restructuring rte_eal_pci_detach and rte_eal_pci_detach_dev to work without looping over driver list. Signed-off-by: Shreyansh Jain --- lib/librte_eal/common/eal_common_pci.c | 47 +++++++--------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 4f155c6..8b4ae2d 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -259,21 +259,15 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, * driver. */ static int -rte_eal_pci_detach_dev(struct rte_pci_driver *dr, - struct rte_pci_device *dev) +rte_eal_pci_detach_dev(struct rte_pci_device *dev) { - int ret; struct rte_pci_addr *loc; + struct rte_pci_driver *dr; - if ((dr == NULL) || (dev == NULL)) + if (dev == NULL) return -EINVAL; - ret = rte_pci_match(dr, dev); - if (ret) { - /* Device and driver don't match */ - return 1; - } - + dr = dev->driver; loc = &dev->addr; RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n", @@ -328,33 +322,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev) } /* - * If vendor/device ID match, call the remove() function of all - * registered driver for the given device. Return -1 if initialization - * failed, return 1 if no driver is found for this device. - */ -static int -pci_detach_all_drivers(struct rte_pci_device *dev) -{ - struct rte_pci_driver *dr = NULL; - int rc = 0; - - if (dev == NULL) - return -1; - - TAILQ_FOREACH(dr, &pci_driver_list, next) { - rc = rte_eal_pci_detach_dev(dr, dev); - if (rc < 0) - /* negative value is an error */ - return -1; - if (rc > 0) - /* positive value means driver doesn't support it */ - continue; - return 0; - } - return 1; -} - -/* * Find the pci device specified by pci address, then invoke probe function of * the driver of the devive. */ @@ -407,9 +374,13 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr) if (rte_eal_compare_pci_addr(&dev->addr, addr)) continue; - ret = pci_detach_all_drivers(dev); + ret = rte_eal_pci_detach_dev(dev); if (ret < 0) + /* negative value is an error */ goto err_return; + if (ret > 0) + /* positive value means driver doesn't support it */ + continue; TAILQ_REMOVE(&pci_device_list, dev, next); free(dev);