From patchwork Wed Jun 7 23:53:23 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: 25122 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 AEDFF7CB3; Thu, 8 Jun 2017 01:54:00 +0200 (CEST) Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by dpdk.org (Postfix) with ESMTP id 3E69E2C1A for ; Thu, 8 Jun 2017 01:53:49 +0200 (CEST) Received: by mail-wr0-f169.google.com with SMTP id q97so12006376wrb.2 for ; Wed, 07 Jun 2017 16:53:49 -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=Ntq+r3n1c3EYdSEqgoxGSrhvYVRFX3EurTEAHMM0Pec=; b=JU52dqbQno8U7twYMlwnGxgwp/9qatO1ykahCMuAcimmFBbMK9i3EmFBi4cCbzVPFM o7nOU6HEf8T8BNq8kHtUBKYEvCxOzgj4SucLWcNDlyWRem/qmOSsr/W/GusOv17yPKQI iBpr68qvv3DZWL+EjpWKxz1KB6JJYcCAxlyh7d8eRn0xx17ZSCghBqDUEUNQwQeQaRTz BfgS6aFm1mA6Tt8IAZ4YG3GT+QbBy84ggDkD63bfLgD4ADB85f2NAyGL6PQU/SDLNwMh T6YLXMyb8/0vdxXbuagCsKauqRSVBufY06S8ypyr5RjCznJ3eQz2dFWYPiONJ5/WV0bb h6XA== 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=Ntq+r3n1c3EYdSEqgoxGSrhvYVRFX3EurTEAHMM0Pec=; b=qVsFB/U/ZhwzGJH2UjRlwBFrEIsJVL/t5jnCMmZRcWoPbtSVxK2uxztfkTmUYY2lqL vOhkwhvYAGqjCv42yW7bgzO1EglJ7KGz68y+sCsN77qLEsTx/EMYRJkRrEptl1x1mekV INR+MV3F3Zjl+g8F9AyGDKeAYaOyt4BeVtE+2Fuksh7YrGACudy7naVp2zpqdzlUKkjc DxCBqqzt3NGhoYVIk4BfKc7/jVgkMgHoRNSOCJb+TGKcDOivQAHeNNIej1mKSS4LPuvY hHujTJ/gmHYoOMYyjvDyvOtpAUp50oo0k8bqvhN5nkKlFW+JW4DZzUg5pwNMUoUu5eay LYig== X-Gm-Message-State: AODbwcDJuArMvjuW61nOEjVPZUeUr39fvhPLu0xo45rQaKba7gHZkiBE 1Dqj24NQvr6eOBCaadc= X-Received: by 10.223.139.210 with SMTP id w18mr11367606wra.19.1496879628458; Wed, 07 Jun 2017 16:53:48 -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 z23sm4589942wrz.0.2017.06.07.16.53.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 16:53:47 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Jan Blunck , Gaetan Rivet Date: Thu, 8 Jun 2017 01:53:23 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 09/10] ethdev: use embedded rte_device to detach driver 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: Jan Blunck Signed-off-by: Jan Blunck Signed-off-by: Gaetan Rivet --- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 + lib/librte_eal/common/eal_common_dev.c | 43 ++++++++++++++++----------- lib/librte_eal/common/include/rte_dev.h | 11 +++++++ lib/librte_ether/rte_ethdev.c | 31 +++++++------------ 4 files changed, 47 insertions(+), 39 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 21640d6..150b0f7 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -162,6 +162,7 @@ DPDK_17.02 { DPDK_17.05 { global: + rte_eal_device_detach; rte_bus_find; rte_bus_find_by_device; rte_bus_find_device; diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index 733da91..8ef9b98 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -100,6 +100,30 @@ int rte_eal_dev_attach(const char *name, const char *devargs) return ret; } +int rte_eal_device_detach(struct rte_device *dev) +{ + struct rte_bus *bus; + int ret; + + bus = rte_bus_find_by_device(dev); + if (!bus) { + RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n", + dev->name); + return -EINVAL; + } + + if (!bus->unplug) { + RTE_LOG(ERR, EAL, "Bus function not supported\n"); + return -ENOTSUP; + } + + ret = bus->unplug(dev); + if (ret) + RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n", + dev->name); + return ret; +} + static int cmp_dev_name(const struct rte_device *dev, const void *_name) { const char *name = _name; @@ -110,8 +134,6 @@ static int cmp_dev_name(const struct rte_device *dev, const void *_name) int rte_eal_dev_detach(const char *name) { struct rte_device *dev; - struct rte_bus *bus; - int ret; if (name == NULL) { RTE_LOG(ERR, EAL, "Invalid device provided.\n"); @@ -124,20 +146,5 @@ int rte_eal_dev_detach(const char *name) return -EINVAL; } - bus = rte_bus_find_by_device(dev); - if (!bus) { - RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n", name); - return -EINVAL; - } - - if (!bus->unplug) { - RTE_LOG(ERR, EAL, "Bus function not supported\n"); - return -ENOTSUP; - } - - ret = bus->unplug(dev); - if (ret) - RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n", - name); - return ret; + return rte_eal_device_detach(dev); } diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 724855e..9f35b1f 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -123,6 +123,17 @@ struct rte_mem_resource { void *addr; /**< Virtual address, NULL when not mapped. */ }; +/* FIXME: Forward declare */ +struct rte_device; + +/** + * Unplug the device from the device driver. + * + * @param dev + * A pointer to a rte_device structure. + */ +int rte_eal_device_detach(struct rte_device *dev); + /** * A structure describing a device driver. */ diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 606252f..bc603c1 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -355,26 +355,14 @@ rte_eth_dev_get_port_by_name(const char *name, uint8_t *port_id) static int rte_eth_dev_is_detachable(uint8_t port_id) { - uint32_t dev_flags; + struct rte_eth_dev *dev; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL); - switch (rte_eth_devices[port_id].data->kdrv) { - case RTE_KDRV_IGB_UIO: - case RTE_KDRV_UIO_GENERIC: - case RTE_KDRV_NIC_UIO: - case RTE_KDRV_NONE: - case RTE_KDRV_VFIO: - break; - default: - return -ENOTSUP; - } - dev_flags = rte_eth_devices[port_id].data->dev_flags; - if ((dev_flags & RTE_ETH_DEV_DETACHABLE) && - (!(dev_flags & RTE_ETH_DEV_BONDED_SLAVE))) + dev = &rte_eth_devices[port_id]; + if (dev->data->dev_flags & RTE_ETH_DEV_BONDED_SLAVE) return 0; - else - return 1; + return !!dev->device->devargs->bus->unplug; } /* attach the new device, then store port_id of the device */ @@ -427,6 +415,7 @@ rte_eth_dev_attach(const char *devargs, uint8_t *port_id) int rte_eth_dev_detach(uint8_t port_id, char *name) { + struct rte_eth_dev *dev; int ret = -1; if (name == NULL) { @@ -435,15 +424,15 @@ rte_eth_dev_detach(uint8_t port_id, char *name) } /* FIXME: move this to eal, once device flags are relocated there */ - if (rte_eth_dev_is_detachable(port_id)) + if (!rte_eth_dev_is_detachable(port_id)) goto err; - snprintf(name, sizeof(rte_eth_devices[port_id].data->name), - "%s", rte_eth_devices[port_id].data->name); - ret = rte_eal_dev_detach(name); + dev = &rte_eth_devices[port_id]; + snprintf(name, RTE_ETH_NAME_MAX_LEN - 1, "%s", dev->device->name); + ret = rte_eal_device_detach(dev->device); if (ret < 0) goto err; - + dev->state = RTE_ETH_DEV_UNUSED; return 0; err: