From patchwork Tue Dec 9 03:42: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: 1841 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 6EF7B8042; Tue, 9 Dec 2014 04:43:51 +0100 (CET) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by dpdk.org (Postfix) with ESMTP id A32A48042 for ; Tue, 9 Dec 2014 04:43:48 +0100 (CET) Received: by mail-pd0-f182.google.com with SMTP id p10so2066335pdj.13 for ; Mon, 08 Dec 2014 19:43:48 -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=T+Jw7o/H77J9uTM+MM797jtzpPwM56Ch+U+0dr5zwdU=; b=CHWKqZvJC5GWaUn3mgTIDpuxitmSoDGhFxqbKfZa/1sJGUWKBGGJ0gJ0qkTFQvMq6j ZwXK7WjxQ2XidRJAdjLUiOuLg912xQXWewM3sYnKXJENFjMlnUdJLyiNj84fIIUnPdyk drhUJauqW85IVD4M96QfGhIpWNXeLmQ6lG/waqJvWYKpefzX40Z+Nj+PNDESI/DjdCVe d0Eh7C5Dh9q/xfbAjdZq+OAXvJ2ot+pbMnPbrSaJwB7+wB3jaNbVe7g5eNW+vNALgx4j 6s3oI2E5ctDW29aBuDk1uh0mA60a8zhJCFMvUWYRjXTp7xcl4Zf8u+SLXQrSpNVs/zxJ 90Og== X-Gm-Message-State: ALoCoQmlENzvOQ3FopOd/r2qUI+VTmSXo2EUWwQXZr+vdsUIL3hXEy8bw3okJ/gV1Xflg29qjKUR X-Received: by 10.68.139.68 with SMTP id qw4mr1359200pbb.164.1418096628001; Mon, 08 Dec 2014 19:43:48 -0800 (PST) Received: from eris.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id xx2sm2185pab.17.2014.12.08.19.43.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Dec 2014 19:43:47 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 9 Dec 2014 12:42:38 +0900 Message-Id: <1418096571-27531-16-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418096571-27531-1-git-send-email-mukawa@igel.co.jp> References: <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> <1418096571-27531-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 v2 15/28] eal/pci: Add probe and close function for virtual drivers 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_init_one() and rte_eal_dev_close_one(). These are used for attaching and detaching virtual devices. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/eal_common_dev.c | 66 +++++++++++++++++++++++++++++++++ lib/librte_eal/common/include/rte_dev.h | 6 +++ lib/librte_eal/linuxapp/eal/Makefile | 1 + 3 files changed, 73 insertions(+) diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index eae5656..f573a54 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -32,10 +32,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +#include #include #include #include +#include #include #include #include @@ -107,3 +110,66 @@ rte_eal_dev_init(void) } return 0; } + +/* So far, linux only supports DPDK hotplug function. */ +#if defined(RTE_LIBRTE_EAL_HOTPLUG) && defined(RTE_LIBRTE_EAL_LINUXAPP) + +#define INVOKE_PROBE (0) +#define INVOKE_CLOSE (1) + +static void +rte_eal_dev_invoke(struct rte_driver *driver, + struct rte_devargs *devargs, int type) +{ + if ((driver == NULL) || (devargs == NULL)) + return; + + switch (type) { + case INVOKE_PROBE: + driver->init(devargs->virtual.drv_name, devargs->args); + break; + case INVOKE_CLOSE: + driver->close(devargs->virtual.drv_name, devargs->args); + break; + } +} + +static int +rte_eal_dev_find_and_invoke(const char *name, int type) +{ + struct rte_devargs *devargs; + struct rte_driver *driver; + + if (name == NULL) + return -EINVAL; + + /* call the init function for each virtual device */ + TAILQ_FOREACH(devargs, &devargs_list, next) { + + if (devargs->type != RTE_DEVTYPE_VIRTUAL) + continue; + + if (strncmp(name, devargs->virtual.drv_name, strlen(name))) + continue; + + TAILQ_FOREACH(driver, &dev_driver_list, next) { + if (driver->type != PMD_VDEV) + continue; + + /* search a driver prefix in virtual device name */ + if (!strncmp(driver->name, devargs->virtual.drv_name, + strlen(driver->name))) { + rte_eal_dev_invoke(driver, devargs, type); + break; + } + } + + if (driver == NULL) { + RTE_LOG(WARNING, EAL, "no driver found for %s\n", + devargs->virtual.drv_name); + } + return 0; + } + return 1; +} +#endif /* RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP */ diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index f7e3a10..71d40c3 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -57,6 +57,11 @@ TAILQ_HEAD(rte_driver_list, rte_driver); typedef int (rte_dev_init_t)(const char *name, const char *args); /** + * Close function called for each device driver once. + */ +typedef int (rte_dev_close_t)(const char *name, const char *args); + +/** * Driver type enumeration */ enum pmd_type { @@ -72,6 +77,7 @@ struct rte_driver { enum pmd_type type; /**< PMD Driver type */ const char *name; /**< Driver name. */ rte_dev_init_t *init; /**< Device init. function. */ + rte_dev_close_t *close; /**< Device close. function. */ }; /** diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 72ecf3a..0ec83b5 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -41,6 +41,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include CFLAGS += -I$(RTE_SDK)/lib/librte_ring CFLAGS += -I$(RTE_SDK)/lib/librte_mempool CFLAGS += -I$(RTE_SDK)/lib/librte_malloc +CFLAGS += -I$(RTE_SDK)/lib/librte_mbuf CFLAGS += -I$(RTE_SDK)/lib/librte_ether CFLAGS += -I$(RTE_SDK)/lib/librte_ivshmem CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_ring