From patchwork Tue Jul 3 22:15:09 2018 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: 42195 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 D0D0B1BEFE; Wed, 4 Jul 2018 00:16:18 +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 2DB711BEBD for ; Wed, 4 Jul 2018 00:16:11 +0200 (CEST) Received: by mail-wm0-f43.google.com with SMTP id v25-v6so3822428wmc.0 for ; Tue, 03 Jul 2018 15:16:11 -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=QdFoI4PAYRZ4EyFu4BqTTYdN+Gh8G7Ywbw5IuLjj6nA=; b=bruDLuXHz9McHIK2p1gDBGc/YpF01z4wipMcx1027ldFiu1IBSADqLm5CXOeFzxoE2 RgU9PLeRiab32b7bk6bAjnoubnW4V6Bg1+KbMHOhDi1fcruHHIaPtcGomULM7u10PDWP oKm1tGIL+LGIXgYi01C5XBlRbHFlPEpPKg8N1iEpRyOmkSUb2KxpWth2i1DRcvSkag6t 13OkZXntgiUhme/+dtl/Qqb12qn649DrfRmYnBijPGgiJBMjFoxnO7RO3tLIfyCR5bFh jVwrKxpSDIgGmoD/y2DYE+zwhAYOawI/2ilVlBEdsfqHi4KR3Uub1yAD3QnoOzXD3k2k ae4Q== 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=QdFoI4PAYRZ4EyFu4BqTTYdN+Gh8G7Ywbw5IuLjj6nA=; b=lNPcjWQbKuH2tyW+Py78towrBtqqFDqfDaL9QlioyeUTVsh9VLZy1Usem2Y+Z55WdS CflpmFPjUHskSMagL7ZYSChzpbw8l20thz0Gz/lroo9ZT0JCMAYyBvuQldRw1yOslxGv oBbtT6XUoAJ3XG/QBP4EPps0tVk16mYKYXNmmXIa5XD9X7jwRR5epf5CzCQ/WfyInusm pQ5wH8GhDz3WNYt9ajbMktl5Kvv7kT2Lu4Mt4yvtAflzXlKUW/YEpRa61F2Mzj8jg9C0 IjbBZZ7s/MdAvvuUF1gdrYZj2DAG3/qd5oK6wrE6s+P91QT6+SSILOyiuQ8VqYBf2Rle gUTQ== X-Gm-Message-State: APt69E2gYbdY4UMvVqAaLCaoN1d9VnzlxH0yPmo8F1jD/l5503HrpNCH QnLM1J2e4hc7cwHyaGYHdIQL8apH X-Google-Smtp-Source: AAOMgpeLtjW23Gm2qLlrxDsYOI5lrnZhxnum3G59bC+4db4fTY42+a7teLRCljT8kgRxn25J7fAVGw== X-Received: by 2002:a1c:5b88:: with SMTP id p130-v6mr12386388wmb.69.1530656170537; Tue, 03 Jul 2018 15:16:10 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 15:16:09 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 4 Jul 2018 00:15:09 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v9 26/27] ethdev: process declarative eth 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" Process the class-specific arguments in a devargs. This processing takes the form of setting the proper eth_dev fields when relevant. Signed-off-by: Gaetan Rivet --- lib/librte_ethdev/eth_private.h | 5 ++++ lib/librte_ethdev/rte_class_eth.c | 61 +++++++++++++++++++++++++++++++++++++++ lib/librte_ethdev/rte_ethdev.c | 7 +++++ 3 files changed, 73 insertions(+) diff --git a/lib/librte_ethdev/eth_private.h b/lib/librte_ethdev/eth_private.h index 0f5c6d5c4..c0c065165 100644 --- a/lib/librte_ethdev/eth_private.h +++ b/lib/librte_ethdev/eth_private.h @@ -19,6 +19,11 @@ struct rte_eth_dev * eth_find_device(const struct rte_eth_dev *_start, rte_eth_cmp_t cmp, const void *data); +/* Generic rte_eth_dev parameters processor. */ +int +rte_eth_dev_args_parse(struct rte_eth_dev *eth_dev, + struct rte_devargs *da); + #ifdef __cplusplus } #endif diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c index d8d8e8845..f02b6fd6a 100644 --- a/lib/librte_ethdev/rte_class_eth.c +++ b/lib/librte_ethdev/rte_class_eth.c @@ -35,6 +35,19 @@ struct eth_dev_match_arg { .kvlist = (k), \ }) +typedef int (*eth_dev_set_t)(struct rte_eth_dev *edev, const char *value); + +static enum eth_params +ethdev_param_id(const char *key) +{ + int i; + + for (i = 0; i < RTE_ETH_PARAMS_MAX; i++) + if (strcmp(key, eth_params_keys[i]) == 0) + return i; + return RTE_ETH_PARAMS_MAX; +} + static int eth_dev_match(const struct rte_eth_dev *edev, const void *_arg) @@ -79,6 +92,54 @@ eth_dev_iterate(const void *start, return edev; } +static int +eth_dev_set_name(struct rte_eth_dev *edev, + const char *value) +{ + snprintf(edev->data->name, + sizeof(edev->data->name), + "%s", value); + return 0; +} + +static int +ethdev_args_process(const char *key, + const char *value, + void *_edev) +{ + static eth_dev_set_t eth_dev_set[] = { + [RTE_ETH_PARAMS_NAME] = eth_dev_set_name, + [RTE_ETH_PARAMS_MAX] = NULL, + }; + struct rte_eth_dev *edev = _edev; + int param; + + param = ethdev_param_id(key); + if (eth_dev_set[param]) + return eth_dev_set[param](edev, value); + return 0; +} + +int +rte_eth_dev_args_parse(struct rte_eth_dev *edev, + struct rte_devargs *da) +{ + struct rte_kvargs *kvargs = NULL; + + if (da == NULL || da->clsstr == NULL) + return 0; + + kvargs = rte_kvargs_parse2(da->clsstr, eth_params_keys, "/"); + if (kvargs == NULL) { + RTE_LOG(ERR, EAL, "cannot parse argument list\n"); + return -EINVAL; + } + if (rte_kvargs_process(kvargs, NULL, ethdev_args_process, edev)) + return -1; + rte_kvargs_free(kvargs); + return 0; +} + struct rte_class rte_class_eth = { .dev_iterate = eth_dev_iterate, }; diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index cce20d9ae..4583509dd 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -41,6 +41,7 @@ #include "rte_ethdev.h" #include "rte_ethdev_driver.h" #include "ethdev_profile.h" +#include "eth_private.h" static int ethdev_logtype; @@ -3594,6 +3595,12 @@ rte_eth_dev_create(struct rte_device *device, const char *name, } } + retval = rte_eth_dev_args_parse(ethdev, device->devargs); + if (retval) { + RTE_LOG(ERR, EAL, "ethdev parsing failed"); + goto probe_failed; + } + retval = ethdev_init(ethdev, init_params); if (retval) { RTE_LOG(ERR, EAL, "ethdev initialisation failed");