From patchwork Tue Apr 11 11:07:30 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: 23454 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 C8C1A5596; Tue, 11 Apr 2017 13:07:59 +0200 (CEST) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 6C06D2C01 for ; Tue, 11 Apr 2017 13:07:53 +0200 (CEST) Received: by mail-wm0-f43.google.com with SMTP id u2so58148082wmu.0 for ; Tue, 11 Apr 2017 04:07:53 -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=ziyWySHCFFIkjexkoavJd+vLM0WJbUnoN+TQvOzdXf4=; b=T8V5xI0jlyjT7Mj5Tc1Lpg0iE0C3oXqLvnbrenjPlT6p8wOI7jezUezBSrGJpqr071 UOBWCb3HEqUmX2wY7PBYvw7rxsF3z2Y9OAX1jI6VM3NzrX83yPFn3CUUL1NjUq2X4FBU WhIXoceYYSYOgMGHuh5Vyy+kxKj0c42iSHspbqwqwyhadNODuufUH8o/HI0MkD2RXV09 Q+eyZdve7yob8lpFs8XFjJBg8TCB2cs72pE4tj2cepxx4O5fENd5AfJACskt2ZAPybfw ELY22tLsHh/uFKCiW9RwE0GRuJ6D1Aj1AhyaszDNZKFLvzu75Zk05o6zYA/Ll50J8/vv gQGQ== 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=ziyWySHCFFIkjexkoavJd+vLM0WJbUnoN+TQvOzdXf4=; b=ufN5Gr18dIcKiMXz8Nlh6MGoKUoCWmIfF6oBBo2Zm/yDZw/cUrZWF1vrw4ID3a2NBK WR53WCMlshZqPXkBeeaORLHS4HW9fGeE8/1LNqm/NZ6GVSGPO/1AajCdyad3FmrKelUI JcK0wsUPIkYQs9I9wKsZcENoOp42AH1zUQ6L/qxnYZ/lrhrHkqKb82UO1efkP1nkw0Tl uIWRzUAZfc3R8neTvBJWt9P3im0542p2FcJZXR0M8lOzI/fnj3VUp+hue6hhSB85QvmJ G9nrir2SDR97cFGt1hqhMWDNP53RAnV8MG1WY4taHQGKJLx2EoDanALlacM5v6XRl6Mi 7D1A== X-Gm-Message-State: AN3rC/577UmdhWugCQ1OAEz5dcUzn1BFtShT0aCvVkzsTTr4HQUpltLRVDpYuxUSkcJoyir2 X-Received: by 10.28.107.13 with SMTP id g13mr13675653wmc.117.1491908872756; Tue, 11 Apr 2017 04:07:52 -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 g15sm1151735wmc.14.2017.04.11.04.07.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 04:07:51 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Shreyansh Jain Date: Tue, 11 Apr 2017 13:07:30 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v13 3/7] 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 Reviewed-by: Gaetan Rivet --- lib/librte_eal/common/eal_common_pci.c | 45 +++++++--------------------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 83a81c4..498a3bb 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -263,19 +263,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) { struct rte_pci_addr *loc; + struct rte_pci_driver *dr; - if ((dr == NULL) || (dev == NULL)) + if (dev == NULL) return -EINVAL; - if (!rte_pci_match(dr, dev)) { - /* 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", @@ -330,33 +326,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. */ @@ -409,9 +378,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);