From patchwork Thu Nov 20 09:06:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1387 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 5CD788057; Thu, 20 Nov 2014 09:57:53 +0100 (CET) Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) by dpdk.org (Postfix) with ESMTP id 7BF987FBC for ; Thu, 20 Nov 2014 09:57:49 +0100 (CET) Received: by mail-pd0-f179.google.com with SMTP id w10so2714986pde.38 for ; Thu, 20 Nov 2014 01:08:18 -0800 (PST) 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; bh=pQ4YxFBdBBT+G+mR54PlXuHMpHx9oZ+Axy3WejNnloU=; b=k3o875pTgLQ+dFv0YXuteu7dKI6SfrgjrDcdTUBawmZRW6OBnTFIB8IGAahtmM8Mt+ Cd9iXFeqoSfByHYF6g3Y9k5MIk/S5R1kUYu5xF7hv359T70OWN54mIE3+jRb057yQ0Gv 6H1K/PFVl7+GuPviLh+73vu20x1WPDE81oM+MJ7dHyBcWATrm6wBDBEMS08SGR+mRtat n9NKbbPdPcfEcAjGbtc0Mr3CdpIhPgL7TKzy2W8KOd6eEoF5TGXyc33EyS4DOqxWTcy0 0ubq3IALDpUbdMNKecKwxFzqDVaw8RANet+tvWkHkI/g38YUuzHldZxo8fIO3au0g586 Qr1Q== X-Gm-Message-State: ALoCoQk41HUheuVIYshsyMoyBkHMUgfcxXZOZ/CcOybtu7El6lZ7sijB3JOqrawvaeTAKjVlrsTL X-Received: by 10.70.48.199 with SMTP id o7mr20597644pdn.97.1416474498236; Thu, 20 Nov 2014 01:08:18 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id a6sm1432407pbu.64.2014.11.20.01.08.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Nov 2014 01:08:17 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Thu, 20 Nov 2014 18:06:38 +0900 Message-Id: <1416474399-16851-25-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> References: <1414572576-21371-1-git-send-email-mukawa@igel.co.jp> <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> Cc: nakajima.yoshihiro@lab.ntt.co.jp, menrigh@brocade.com, masutani.hitoshi@lab.ntt.co.jp Subject: [dpdk-dev] [PATCH 24/25] eal/pci: Add port hotplug functions for physical 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The patch adds rte_eal_dev_attach_pdev() and rte_eal_dev_detach_pdev(). rte_eal_dev_attach_pdev() receives a PCI address of the device and returns an attached port number. rte_eal_dev_detach_pdev() receives a port number, and returns a PCI address actually detached. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/eal_common_dev.c | 58 +++++++++++++++++++++++++++++++++ lib/librte_eal/common/include/rte_dev.h | 25 ++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index 0518e3c..c2d5cd6 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -181,6 +181,64 @@ rte_eal_dev_close_one(const char *name) return rte_eal_dev_find_and_invoke(name, INVOKE_CLOSE); } +/* attach the new physical device, then store port_id of the device */ +int +rte_eal_dev_attach_pdev(struct rte_pci_addr *addr, uint8_t *port_id) +{ + uint8_t new_port_id; + struct rte_eth_dev devs[RTE_MAX_ETHPORTS]; + + /* save current port status */ + rte_eth_dev_save(devs); + /* re-construct pci_device_list */ + if (rte_eal_pci_scan()) + goto err; + /* invoke probe func of the driver can handle the new device */ + if (rte_eal_pci_probe_one(addr)) + goto err; + /* get port_id enabled by above procedures */ + if (rte_eth_dev_get_changed_port(devs, &new_port_id)) + goto err; + + *port_id = new_port_id; + return 0; +err: + RTE_LOG(ERR, EAL, "Drver, cannot attach the device\n"); + return -1; +} + +/* detach the new physical device, then store pci_addr of the device */ +int +rte_eal_dev_detach_pdev(uint8_t port_id, struct rte_pci_addr *addr) +{ + struct rte_pci_addr freed_addr; + struct rte_pci_addr vp; + + /* check whether the driver supports detach feature, or not */ + if (!rte_eth_dev_check_detachable(port_id)) + goto err; + + /* get pci address by port id */ + if (rte_eth_dev_get_addr_by_port(port_id, &freed_addr)) + goto err; + + /* Zerod pci addr means the port comes from virtual device */ + vp.domain = vp.bus = vp.devid = vp.function = 0; + if (eal_compare_pci_addr(&vp, &freed_addr) == 0) + goto err; + + /* invoke close func of the driver, + * also remove the device from pci_device_list */ + if (rte_eal_pci_close_one(&freed_addr)) + goto err; + + *addr = freed_addr; + return 0; +err: + RTE_LOG(ERR, EAL, "Drver, cannot detach the device\n"); + return -1; +} + static void get_vdev_name(char *vdevargs) { diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 159d5a5..26d7526 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -101,6 +101,19 @@ void rte_eal_driver_unregister(struct rte_driver *driver); #if defined(RTE_LIBRTE_EAL_HOTPLUG) && defined(RTE_LIBRTE_EAL_LINUXAPP) /** + * Attach a new physical device. + * + * @param addr + * A pointer to a pci address structure describing the new + * device to be attached. + * @param port_id + * A pointer to a port identifier actually attached. + * @return + * 0 on success and port_id is filled, negative on error + */ +int rte_eal_dev_attach_pdev(struct rte_pci_addr *addr, uint8_t *port_id); + +/** * Attach a new virtual device. * * @param vdevargs @@ -114,6 +127,18 @@ void rte_eal_driver_unregister(struct rte_driver *driver); int rte_eal_dev_attach_vdev(const char *vdevargs, uint8_t *port_id); /** + * Detach a physical device. + * + * @param port_id + * The port identifier of the physical device to detach. + * @param addr + * A pointer to a pci address structure actually detached. + * @return + * 0 on success and addr is filled, negative on error + */ +int rte_eal_dev_detach_pdev(uint8_t port_id, struct rte_pci_addr *addr); + +/** * Detach a virtual device. * * @param port_id