From patchwork Tue Jul 3 22:15:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 42193 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8E6081BEDE; Wed, 4 Jul 2018 00:16:16 +0200 (CEST) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 64CFA1BEC5 for ; Wed, 4 Jul 2018 00:16:08 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id n17-v6so3759000wmh.2 for ; Tue, 03 Jul 2018 15:16:08 -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 :mime-version:in-reply-to:references:content-transfer-encoding; bh=go46P7hXF6U8uUnAgtW23Ie0yAZ98Rq2fDQ8vb96Z0c=; b=b0eQOkLGzqv8SRcuMwSQE3vDyAPU7Mds99HaLUEftKfURc7CWceTXJ8hwou50bILWB jc5pKTSfkpqq+HeMR8AO870kXXnVTRZbRFwgxphedAgGi9D3lxjzGlgJa6GiQVFT+oVR S+xN90PpYugVzU3iDHA7PlFiGUVnb4Xd9gHQfpMcDyicBUJw7eSEqkFV7wXDNdGTG85D BTqr06EIXrHZC4RzHR2iST1rHQ0O4Zj6N8wcicSBsXCJWuC2pIh6J6My00LPZrkyr4gD Egd5pg0ZglYjUvccN2pHaC3+B6hjijYWWqf889uIS4O6U7mKHd3jUmT/Kpk4bFR6REfD rkbw== 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:mime-version:in-reply-to:references :content-transfer-encoding; bh=go46P7hXF6U8uUnAgtW23Ie0yAZ98Rq2fDQ8vb96Z0c=; b=F5Pmsx7jShxXPr1mDmoYPZFN5PmKSO9Rj/f6Y/Pxz7eB6CYC0YfUc7pelP0jhjTnM+ buY5UrZ5SfYRXrxf9wqM3qprmKvc2RRghX7Z6oAwoYaJcB3H3gY2Gc6+y4cdw3Ubewvg xszHItWnLbI+3DHZ1zKAD0Pt/AzBJjyt9BXB2yZWNKZZQNBSK3MzP+fudGWKNGQSpXd7 wtluzHN6ZAO2oxyZV4sUfKiYSsSb4VdPG/PO4aieeNz7hBW45uFFH6VBnOR9FKtWJPIr yashksM/m/J1XmnzZZng86I00m0lK4sP1hgbxKsWoipoJvSHwusJJwOZGpGVTIN+2hER Kdhw== X-Gm-Message-State: APt69E1nizaqj5AQZNjdtbeoq9vnv/HKc7OgHfu3q7EhpEN5vtJABl1P kljn2wvZgB61WAO87LejYVitNU/4 X-Google-Smtp-Source: AAOMgpe+OkUGStna7qALss9bckqkZyjNa4K8GUmcbyHWn6ZrZPi0Z95MYiJmRkGBJcANrup4OsU2TA== X-Received: by 2002:a1c:f407:: with SMTP id z7-v6mr11369124wma.143.1530656167730; Tue, 03 Jul 2018 15:16:07 -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 i190-v6sm3771084wmd.33.2018.07.03.15.16.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 15:16:06 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 4 Jul 2018 00:15:07 +0200 Message-Id: <17afddeae52fa1f523aa8f32a62f62861adc9cad.1530655929.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: MIME-Version: 1.0 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v9 24/27] bus/vdev: pre-process declarative vdev devargs 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" The new devargs format does not recognize a particular device name. Each bus uses its specific format. Process each devargs privately prior to attempting a bus scan. Prepare them if they are using the new devargs format. Signed-off-by: Gaetan Rivet --- drivers/bus/vdev/vdev.c | 10 +++++---- drivers/bus/vdev/vdev_params.c | 50 +++++++++++++++++++++++++++++++++++++++++ drivers/bus/vdev/vdev_private.h | 6 +++++ 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index e8518833d..f2dace245 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -115,8 +115,8 @@ rte_vdev_remove_custom_scan(rte_vdev_scan_callback callback, void *user_arg) return 0; } -static int -vdev_parse(const char *name, void *addr) +int +rte_vdev_parse(const char *name, void *addr) { struct rte_vdev_driver **out = addr; struct rte_vdev_driver *driver = NULL; @@ -148,7 +148,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) VDEV_LOG(DEBUG, "Search driver %s to probe device %s", name, rte_vdev_device_name(dev)); - if (vdev_parse(name, &driver)) + if (rte_vdev_parse(name, &driver)) return -1; dev->device.driver = &driver->driver; ret = driver->probe(dev); @@ -443,6 +443,8 @@ vdev_scan(void) /* for virtual devices we scan the devargs_list populated via cmdline */ RTE_EAL_DEVARGS_FOREACH("vdev", devargs) { + if (rte_vdev_devargs_prepare(devargs)) + continue; dev = calloc(1, sizeof(*dev)); if (!dev) @@ -536,7 +538,7 @@ static struct rte_bus rte_vdev_bus = { .find_device = rte_vdev_find_device, .plug = vdev_plug, .unplug = vdev_unplug, - .parse = vdev_parse, + .parse = rte_vdev_parse, .dev_iterate = rte_vdev_dev_iterate, }; diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c index 2f55f451f..7ad11b092 100644 --- a/drivers/bus/vdev/vdev_params.c +++ b/drivers/bus/vdev/vdev_params.c @@ -2,11 +2,14 @@ * Copyright 2018 Gaëtan Rivet */ +#include + #include #include #include #include #include +#include #include "vdev_logs.h" #include "vdev_private.h" @@ -60,3 +63,50 @@ rte_vdev_dev_iterate(const void *start, rte_kvargs_free(kvargs); return dev; } + +static int +vdev_driver_kv_parse(const char *key __rte_unused, + const char *value, + void *_da) +{ + struct rte_devargs *da = _da; + struct rte_vdev_driver *driver; + + /* Verify that the driver matches. */ + if (rte_vdev_parse(value, &driver)) + return -1; + + /* Copy the driver name as-is. */ + snprintf(da->name, sizeof(da->name), "%s", value); + return 0; +} + +int +rte_vdev_devargs_prepare(struct rte_devargs *da) +{ + struct rte_kvargs *kvargs = NULL; + char *args; + int ret; + + if (da->busstr == NULL) + return 0; + + args = strchr(da->busstr, ','); + if (args == NULL) + return 0; + args++; + + kvargs = rte_kvargs_parse(args, vdev_params_keys); + if (kvargs == NULL) { + VDEV_LOG(ERR, "unable to parse parameter list: %s\n", + da->busstr); + rte_errno = EINVAL; + return -1; + } + + ret = rte_kvargs_process(kvargs, "driver", + vdev_driver_kv_parse, da); + + rte_kvargs_free(kvargs); + return ret; +} diff --git a/drivers/bus/vdev/vdev_private.h b/drivers/bus/vdev/vdev_private.h index ba6dc48ff..da57b84dd 100644 --- a/drivers/bus/vdev/vdev_private.h +++ b/drivers/bus/vdev/vdev_private.h @@ -19,6 +19,12 @@ rte_vdev_dev_iterate(const void *start, const char *str, const struct rte_dev_iterator *it); +int +rte_vdev_parse(const char *name, void *addr); + +int +rte_vdev_devargs_prepare(struct rte_devargs *da); + #ifdef __cplusplus } #endif